detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 18:30:05 +02:00
Code Issues Actions Packages Releases Activity

eiger server/client bug fix: readout flag of -1

Browse Source
This commit is contained in:
maliakal_d 2019-03-01 14:08:28 +01:00
parent 8c067437e6
commit d2d50a56df
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1187,6 +1187,7 @@ int set_module(int file_des) {
case FORCESWITCHG1: case FORCESWITCHG1:
case FORCESWITCHG2: case FORCESWITCHG2:
#elif GOTTHARDD #elif GOTTHARDD
case GET_SETTINGS:
case DYNAMICGAIN: case DYNAMICGAIN:
case HIGHGAIN: case HIGHGAIN:
case LOWGAIN: case LOWGAIN:
@ -1791,6 +1792,7 @@ int set_readout_flags(int file_des) {
if ((arg == GET_READOUT_FLAGS) || (Server_VerifyLock() == OK)) { if ((arg == GET_READOUT_FLAGS) || (Server_VerifyLock() == OK)) {
switch(arg) { switch(arg) {
case GET_READOUT_FLAGS:
case STORE_IN_RAM: case STORE_IN_RAM:
case CONTINOUS_RO: case CONTINOUS_RO:
case PARALLEL: case PARALLEL:

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2459,7 +2459,7 @@ std::string slsDetector::setReceiver(const std::string &receiverIP) {
} }
if (thisDetector->myDetectorType == EIGER || thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) { if (thisDetector->myDetectorType == EIGER || thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) {
enableTenGigabitEthernet(thisDetector->tenGigaEnable); enableTenGigabitEthernet(thisDetector->tenGigaEnable);
setReadOutFlags(thisDetector->roFlags); setReadOutFlags(GET_READOUT_FLAGS);
} }
setReceiverSilentMode(thisDetector->receiver_silentMode); setReceiverSilentMode(thisDetector->receiver_silentMode);
// data streaming // data streaming