From 02634abbbc147cc9b328ce5c41b16958aef1cae4 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 2 Sep 2019 13:05:28 +0200 Subject: [PATCH] gotthard2:virtual server fix, server recompile --- slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt | 3 ++- .../slsDetectorServer/src/slsDetectorServer_funcs.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt index d0d55515d..432b169c0 100644 --- a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt @@ -3,9 +3,10 @@ add_executable(gotthard2DetectorServer_virtual ../slsDetectorServer/src/slsDetectorServer.c ../slsDetectorServer/src/slsDetectorServer_funcs.c ../slsDetectorServer/src/communication_funcs.c - ../slsDetectorServer/src/blackfin.c + ../slsDetectorServer/src/nios.c ../slsDetectorServer/src/communication_funcs_UDP.c ../slsDetectorServer/src/DAC6571.c + ../slsDetectorServer/src/common.c ) include_directories( diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 5ce81b215..9d5a2c919 100755 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -951,7 +951,7 @@ int set_dac(int file_des) { #ifdef GOTTHARD2D default: break; -#elif +#else // dacs default: if (mV && val > DAC_MAX_MV) {