Merge pull request #98 from cescalara/dac_setting_update

Dac setting update
cescalara · Feb 18, 2020 · ca30d58 · ca30d58
2 parents c3bbe04 + a1d05e5
commit ca30d58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CPU/CPUsoftware/src/instrument/RunInstrument.cpp b/CPU/CPUsoftware/src/instrument/RunInstrument.cpp
@@ -104,7 +104,9 @@ int RunInstrument::HvpsSwitch() {
     {
       std::unique_lock<std::mutex> lock(this->Zynq.m_zynq);
       this->Zynq.HvpsTurnOff();
-      this->Zynq.SetDac(0);
+      if (this->ConfigOut->dac_level != NO_DAC_SET) {
+	this->Zynq.SetDac(0);
+      }
       break;
     }
   case ZynqManager::UNDEF:

diff --git a/minieuso_data_format/minieuso_data_format.h b/minieuso_data_format/minieuso_data_format.h
@@ -19,8 +19,8 @@
  * software definitions
  */
 
-#define VERSION 8.4
-#define VERSION_DATE_STRING "07/02/2020"
+#define VERSION 8.5
+#define VERSION_DATE_STRING "18/02/2020"
 
 /*
  * instrument definitions