From 6dff6402ef4d69493e4a7b5f3b130c4911e409b9 Mon Sep 17 00:00:00 2001 From: Francesca Capel Date: Tue, 18 Feb 2020 14:48:36 +0100 Subject: [PATCH 1/2] Add check to ConfigOut->dac_level before calling Zynq.SetDac(0) in RunInstrument::HvpsSwitch() --- CPU/CPUsoftware/src/instrument/RunInstrument.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CPU/CPUsoftware/src/instrument/RunInstrument.cpp b/CPU/CPUsoftware/src/instrument/RunInstrument.cpp index ac0a913d..d7872c72 100755 --- a/CPU/CPUsoftware/src/instrument/RunInstrument.cpp +++ b/CPU/CPUsoftware/src/instrument/RunInstrument.cpp @@ -104,7 +104,9 @@ int RunInstrument::HvpsSwitch() { { std::unique_lock 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: From a1d05e50326f4fd2cb24bf802bcb6b791ae29903 Mon Sep 17 00:00:00 2001 From: Francesca Capel Date: Tue, 18 Feb 2020 14:50:02 +0100 Subject: [PATCH 2/2] Update version number --- minieuso_data_format/minieuso_data_format.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minieuso_data_format/minieuso_data_format.h b/minieuso_data_format/minieuso_data_format.h index 67022d3e..f45c0a0a 100644 --- 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