Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed

This commit is contained in:
Erik Frojdh 2021-10-08 10:37:44 +02:00
commit b1ae47d189
2 changed files with 2 additions and 2 deletions

View File

@ -9247,7 +9247,7 @@ int get_readout_speed(int file_des) {
int retval = -1; int retval = -1;
LOG(logDEBUG1, ("Getting readout speed\n")); LOG(logDEBUG1, ("Getting readout speed\n"));
#if !defined(JUNGFRAU) && !defined(EIGER) && !defined(GOTTHARD2D) #if !defined(JUNGFRAUD) && !defined(EIGER) && !defined(GOTTHARD2D)
functionNotImplemented(); functionNotImplemented();
#else #else
// get only // get only
@ -9270,7 +9270,7 @@ int set_readout_speed(int file_des) {
return printSocketReadError(); return printSocketReadError();
LOG(logDEBUG1, ("Setting readout speed : %u\n", arg)); LOG(logDEBUG1, ("Setting readout speed : %u\n", arg));
#if !defined(JUNGFRAU) && !defined(EIGER) && !defined(GOTTHARD2D) #if !defined(JUNGFRAUD) && !defined(EIGER) && !defined(GOTTHARD2D)
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set