detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 03:20:42 +02:00
Code Issues Actions Packages Releases Activity

gotthard2:virtual server fix, server recompile

Browse Source
This commit is contained in:
maliakal_d 2019-09-02 13:05:28 +02:00
parent bd95126da2
commit 02634abbbc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt
View File

@ -3,9 +3,10 @@ add_executable(gotthard2DetectorServer_virtual
../slsDetectorServer/src/slsDetectorServer.c ../slsDetectorServer/src/slsDetectorServer.c
../slsDetectorServer/src/slsDetectorServer_funcs.c ../slsDetectorServer/src/slsDetectorServer_funcs.c
../slsDetectorServer/src/communication_funcs.c ../slsDetectorServer/src/communication_funcs.c
../slsDetectorServer/src/blackfin.c ../slsDetectorServer/src/nios.c
../slsDetectorServer/src/communication_funcs_UDP.c ../slsDetectorServer/src/communication_funcs_UDP.c
../slsDetectorServer/src/DAC6571.c ../slsDetectorServer/src/DAC6571.c
../slsDetectorServer/src/common.c
) )
include_directories( include_directories(

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -951,7 +951,7 @@ int set_dac(int file_des) {
#ifdef GOTTHARD2D #ifdef GOTTHARD2D
default: default:
break; break;
#elif #else
// dacs // dacs
default: default:
if (mV && val > DAC_MAX_MV) { if (mV && val > DAC_MAX_MV) {