diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 34fc895ae..e1b0fb940 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..369e71119
--- /dev/null
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,210 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
+#include "blackfin.h"
+#include "programViaBlackfin.h"
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+int checkType();
+int testFpga();
+int testBus();
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+u_int16_t getHardwareVersionNumber();
+u_int16_t getHardwareSerialNumber();
+int isHardwareVersion_1_0();
+u_int32_t getDetectorNumber();
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+int enableBlackfinAMCExternalAccessExtension(char *mess);
+
+// initialization
+void initControlServer();
+void initStopServer();
+
+// set up detector
+void setupDetector();
+int updateDatabytesandAllocateRAM();
+void updateDataBytes();
+
+// firmware functions (resets)
+void cleanFifos();
+void resetCore();
+void resetPeripheral();
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+
+int setADCEnableMask(uint32_t mask);
+uint32_t getADCEnableMask();
+void setADCEnableMask_10G(uint32_t mask);
+uint32_t getADCEnableMask_10G();
+int setTransceiverEnableMask(uint32_t mask);
+uint32_t getTransceiverEnableMask();
+void setADCInvertRegister(uint32_t val);
+uint32_t getADCInvertRegister();
+
+int setExternalSamplingSource(int val);
+int setExternalSampling(int val);
+
+// parameters - readout
+int setReadoutMode(enum readoutMode mode);
+int getReadoutMode();
+
+// parameters - timer
+int setNextFrameNumber(uint64_t value);
+int getNextFrameNumber(uint64_t *value);
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setExpTime(int64_t val);
+int64_t getExpTime();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+int setNumAnalogSamples(int val);
+int getNumAnalogSamples();
+int setNumDigitalSamples(int val);
+int getNumDigitalSamples();
+int setNumTransceiverSamples(int val);
+int getNumTransceiverSamples();
+
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+int setDelayAfterTrigger(int64_t val);
+int64_t getDelayAfterTrigger();
+int64_t getDelayAfterTriggerLeft();
+int64_t getPeriodLeft();
+int64_t getFramesFromStart();
+int64_t getActualTime();
+int64_t getMeasurementTime();
+
+// parameters - module, settings
+enum detectorSettings getSettings();
+
+// parameters - threshold
+// parameters - dac, adc, hv
+
+void setDAC(enum DACINDEX ind, int val, int mV);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+int dacToVoltage(int dac);
+int checkVLimitCompliant(int mV);
+int checkVLimitDacCompliant(int dac);
+int getVLimit();
+void setVLimit(int l);
+
+int isVchipValid(int val);
+int getVchip();
+void setVchip(int val);
+int getVChipToSet(enum DACINDEX ind, int val);
+int getDACIndexFromADCIndex(enum ADCINDEX ind);
+int getADCIndexFromDACIndex(enum DACINDEX ind);
+int isPowerValid(enum DACINDEX ind, int val);
+int getPower();
+void setPower(enum DACINDEX ind, int val);
+void powerOff();
+
+int getADC(enum ADCINDEX ind);
+int getSlowADC(int ichan);
+int getSlowADCTemperature();
+int setHighVoltage(int val);
+
+// parameters - timing, extsig
+
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+
+// configure mac
+int getNumberofUDPInterfaces();
+void calcChecksum(udp_header *udp);
+
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+
+int enableTenGigabitEthernet(int val);
+
+// very detector specific
+
+// chip test board specific - configure frequency, phase, pll,
+// flashing firmware
+int setPhase(enum CLKINDEX ind, int val, int degrees);
+int getPhase(enum CLKINDEX ind, int degrees);
+int getMaxPhase(enum CLKINDEX ind);
+int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
+void configureSyncFrequency(enum CLKINDEX ind);
+void setADCPipeline(int val);
+int getADCPipeline();
+void setDBITPipeline(int val);
+int getDBITPipeline();
+int setLEDEnable(int enable);
+void setDigitalIODelay(uint64_t pinMask, int delay);
+
+int setFrequency(enum CLKINDEX ind, int val);
+int getFrequency(enum CLKINDEX ind);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+int startReadOut();
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd();
+int validateUDPSocket();
+void readandSendUDPFrames();
+void unsetFifoReadStrobes();
+int readSample(int ns);
+uint32_t checkDataInFifo();
+int checkFifoForEndOfAcquisition();
+int readFrameFromFifo();
+u_int32_t runBusy();
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+void getNumberOfChannels(int *nchanx, int *nchany);
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c
index f0b96d487..85a89f2d9 100644
--- a/slsDetectorServers/eigerDetectorServer/FebControl.c
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.c
@@ -4,6 +4,7 @@
 #include "Beb.h"
 #include "FebRegisterDefs.h"
 #include "clogger.h"
+#include "common.h"
 #include "sharedMemory.h"
 #include "slsDetectorServer_defs.h"
 
@@ -403,12 +404,13 @@ int Feb_Control_ReceiveHighVoltage(unsigned int *value) {
 
     // normal
     if (Feb_Control_normal) {
+        int retval = 0;
         if (readParameterFromFile(NORMAL_HIGHVOLTAGE_INPUTPORT, "high voltage",
-                                  value) == FAIL) {
+                                  &retval) == FAIL) {
             LOG(logERROR, ("Could not get high voltage\n"));
             return 0;
         }
-        *value /= 10;
+        *value = retval / 10;
         LOG(logINFO, ("High Voltage: %d\n", (*value)));
     }
 
diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.h b/slsDetectorServers/eigerDetectorServer/FebControl.h
index 63025554f..52908e79f 100644
--- a/slsDetectorServers/eigerDetectorServer/FebControl.h
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.h
@@ -119,6 +119,7 @@ int Feb_Control_PrintCorrectedValues();
 // adcs
 int Feb_Control_GetLeftFPGATemp();
 int Feb_Control_GetRightFPGATemp();
+int Feb_Control_GetFPGAHardwareVersion(int *retval);
 int64_t Feb_Control_GetFrontLeftFirmwareVersion();
 int64_t Feb_Control_GetFrontRightFirmwareVersion();
 int64_t Feb_Control_GetMeasuredPeriod();
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index 9ff6d5fa9..19a7c189b 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..426c8fd7f
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,209 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+
+#if defined(VIRTUAL)
+void setTestImageMode(int ival);
+int getTestImageMode();
+#endif
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition);
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+int getHardwareVersionNumber();
+int getModuleId(int *ret, char *mess);
+int updateModuleId();
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+
+// initialization
+void initControlServer();
+void initStopServer();
+int updateModuleConfiguration();
+int getModuleConfiguration(int *m, int *t, int *n);
+#ifdef VIRTUAL
+void checkVirtual9MFlag();
+#endif
+
+// set up detector
+#if !defined(VIRTUAL)
+void setupFebBeb();
+#endif
+int allocateDetectorStructureMemory();
+void setupDetector();
+
+int resetToDefaultDacs(int hardReset);
+int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
+int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
+int readConfigFile();
+int checkCommandLineConfiguration();
+void resetToHardwareSettings();
+
+// advanced read/write reg
+int writeRegister(uint32_t offset, uint32_t data, int validate);
+int readRegister(uint32_t offset, uint32_t *retval);
+int setBit(const uint32_t addr, const int nBit, int validate);
+int clearBit(const uint32_t addr, const int nBit, int validate);
+int getBit(const uint32_t addr, const int nBit, int *retval);
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+
+// parameters - readout
+int setParallelMode(int mode);
+int getParallelMode();
+int setOverFlowMode(int mode);
+int getOverFlowMode();
+
+// parameters - timer
+int setNextFrameNumber(uint64_t value);
+int getNextFrameNumber(uint64_t *value);
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setExpTime(int64_t val);
+int64_t getExpTime();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+int setSubExpTime(int64_t val);
+int64_t getSubExpTime();
+int setSubDeadTime(int64_t val);
+int64_t getSubDeadTime();
+int64_t getMeasuredPeriod();
+int64_t getMeasuredSubPeriod();
+
+// parameters - module, settings
+void getModule(sls_detector_module *myMod);
+int setModule(sls_detector_module myMod, char *mess);
+int setTrimbits(int *chanregs, char *mess);
+enum detectorSettings setSettings(enum detectorSettings sett);
+enum detectorSettings getSettings();
+
+// parameters - threshold
+int getThresholdEnergy();
+int setThresholdEnergy(int ev);
+
+// parameters - dac, adc, hv
+void setDAC(enum DACINDEX ind, int val, int mV);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+
+int getADC(enum ADCINDEX ind);
+int setHighVoltage(int val);
+
+// parameters - timing, extsig
+int setMaster(enum MASTERINDEX m);
+int setTop(enum TOPINDEX t);
+int isTop(int *retval);
+int isMaster(int *retval);
+
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+
+// configure mac
+int getNumberofUDPInterfaces();
+int getNumberofDestinations(int *retval);
+int setNumberofDestinations(int value);
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+
+int setQuad(int value);
+int getQuad();
+int setInterruptSubframe(int value);
+int getInterruptSubframe();
+int setReadNRows(int value);
+int getReadNRows();
+int enableTenGigabitEthernet(int val);
+
+// very detector specific
+
+// eiger specific - iodelay, pulse, rate, temp, activate, delay nw parameter
+int setReadoutSpeed(int val);
+int getReadoutSpeed(int *retval);
+int setIODelay(int val);
+int setCounterBit(int val);
+int pulsePixel(int n, int x, int y);
+int pulsePixelNMove(int n, int x, int y);
+int pulseChip(int n);
+int updateRateCorrection(char *mess);
+int validateAndSetRateCorrection(int64_t tau_ns, char *mess);
+int setRateCorrection(int64_t custom_tau_in_nsec);
+int getRateCorrectionEnable();
+int getDefaultSettingsTau_in_nsec();
+void setDefaultSettingsTau_in_nsec(int t);
+int64_t getCurrentTau();
+void setExternalGating(int enable[]);
+int setAllTrimbits(int val);
+int getAllTrimbits();
+int getBebFPGATemp();
+int setActivate(int enable);
+int getActivate(int *retval);
+int getDataStream(enum portPosition port, int *retval);
+int setDataStream(enum portPosition port, int enable);
+
+int getTenGigaFlowControl();
+int setTenGigaFlowControl(int value);
+int getTransmissionDelayFrame();
+int setTransmissionDelayFrame(int value);
+int getTransmissionDelayLeft();
+int setTransmissionDelayLeft(int value);
+int getTransmissionDelayRight();
+int setTransmissionDelayRight(int value);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+int softwareTrigger(int block);
+int startReadOut();
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd(int *ret, char *mess);
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index 98bdbcde0..2732f13a7 100755
Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..598a4e251
--- /dev/null
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,213 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include "nios.h"
+#include "programViaNios.h"
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+int checkType();
+int testFpga();
+int testBus();
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+u_int16_t getHardwareVersionNumber();
+int isHardwareVersion_1_0();
+u_int32_t getDetectorNumber();
+int getModuleId(int *ret, char *mess);
+int updateModuleId();
+void setModuleId(int modid);
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+
+// initialization
+void initControlServer();
+void initStopServer();
+
+// set up detector
+void setupDetector();
+int resetToDefaultDacs(int hardReset);
+int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
+int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
+void setASICDefaults();
+int readConfigFile();
+int checkCommandLineConfiguration();
+
+// firmware functions (resets)
+void cleanFifos();
+void resetCore();
+void resetPeripheral();
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+
+// parameters - readout
+int setParallelMode(int mode);
+int getParallelMode();
+
+// parameters - timer
+int setNextFrameNumber(uint64_t value);
+int getNextFrameNumber(uint64_t *value);
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setExpTime(int64_t val);
+int64_t getExpTime();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+void setNumBursts(int64_t val);
+int64_t getNumBursts();
+int setBurstPeriod(int64_t val);
+int64_t getBurstPeriod();
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+int setDelayAfterTrigger(int64_t val);
+int64_t getDelayAfterTrigger();
+int64_t getDelayAfterTriggerLeft();
+int64_t getPeriodLeft();
+int64_t getNumBurstsLeft();
+int64_t getFramesFromStart();
+int64_t getActualTime();
+int64_t getMeasurementTime();
+
+// parameters - module, settings
+enum detectorSettings setSettings(enum detectorSettings sett);
+enum detectorSettings getSettings();
+
+// parameters - dac, adc, hv
+int setOnChipDAC(enum ONCHIP_DACINDEX ind, int chipIndex, int val);
+int getOnChipDAC(enum ONCHIP_DACINDEX ind, int chipIndex);
+void setDAC(enum DACINDEX ind, int val, int mV);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+
+int getADC(enum ADCINDEX ind, int *value);
+int setHighVoltage(int val);
+int getHighVoltage(int *retval);
+
+// parameters - timing, extsig
+int setMaster(enum MASTERINDEX m);
+int isMaster(int *retval);
+
+void updatingRegisters();
+int updateClockDivs();
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+
+// configure mac
+void setNumberofUDPInterfaces(int val);
+int getNumberofUDPInterfaces();
+int getNumberofDestinations(int *retval);
+int setNumberofDestinations(int value);
+int getFirstUDPDestination();
+void setFirstUDPDestination(int value);
+void calcChecksum(udp_header *udp);
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+
+// very detector specific
+int checkDetectorType(char *mess);
+int powerChip(int on, char *mess);
+int getPowerChip();
+int isChipConfigured();
+int configureChip(char *mess);
+void setDBITPipeline(int val);
+int getDBITPipeline();
+int setPhase(enum CLKINDEX ind, int val, int degrees);
+int getPhase(enum CLKINDEX ind, int degrees);
+int getMaxPhase(enum CLKINDEX ind);
+int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
+// void       	setFrequency(enum CLKINDEX ind, int val);
+int getFrequency(enum CLKINDEX ind);
+int getVCOFrequency(enum CLKINDEX ind);
+int setReadoutSpeed(int val);
+int getReadoutSpeed(int *retval);
+int getMaxClockDivider();
+int setClockDivider(enum CLKINDEX ind, int val);
+int getClockDivider(enum CLKINDEX ind);
+int setInjectChannel(int offset, int increment);
+void getInjectedChannels(int *offset, int *increment);
+int setVetoReference(int gainIndex, int value);
+int setVetoPhoton(int chipIndex, int *gainIndices, int *values);
+int configureASICVetoReference(int chipIndex, int *gainIndices, int *values);
+int getVetoPhoton(int chipIndex, int *retvals, int *gainRetvals);
+int setADCConfiguration(int chipIndex, int adcIndex, int value);
+int getADCConfiguration(int chipIndex, int adcIndex);
+int setBurstModeinFPGA(enum burstMode value);
+int setBurstMode(enum burstMode burst);
+int configureASICGlobalSettings();
+enum burstMode getBurstMode();
+int setCDSGain(int enable);
+int getCDSGain();
+int setFilterResistor(int value);
+int getFilterResistor();
+void setCurrentSource(int value);
+int getCurrentSource();
+void setTimingSource(enum timingSourceType value);
+enum timingSourceType getTimingSource();
+void setVeto(int enable);
+int getVeto();
+void setVetoStream(int value);
+int getVetoStream();
+enum vetoAlgorithm getVetoAlgorithm(enum streamingInterface interface);
+void setVetoAlgorithm(enum vetoAlgorithm alg,
+                      enum streamingInterface interface);
+
+int setBadChannels(int numChannels, int *channelList);
+int *getBadChannels(int *numChannels);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd();
+u_int32_t runBusy();
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index bdcdb373f..a992aa229 100755
Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..951098e2b
--- /dev/null
+++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,221 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
+#include "blackfin.h"
+#include "programViaBlackfin.h"
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+int checkType();
+int testFpga();
+int testBus();
+
+#if defined(VIRTUAL)
+void setTestImageMode(int ival);
+int getTestImageMode();
+#endif
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+u_int16_t getHardwareVersionNumber();
+u_int16_t getHardwareSerialNumber();
+int isHardwareVersion_1_0();
+int getChipVersion();
+void setChipVersion(int version);
+u_int32_t getDetectorNumber();
+int getModuleId(int *ret, char *mess);
+int updateModuleId();
+void setModuleId(int modid);
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+
+// initialization
+void initControlServer();
+void initStopServer();
+
+// set up detector
+void setupDetector();
+int resetToDefaultDacs(int hardReset);
+int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
+int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
+int readConfigFile();
+
+// firmware functions (resets)
+void cleanFifos();
+void resetCore();
+void resetPeripheral();
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+void setADCInvertRegister(uint32_t val);
+uint32_t getADCInvertRegister();
+
+// parameters - timer
+int selectStoragecellStart(int pos);
+int getMaxStoragecellStart();
+int setNextFrameNumber(uint64_t value);
+int getNextFrameNumber(uint64_t *value);
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setExpTime(int64_t val);
+int64_t getExpTime();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+void setNumAdditionalStorageCells(int val);
+int getNumAdditionalStorageCells();
+int setStorageCellDelay(int64_t val);
+int64_t getStorageCellDelay();
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+int setDelayAfterTrigger(int64_t val);
+int64_t getDelayAfterTrigger();
+int64_t getDelayAfterTriggerLeft();
+int64_t getPeriodLeft();
+int64_t getFramesFromStart();
+int64_t getActualTime();
+int64_t getMeasurementTime();
+
+// parameters - module, settings
+int setModule(sls_detector_module myMod, char *mess);
+enum detectorSettings setSettings(enum detectorSettings sett);
+enum detectorSettings getSettings();
+enum gainMode getGainMode();
+void setGainMode(enum gainMode mode);
+
+// parameters - dac, adc, hv
+void setDAC(enum DACINDEX ind, int val, int mV);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+int getADC(enum ADCINDEX ind);
+int setHighVoltage(int val);
+int getHighVoltage(int *retval);
+
+// parameters - timing, extsig
+int setMaster(enum MASTERINDEX m);
+int isMaster(int *retval);
+int getSynchronization();
+void setSynchronization(int enable);
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+
+// configure mac
+void setNumberofUDPInterfaces(int val);
+int getNumberofUDPInterfaces();
+int getNumberofDestinations(int *retval);
+int setNumberofDestinations(int value);
+int getFirstUDPDestination();
+void setFirstUDPDestination(int value);
+void selectPrimaryInterface(int val);
+int getPrimaryInterface();
+void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,
+                 uint64_t destmac, uint16_t destport, uint64_t sourcemac,
+                 uint32_t sourceip, uint16_t sourceport);
+void calcChecksum(udp_header *udp);
+
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+
+// very detector specific
+
+int setReadNRows(int value);
+int getReadNRows();
+void initReadoutConfiguration();
+int powerChip(int on);
+int isChipConfigured();
+void configureChip();
+int autoCompDisable(int on);
+int setComparatorDisableTime(int64_t val);
+int64_t getComparatorDisableTime();
+void configureASICTimer();
+int setReadoutSpeed(int val);
+int getReadoutSpeed(int *retval);
+int setPhase(enum CLKINDEX ind, int val, int degrees);
+int getPhase(enum CLKINDEX ind, int degrees);
+int getMaxPhase(enum CLKINDEX ind);
+int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
+int setThresholdTemperature(int val);
+int setTemperatureControl(int val);
+int setTemperatureEvent(int val);
+void alignDeserializer();
+int getFlipRows();
+void setFlipRows(int arg);
+int setFilterResistor(int value);
+int getFilterResistor();
+int getNumberOfFilterCells();
+void setNumberOfFilterCells(int iCell);
+void disableCurrentSource();
+void enableCurrentSource(int fix, uint64_t select, int normal);
+int getCurrentSource();
+int getFixCurrentSource();
+int getNormalCurrentSource();
+uint64_t getSelectCurrentSource();
+int getPedestalMode();
+void getPedestalParameters(uint8_t *frames, uint16_t *loops);
+void setPedestalMode(int enable, uint8_t frames, uint16_t loops);
+int setTimingInfoDecoder(enum timingInfoDecoder val);
+int getTimingInfoDecoder(enum timingInfoDecoder *retval);
+int getElectronCollectionMode();
+void setElectronCollectionMode(int enable);
+
+int getTenGigaFlowControl();
+int setTenGigaFlowControl(int value);
+int getTransmissionDelayFrame();
+int setTransmissionDelayFrame(int value);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+int softwareTrigger(int block);
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd();
+u_int32_t runBusy();
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
index dc962da2b..4b49971ca 100755
Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..8ab13a49b
--- /dev/null
+++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
+#include "blackfin.h"
+#include "programViaBlackfin.h"
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+int checkType();
+int testFpga();
+int testBus();
+
+#if defined(VIRTUAL)
+void setTestImageMode(int ival);
+int getTestImageMode();
+#endif
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+u_int16_t getHardwareVersionNumber();
+u_int16_t getHardwareSerialNumber();
+int isHardwareVersion_1_0();
+u_int32_t getDetectorNumber();
+int getModuleId(int *ret, char *mess);
+int updateModuleId();
+void setModuleId(int modid);
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+
+// initialization
+void initControlServer();
+void initStopServer();
+
+// set up detector
+void setupDetector();
+int resetToDefaultDacs(int hardReset);
+int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
+int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
+
+// firmware functions (resets)
+void cleanFifos();
+void resetCore();
+void resetPeripheral();
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+void setADCInvertRegister(uint32_t val);
+uint32_t getADCInvertRegister();
+
+// parameters - readout
+int setParallelMode(int mode);
+int getParallelMode();
+
+// parameters - timer
+int setNextFrameNumber(uint64_t value);
+int getNextFrameNumber(uint64_t *value);
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setExpTime(int64_t val);
+int64_t getExpTime();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+int setDelayAfterTrigger(int64_t val);
+int64_t getDelayAfterTrigger();
+int64_t getDelayAfterTriggerLeft();
+int64_t getPeriodLeft();
+int64_t getFramesFromStart();
+int64_t getActualTime();
+int64_t getMeasurementTime();
+
+// parameters - module, settings
+int setModule(sls_detector_module myMod, char *mess);
+enum detectorSettings setSettings(enum detectorSettings sett);
+enum detectorSettings getSettings();
+
+// parameters - dac, adc, hv
+void setDAC(enum DACINDEX ind, int val, int mV);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+int getADC(enum ADCINDEX ind);
+int setHighVoltage(int val);
+
+// parameters - timing, extsig
+int setMaster(enum MASTERINDEX m);
+int isMaster(int *retval);
+int getSynchronization();
+void setSynchronization(int enable);
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+
+// configure mac
+void setNumberofUDPInterfaces(int val);
+int getNumberofUDPInterfaces();
+int getNumberofDestinations(int *retval);
+int setNumberofDestinations(int value);
+int getFirstUDPDestination();
+void setFirstUDPDestination(int value);
+void selectPrimaryInterface(int val);
+int getPrimaryInterface();
+void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,
+                 uint64_t destmac, uint16_t destport, uint64_t sourcemac,
+                 uint32_t sourceip, uint16_t sourceport);
+void calcChecksum(udp_header *udp);
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+
+// very detector specific
+
+// jungfrau/moench specific - powerchip, autocompdisable, clockdiv, asictimer,
+// clock, pll, flashing firmware
+void setADCPipeline(int val);
+int getADCPipeline();
+int setReadNRows(int value);
+int getReadNRows();
+void initReadoutConfiguration();
+int powerChip(int on);
+int setReadoutSpeed(int val);
+int getReadoutSpeed(int *retval);
+int setPhase(enum CLKINDEX ind, int val, int degrees);
+int getPhase(enum CLKINDEX ind, int degrees);
+int getMaxPhase(enum CLKINDEX ind);
+int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
+int setThresholdTemperature(int val);
+int setTemperatureControl(int val);
+int setTemperatureEvent(int val);
+void alignDeserializer();
+int getFlipRows();
+void setFlipRows(int arg);
+
+int getTenGigaFlowControl();
+int setTenGigaFlowControl(int value);
+int getTransmissionDelayFrame();
+int setTransmissionDelayFrame(int value);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+int softwareTrigger(int block);
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd();
+u_int32_t runBusy();
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index ffda96dac..e4f56bed2 100755
Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ
diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..1032fcc32
--- /dev/null
+++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include "mythen3.h"
+#include "nios.h"
+#include "programViaNios.h"
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+int checkType();
+int testFpga();
+int testBus();
+
+void setTestImageMode(int ival);
+int getTestImageMode();
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+u_int16_t getHardwareVersionNumber();
+int isHardwareVersion_1_0();
+u_int32_t getDetectorNumber();
+int getModuleId(int *ret, char *mess);
+int updateModuleId();
+void setModuleId(int modid);
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+
+// initialization
+void initControlServer();
+void initStopServer();
+
+// set up detector
+int allocateDetectorStructureMemory();
+void setupDetector();
+int resetToDefaultDacs(int hardReset);
+int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
+int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
+void setASICDefaults();
+void setADIFDefaults();
+int checkCommandLineConfiguration();
+
+// firmware functions (resets)
+void cleanFifos();
+void resetCore();
+void resetPeripheral();
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+
+// parameters - readout
+int setParallelMode(int mode);
+int getParallelMode();
+
+// parameters - timer
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+void setNumIntGates(int val);
+void setNumGates(int val);
+int getNumGates();
+void updateGatePeriod();
+int64_t getGatePeriod();
+int setExpTime(int gateIndex, int64_t val);
+int64_t getExpTime(int gateIndex);
+int setGateDelay(int gateIndex, int64_t val);
+int64_t getGateDelay(int gateIndex);
+
+void setCounterMask(uint32_t arg);
+void setCounterMaskWithUpdateFlag(uint32_t arg, int updateMaskFlag);
+uint32_t getCounterMask();
+void updatePacketizing();
+
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+int setDelayAfterTrigger(int64_t val);
+int64_t getDelayAfterTrigger();
+int64_t getDelayAfterTriggerLeft();
+int64_t getPeriodLeft();
+int64_t getFramesFromStart();
+int64_t getActualTime();
+int64_t getMeasurementTime();
+
+// parameters - module, settings
+void getModule(sls_detector_module *myMod);
+int setModule(sls_detector_module myMod, char *mess);
+int setTrimbits(int *trimbits);
+int setAllTrimbits(int val);
+int getAllTrimbits();
+enum detectorSettings setSettings(enum detectorSettings sett);
+enum detectorSettings getSettings();
+
+// parameters - threshold
+int getThresholdEnergy(int counterIndex);
+void setThresholdEnergy(int counterIndex, int eV);
+
+// parameters - dac, adc, hv
+void setDAC(enum DACINDEX ind, int val, int mV, int counterEnableCheck);
+void setGeneralDAC(enum DACINDEX ind, int val, int mV);
+void setVthDac(int index, int enable);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+
+int getADC(enum ADCINDEX ind, int *value);
+int setHighVoltage(int val);
+int getHighVoltage(int *retval);
+
+// parameters - timing, extsig
+int isMaster(int *retval);
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+void setInitialExtSignals();
+int setChipStatusRegister(int csr);
+int setGainCaps(int caps);
+int setInterpolation(int enable);
+int setPumpProbe(int enable);
+int setDigitalPulsing(int enable);
+int setAnalogPulsing(int enable);
+int setNegativePolarity(int enable);
+int setDACS(int *dacs);
+void setExtSignal(int signalIndex, enum externalSignalFlag mode);
+int getExtSignal(int signalIndex);
+
+// configure mac
+int getNumberofUDPInterfaces();
+int getNumberofDestinations(int *retval);
+int setNumberofDestinations(int value);
+int getFirstUDPDestination();
+void setFirstUDPDestination(int value);
+void calcChecksum(udp_header *udp);
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+int enableTenGigabitEthernet(int val);
+
+// very detector specific
+int checkDetectorType(char *mess);
+int powerChip(int on);
+int setPhase(enum CLKINDEX ind, int val, int degrees);
+int getPhase(enum CLKINDEX ind, int degrees);
+int getMaxPhase(enum CLKINDEX ind);
+int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
+// void       	setFrequency(enum CLKINDEX ind, int val);
+int getFrequency(enum CLKINDEX ind);
+int getVCOFrequency(enum CLKINDEX ind);
+int getMaxClockDivider();
+int setClockDivider(enum CLKINDEX ind, int val);
+int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val,
+                                        int timeUpdate);
+int getClockDivider(enum CLKINDEX ind);
+int setReadoutSpeed(int val);
+int getReadoutSpeed(int *retval);
+int setBadChannels(int numChannels, int *channelList);
+int *getBadChannels(int *numChannels);
+
+int getTransmissionDelayFrame();
+int setTransmissionDelayFrame(int value);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+int softwareTrigger();
+int startReadOut();
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd();
+u_int32_t runBusy();
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
deleted file mode 100644
index 7114c7f4b..000000000
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
+++ /dev/null
@@ -1,742 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#include "sls/sls_detector_defs.h"
-#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
-
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
-#include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
-#endif
-
-#if defined(MYTHEN3D) || defined(GOTTHARD2D)
-#include "nios.h"
-#include "programViaNios.h"
-#elif defined(CHIPTESTBOARDD) || defined(JUNGFRAUD) || defined(MOENCHD)
-#include "blackfin.h"
-#include "programViaBlackfin.h"
-#endif
-
-#ifdef ARMPROCESSOR
-#include "arm64.h"
-#include "programViaArm.h"
-#endif
-
-#ifdef MYTHEN3D
-#include "mythen3.h"
-#endif
-
-#include <stdio.h> // FILE
-#include <stdlib.h>
-#include <sys/types.h>
-
-/****************************************************
-This functions are used by the slsDetectroServer_funcs interface.
-Here are the definitions, but the actual implementation should be done for each
-single detector.
-
-****************************************************/
-
-enum interfaceType { OUTER, INNER };
-typedef struct udpStruct_s {
-    uint16_t srcport;
-    uint16_t srcport2;
-    uint16_t dstport;
-    uint16_t dstport2;
-    uint64_t srcmac;
-    uint64_t srcmac2;
-    uint64_t dstmac;
-    uint64_t dstmac2;
-    uint32_t srcip;
-    uint32_t srcip2;
-    uint32_t dstip;
-    uint32_t dstip2;
-} udpStruct;
-#define MAC_ADDRESS_SIZE 18
-
-// basic tests
-int isInitCheckDone();
-int getInitResult(char **mess);
-void basictests();
-#if !defined(EIGERD)
-int checkType();
-int testFpga();
-#ifdef XILINX_CHIPTESTBOARDD
-int testFixedFPGAPattern();
-#else
-int testBus();
-#endif
-#endif
-
-#if ((defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)) &&            \
-     defined(VIRTUAL))
-void setTestImageMode(int ival);
-int getTestImageMode();
-#endif
-
-// Ids
-void getServerVersion(char *version);
-u_int64_t getFirmwareVersion();
-#ifdef EIGERD
-uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition);
-#endif
-u_int64_t getFirmwareAPIVersion();
-void getHardwareVersion(char *version);
-#ifdef EIGERD
-int getHardwareVersionNumber();
-#else
-#ifndef XILINX_CHIPTESTBOARDD
-u_int16_t getHardwareVersionNumber();
-#endif
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
-u_int16_t getHardwareSerialNumber();
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(MYTHEN3D)
-int isHardwareVersion_1_0();
-#endif
-#if defined(JUNGFRAUD)
-int getChipVersion();
-void setChipVersion(int version);
-#endif
-#ifndef EIGERD
-u_int32_t getDetectorNumber();
-#endif
-
-#if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D) ||             \
-    defined(JUNGFRAUD) || defined(MOENCHD)
-int getModuleId(int *ret, char *mess);
-int updateModuleId();
-#ifndef EIGERD
-void setModuleId(int modid);
-#endif
-#endif
-u_int64_t getDetectorMAC();
-u_int32_t getDetectorIP();
-
-#if defined(CHIPTESTBOARDD)
-int enableBlackfinAMCExternalAccessExtension(char *mess);
-#endif
-
-// initialization
-void initControlServer();
-void initStopServer();
-#ifdef EIGERD
-int updateModuleConfiguration();
-int getModuleConfiguration(int *m, int *t, int *n);
-#ifdef VIRTUAL
-void checkVirtual9MFlag();
-#endif
-#endif
-
-// set up detector
-#if defined(EIGERD) && !defined(VIRTUAL)
-void setupFebBeb();
-#endif
-#if defined(EIGERD) || defined(MYTHEN3D)
-int allocateDetectorStructureMemory();
-#endif
-void setupDetector();
-#if defined(CHIPTESTBOARDD)
-int updateDatabytesandAllocateRAM();
-void updateDataBytes();
-#endif
-
-#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)
-int resetToDefaultDacs(int hardReset);
-int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
-int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
-#endif
-#if defined(MYTHEN3D) || defined(GOTTHARD2D)
-void setASICDefaults();
-#endif
-#ifdef MYTHEN3D
-void setADIFDefaults();
-#endif
-#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD)
-int readConfigFile();
-#endif
-#if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D)
-int checkCommandLineConfiguration();
-#endif
-#ifdef EIGERD
-void resetToHardwareSettings();
-#endif
-
-// advanced read/write reg
-#ifdef EIGERD
-int writeRegister(uint32_t offset, uint32_t data, int validate);
-int readRegister(uint32_t offset, uint32_t *retval);
-int setBit(const uint32_t addr, const int nBit, int validate);
-int clearBit(const uint32_t addr, const int nBit, int validate);
-int getBit(const uint32_t addr, const int nBit, int *retval);
-#endif
-
-// firmware functions (resets)
-#if defined(XILINX_CHIPTESTBOARDD)
-void cleanFifos();
-void resetFlow();
-int waitTransceiverReset(char *mess);
-#ifdef VIRTUAL
-void setTransceiverAlignment(int align);
-#endif
-int isTransceiverAligned();
-int waitTransceiverAligned(char *mess);
-int configureTransceiver(char *mess);
-int isChipConfigured();
-int powerChip(int on, char *mess);
-int getPowerChip();
-int configureChip(char *mess);
-int readConfigFile(char *mess, char *fileName, char *fileType);
-int resetChip(char *mess);
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
-    defined(MYTHEN3D) || defined(GOTTHARD2D)
-void cleanFifos();
-void resetCore();
-void resetPeripheral();
-#endif
-
-// parameters - dr, roi
-int setDynamicRange(int dr);
-int getDynamicRange(int *retval);
-#if defined(JUNGFRAUD) || defined(MOENCHD)
-void setADCInvertRegister(uint32_t val);
-uint32_t getADCInvertRegister();
-#endif
-#if defined(CHIPTESTBOARDD)
-int setADCEnableMask(uint32_t mask);
-uint32_t getADCEnableMask();
-void setADCEnableMask_10G(uint32_t mask);
-uint32_t getADCEnableMask_10G();
-int setTransceiverEnableMask(uint32_t mask);
-uint32_t getTransceiverEnableMask();
-void setADCInvertRegister(uint32_t val);
-uint32_t getADCInvertRegister();
-#endif
-#ifdef XILINX_CHIPTESTBOARDD
-void setADCEnableMask_10G(uint32_t mask);
-uint32_t getADCEnableMask_10G();
-int setTransceiverEnableMask(uint32_t mask);
-uint32_t getTransceiverEnableMask();
-#endif
-#if defined(CHIPTESTBOARDD)
-int setExternalSamplingSource(int val);
-int setExternalSampling(int val);
-#endif
-
-// parameters - readout
-#if defined(EIGERD) || defined(MYTHEN3D) || defined(GOTTHARD2D) ||             \
-    defined(MOENCHD)
-int setParallelMode(int mode);
-int getParallelMode();
-#endif
-#ifdef EIGERD
-int setOverFlowMode(int mode);
-int getOverFlowMode();
-#endif
-#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
-int setReadoutMode(enum readoutMode mode);
-int getReadoutMode();
-#endif
-
-// parameters - timer
-#if defined(JUNGFRAUD)
-int selectStoragecellStart(int pos);
-int getMaxStoragecellStart();
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
-    defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) ||               \
-    defined(GOTTHARD2D)
-int setNextFrameNumber(uint64_t value);
-int getNextFrameNumber(uint64_t *value);
-#endif
-void setNumFrames(int64_t val);
-int64_t getNumFrames();
-void setNumTriggers(int64_t val);
-int64_t getNumTriggers();
-#ifndef MYTHEN3D
-int setExpTime(int64_t val);
-int64_t getExpTime();
-#endif
-int setPeriod(int64_t val);
-int64_t getPeriod();
-#ifdef MYTHEN3D
-void setNumIntGates(int val);
-void setNumGates(int val);
-int getNumGates();
-void updateGatePeriod();
-int64_t getGatePeriod();
-int setExpTime(int gateIndex, int64_t val);
-int64_t getExpTime(int gateIndex);
-int setGateDelay(int gateIndex, int64_t val);
-int64_t getGateDelay(int gateIndex);
-#endif
-#ifdef GOTTHARD2D
-void setNumBursts(int64_t val);
-int64_t getNumBursts();
-int setBurstPeriod(int64_t val);
-int64_t getBurstPeriod();
-#endif
-#ifdef EIGERD
-int setSubExpTime(int64_t val);
-int64_t getSubExpTime();
-int setSubDeadTime(int64_t val);
-int64_t getSubDeadTime();
-int64_t getMeasuredPeriod();
-int64_t getMeasuredSubPeriod();
-#endif
-#if defined(JUNGFRAUD)
-void setNumAdditionalStorageCells(int val);
-int getNumAdditionalStorageCells();
-int setStorageCellDelay(int64_t val);
-int64_t getStorageCellDelay();
-#endif
-#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
-int setNumAnalogSamples(int val);
-int getNumAnalogSamples();
-int setNumDigitalSamples(int val);
-int getNumDigitalSamples();
-int setNumTransceiverSamples(int val);
-int getNumTransceiverSamples();
-#endif
-#ifdef MYTHEN3D
-void setCounterMask(uint32_t arg);
-void setCounterMaskWithUpdateFlag(uint32_t arg, int updateMaskFlag);
-uint32_t getCounterMask();
-void updatePacketizing();
-#endif
-
-#ifndef EIGERD
-int64_t getNumFramesLeft();
-int64_t getNumTriggersLeft();
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
-    defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
-int setDelayAfterTrigger(int64_t val);
-int64_t getDelayAfterTrigger();
-int64_t getDelayAfterTriggerLeft();
-int64_t getPeriodLeft();
-#endif
-#ifdef GOTTHARD2D
-int64_t getNumBurstsLeft();
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
-    defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
-int64_t getFramesFromStart();
-int64_t getActualTime();
-int64_t getMeasurementTime();
-#endif
-
-// parameters - module, settings
-#if defined(MYTHEN3D) || defined(EIGERD)
-void getModule(sls_detector_module *myMod);
-#endif
-#if (!defined(CHIPTESTBOARDD)) && (!defined(GOTTHARD2D))
-int setModule(sls_detector_module myMod, char *mess);
-#endif
-
-#ifdef EIGERD
-int setTrimbits(int *chanregs, char *mess);
-#endif
-#ifdef MYTHEN3D
-int setTrimbits(int *trimbits);
-int setAllTrimbits(int val);
-int getAllTrimbits();
-#endif
-#ifndef XILINX_CHIPTESTBOARDD
-#ifndef CHIPTESTBOARDD
-enum detectorSettings setSettings(enum detectorSettings sett);
-#endif
-enum detectorSettings getSettings();
-#endif
-#if defined(JUNGFRAUD)
-enum gainMode getGainMode();
-void setGainMode(enum gainMode mode);
-#endif
-
-// parameters - threshold
-#ifdef EIGERD
-int getThresholdEnergy();
-int setThresholdEnergy(int ev);
-#endif
-#ifdef MYTHEN3D
-int getThresholdEnergy(int counterIndex);
-void setThresholdEnergy(int counterIndex, int eV);
-#endif
-// parameters - dac, adc, hv
-
-#ifdef GOTTHARD2D
-int setOnChipDAC(enum ONCHIP_DACINDEX ind, int chipIndex, int val);
-int getOnChipDAC(enum ONCHIP_DACINDEX ind, int chipIndex);
-#endif
-#ifdef MYTHEN3D
-void setDAC(enum DACINDEX ind, int val, int mV, int counterEnableCheck);
-void setGeneralDAC(enum DACINDEX ind, int val, int mV);
-void setVthDac(int index, int enable);
-#else
-void setDAC(enum DACINDEX ind, int val, int mV);
-#endif
-int getDAC(enum DACINDEX ind, int mV);
-int getMaxDacSteps();
-#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
-int dacToVoltage(int dac);
-int checkVLimitCompliant(int mV);
-int checkVLimitDacCompliant(int dac);
-int getVLimit();
-void setVLimit(int l);
-#endif
-
-#ifdef CHIPTESTBOARDD
-int isVchipValid(int val);
-int getVchip();
-void setVchip(int val);
-int getVChipToSet(enum DACINDEX ind, int val);
-int getDACIndexFromADCIndex(enum ADCINDEX ind);
-int getADCIndexFromDACIndex(enum DACINDEX ind);
-int isPowerValid(enum DACINDEX ind, int val);
-int getPower();
-void setPower(enum DACINDEX ind, int val);
-void powerOff();
-#elif XILINX_CHIPTESTBOARDD
-int getBitOffsetFromDACIndex(enum DACINDEX ind);
-int isPowerValid(enum DACINDEX ind, int val);
-int getPower();
-void setPower(enum DACINDEX ind, int val);
-#endif
-
-#if defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
-int getADC(enum ADCINDEX ind, int *value);
-#else
-int getADC(enum ADCINDEX ind);
-#endif
-#ifdef CHIPTESTBOARDD
-int getSlowADC(int ichan);
-int getSlowADCTemperature();
-#endif
-#ifdef XILINX_CHIPTESTBOARDD
-int getSlowADC(int ichan, int *retval);
-int getTemperature(int *retval);
-#else
-int setHighVoltage(int val);
-#if defined(MYTHEN3D) || defined(GOTTHARD2D)
-int getHighVoltage(int *retval);
-#endif
-#endif
-
-// parameters - timing, extsig
-#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD) ||            \
-    defined(MOENCHD)
-int setMaster(enum MASTERINDEX m);
-#endif
-#ifdef EIGERD
-int setTop(enum TOPINDEX t);
-int isTop(int *retval);
-#endif
-#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARD2D) ||             \
-    defined(JUNGFRAUD) || defined(MOENCHD)
-int isMaster(int *retval);
-#endif
-
-#if defined(JUNGFRAUD) || defined(MOENCHD)
-int getSynchronization();
-void setSynchronization(int enable);
-#endif
-
-#ifdef GOTTHARD2D
-void updatingRegisters();
-int updateClockDivs();
-#endif
-void setTiming(enum timingMode arg);
-enum timingMode getTiming();
-#ifdef MYTHEN3D
-void setInitialExtSignals();
-int setChipStatusRegister(int csr);
-int setGainCaps(int caps);
-int setInterpolation(int enable);
-int setPumpProbe(int enable);
-int setDigitalPulsing(int enable);
-int setAnalogPulsing(int enable);
-int setNegativePolarity(int enable);
-int setDACS(int *dacs);
-#endif
-#if defined(MYTHEN3D)
-void setExtSignal(int signalIndex, enum externalSignalFlag mode);
-int getExtSignal(int signalIndex);
-#endif
-
-// configure mac
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D)
-void setNumberofUDPInterfaces(int val);
-#endif
-int getNumberofUDPInterfaces();
-
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
-    defined(MYTHEN3D) || defined(GOTTHARD2D)
-int getNumberofDestinations(int *retval);
-int setNumberofDestinations(int value);
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(MYTHEN3D) ||             \
-    defined(GOTTHARD2D)
-int getFirstUDPDestination();
-void setFirstUDPDestination(int value);
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD)
-void selectPrimaryInterface(int val);
-int getPrimaryInterface();
-void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,
-                 uint64_t destmac, uint16_t destport, uint64_t sourcemac,
-                 uint32_t sourceip, uint16_t sourceport);
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(MYTHEN3D) || defined(CHIPTESTBOARDD) ||                            \
-    defined(XILINX_CHIPTESTBOARDD)
-void calcChecksum(udp_header *udp);
-#endif
-
-int configureMAC();
-int setDetectorPosition(int pos[]);
-int *getDetectorPosition();
-
-#ifdef EIGERD
-int setQuad(int value);
-int getQuad();
-int setInterruptSubframe(int value);
-int getInterruptSubframe();
-int setReadNRows(int value);
-int getReadNRows();
-#endif
-#if defined(CHIPTESTBOARDD) || defined(EIGERD) || defined(MYTHEN3D)
-int enableTenGigabitEthernet(int val);
-#endif
-
-// very detector specific
-
-// chip test board specific - configure frequency, phase, pll,
-// flashing firmware
-#if defined(CHIPTESTBOARDD)
-int setPhase(enum CLKINDEX ind, int val, int degrees);
-int getPhase(enum CLKINDEX ind, int degrees);
-int getMaxPhase(enum CLKINDEX ind);
-int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
-void configureSyncFrequency(enum CLKINDEX ind);
-void setADCPipeline(int val);
-int getADCPipeline();
-void setDBITPipeline(int val);
-int getDBITPipeline();
-int setLEDEnable(int enable);
-void setDigitalIODelay(uint64_t pinMask, int delay);
-#endif
-
-#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
-int setFrequency(enum CLKINDEX ind, int val);
-int getFrequency(enum CLKINDEX ind);
-#endif
-
-// jungfrau/moench specific - powerchip, autocompdisable, clockdiv, asictimer,
-// clock, pll, flashing firmware
-#if defined(MOENCHD)
-void setADCPipeline(int val);
-int getADCPipeline();
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD)
-int setReadNRows(int value);
-int getReadNRows();
-void initReadoutConfiguration();
-int powerChip(int on);
-#ifndef MOENCHD
-int isChipConfigured();
-void configureChip();
-int autoCompDisable(int on);
-int setComparatorDisableTime(int64_t val);
-int64_t getComparatorDisableTime();
-void configureASICTimer();
-#endif
-int setReadoutSpeed(int val);
-int getReadoutSpeed(int *retval);
-int setPhase(enum CLKINDEX ind, int val, int degrees);
-int getPhase(enum CLKINDEX ind, int degrees);
-int getMaxPhase(enum CLKINDEX ind);
-int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
-int setThresholdTemperature(int val);
-int setTemperatureControl(int val);
-int setTemperatureEvent(int val);
-void alignDeserializer();
-int getFlipRows();
-void setFlipRows(int arg);
-#ifndef MOENCHD
-int setFilterResistor(int value);
-int getFilterResistor();
-int getNumberOfFilterCells();
-void setNumberOfFilterCells(int iCell);
-void disableCurrentSource();
-void enableCurrentSource(int fix, uint64_t select, int normal);
-int getCurrentSource();
-int getFixCurrentSource();
-int getNormalCurrentSource();
-uint64_t getSelectCurrentSource();
-int getPedestalMode();
-void getPedestalParameters(uint8_t *frames, uint16_t *loops);
-void setPedestalMode(int enable, uint8_t frames, uint16_t loops);
-int setTimingInfoDecoder(enum timingInfoDecoder val);
-int getTimingInfoDecoder(enum timingInfoDecoder *retval);
-int getElectronCollectionMode();
-void setElectronCollectionMode(int enable);
-#endif
-
-// eiger specific - iodelay, pulse, rate, temp, activate, delay nw parameter
-#elif EIGERD
-int setReadoutSpeed(int val);
-int getReadoutSpeed(int *retval);
-int setIODelay(int val);
-int setCounterBit(int val);
-int pulsePixel(int n, int x, int y);
-int pulsePixelNMove(int n, int x, int y);
-int pulseChip(int n);
-int updateRateCorrection(char *mess);
-int validateAndSetRateCorrection(int64_t tau_ns, char *mess);
-int setRateCorrection(int64_t custom_tau_in_nsec);
-int getRateCorrectionEnable();
-int getDefaultSettingsTau_in_nsec();
-void setDefaultSettingsTau_in_nsec(int t);
-int64_t getCurrentTau();
-void setExternalGating(int enable[]);
-int setAllTrimbits(int val);
-int getAllTrimbits();
-int getBebFPGATemp();
-int setActivate(int enable);
-int getActivate(int *retval);
-int getDataStream(enum portPosition port, int *retval);
-int setDataStream(enum portPosition port, int enable);
-
-#elif MYTHEN3D
-int checkDetectorType(char *mess);
-int powerChip(int on);
-int setPhase(enum CLKINDEX ind, int val, int degrees);
-int getPhase(enum CLKINDEX ind, int degrees);
-int getMaxPhase(enum CLKINDEX ind);
-int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
-// void       	setFrequency(enum CLKINDEX ind, int val);
-int getFrequency(enum CLKINDEX ind);
-int getVCOFrequency(enum CLKINDEX ind);
-int getMaxClockDivider();
-int setClockDivider(enum CLKINDEX ind, int val);
-int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val,
-                                        int timeUpdate);
-int getClockDivider(enum CLKINDEX ind);
-int setReadoutSpeed(int val);
-int getReadoutSpeed(int *retval);
-#elif GOTTHARD2D
-int checkDetectorType(char *mess);
-int powerChip(int on, char *mess);
-int getPowerChip();
-int isChipConfigured();
-int configureChip(char *mess);
-void setDBITPipeline(int val);
-int getDBITPipeline();
-int setPhase(enum CLKINDEX ind, int val, int degrees);
-int getPhase(enum CLKINDEX ind, int degrees);
-int getMaxPhase(enum CLKINDEX ind);
-int validatePhaseinDegrees(enum CLKINDEX ind, int val, int retval);
-// void       	setFrequency(enum CLKINDEX ind, int val);
-int getFrequency(enum CLKINDEX ind);
-int getVCOFrequency(enum CLKINDEX ind);
-int setReadoutSpeed(int val);
-int getReadoutSpeed(int *retval);
-int getMaxClockDivider();
-int setClockDivider(enum CLKINDEX ind, int val);
-int getClockDivider(enum CLKINDEX ind);
-int setInjectChannel(int offset, int increment);
-void getInjectedChannels(int *offset, int *increment);
-int setVetoReference(int gainIndex, int value);
-int setVetoPhoton(int chipIndex, int *gainIndices, int *values);
-int configureASICVetoReference(int chipIndex, int *gainIndices, int *values);
-int getVetoPhoton(int chipIndex, int *retvals, int *gainRetvals);
-int setADCConfiguration(int chipIndex, int adcIndex, int value);
-int getADCConfiguration(int chipIndex, int adcIndex);
-int setBurstModeinFPGA(enum burstMode value);
-int setBurstMode(enum burstMode burst);
-int configureASICGlobalSettings();
-enum burstMode getBurstMode();
-int setCDSGain(int enable);
-int getCDSGain();
-int setFilterResistor(int value);
-int getFilterResistor();
-void setCurrentSource(int value);
-int getCurrentSource();
-void setTimingSource(enum timingSourceType value);
-enum timingSourceType getTimingSource();
-void setVeto(int enable);
-int getVeto();
-void setVetoStream(int value);
-int getVetoStream();
-enum vetoAlgorithm getVetoAlgorithm(enum streamingInterface interface);
-void setVetoAlgorithm(enum vetoAlgorithm alg,
-                      enum streamingInterface interface);
-#endif
-
-#if defined(GOTTHARD2D) || defined(MYTHEN3D)
-int setBadChannels(int numChannels, int *channelList);
-int *getBadChannels(int *numChannels);
-#endif
-
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD)
-int getTenGigaFlowControl();
-int setTenGigaFlowControl(int value);
-#endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
-    defined(MYTHEN3D)
-int getTransmissionDelayFrame();
-int setTransmissionDelayFrame(int value);
-#endif
-#ifdef EIGERD
-int getTransmissionDelayLeft();
-int setTransmissionDelayLeft(int value);
-int getTransmissionDelayRight();
-int setTransmissionDelayRight(int value);
-#endif
-
-// aquisition
-int startStateMachine();
-#ifdef VIRTUAL
-void *start_timer(void *arg);
-#endif
-int stopStateMachine();
-#if defined(MYTHEN3D) || defined(XILINX_CHIPTESTBOARDD)
-int softwareTrigger();
-#endif
-#if defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)
-int softwareTrigger(int block);
-#endif
-#if defined(EIGERD) || defined(MYTHEN3D) || defined(CHIPTESTBOARDD)
-int startReadOut();
-#endif
-enum runStatus getRunStatus();
-#ifdef EIGERD
-void waitForAcquisitionEnd(int *ret, char *mess);
-#else
-void waitForAcquisitionEnd();
-#endif
-#if defined(CHIPTESTBOARDD)
-int validateUDPSocket();
-void readandSendUDPFrames();
-void unsetFifoReadStrobes();
-int readSample(int ns);
-uint32_t checkDataInFifo();
-int checkFifoForEndOfAcquisition();
-int readFrameFromFifo();
-#endif
-
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
-    defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
-u_int32_t runBusy();
-#endif
-
-// common
-int calculateDataBytes();
-int getTotalNumberOfChannels();
-#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
-void getNumberOfChannels(int *nchanx, int *nchany);
-#endif
-int getNumberOfChips();
-int getNumberOfDACs();
-int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
index b3a23d9f5..d3c921dfe 100755
Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h
new file mode 100644
index 000000000..1b584109f
--- /dev/null
+++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h
@@ -0,0 +1,174 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "sls/sls_detector_defs.h"
+#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
+
+#include "arm64.h"
+#include "programViaArm.h"
+
+#include <stdio.h> // FILE
+#include <stdlib.h>
+#include <sys/types.h>
+
+/****************************************************
+This functions are used by the slsDetectroServer_funcs interface.
+Here are the definitions, but the actual implementation should be done for each
+single detector.
+
+****************************************************/
+
+enum interfaceType { OUTER, INNER };
+typedef struct udpStruct_s {
+    uint16_t srcport;
+    uint16_t srcport2;
+    uint16_t dstport;
+    uint16_t dstport2;
+    uint64_t srcmac;
+    uint64_t srcmac2;
+    uint64_t dstmac;
+    uint64_t dstmac2;
+    uint32_t srcip;
+    uint32_t srcip2;
+    uint32_t dstip;
+    uint32_t dstip2;
+} udpStruct;
+#define MAC_ADDRESS_SIZE 18
+
+// basic tests
+int isInitCheckDone();
+int getInitResult(char **mess);
+void basictests();
+int checkType();
+int testFpga();
+int testFixedFPGAPattern();
+
+// Ids
+void getServerVersion(char *version);
+u_int64_t getFirmwareVersion();
+u_int64_t getFirmwareAPIVersion();
+void getHardwareVersion(char *version);
+u_int32_t getDetectorNumber();
+u_int64_t getDetectorMAC();
+u_int32_t getDetectorIP();
+
+// initialization
+void initControlServer();
+void initStopServer();
+
+// set up detector
+void setupDetector();
+
+// firmware functions (resets)
+void cleanFifos();
+void resetFlow();
+int waitTransceiverReset(char *mess);
+#ifdef VIRTUAL
+void setTransceiverAlignment(int align);
+#endif
+int isTransceiverAligned();
+int waitTransceiverAligned(char *mess);
+int configureTransceiver(char *mess);
+int isChipConfigured();
+int powerChip(int on, char *mess);
+int getPowerChip();
+int configureChip(char *mess);
+int readConfigFile(char *mess, char *fileName, char *fileType);
+int resetChip(char *mess);
+
+// parameters - dr, roi
+int setDynamicRange(int dr);
+int getDynamicRange(int *retval);
+void setADCEnableMask_10G(uint32_t mask);
+uint32_t getADCEnableMask_10G();
+int setTransceiverEnableMask(uint32_t mask);
+uint32_t getTransceiverEnableMask();
+
+// parameters - readout
+int setReadoutMode(enum readoutMode mode);
+int getReadoutMode();
+
+// parameters - timer
+int setNextFrameNumber(uint64_t value);
+int getNextFrameNumber(uint64_t *value);
+void setNumFrames(int64_t val);
+int64_t getNumFrames();
+void setNumTriggers(int64_t val);
+int64_t getNumTriggers();
+int setExpTime(int64_t val);
+int64_t getExpTime();
+int setPeriod(int64_t val);
+int64_t getPeriod();
+int setNumAnalogSamples(int val);
+int getNumAnalogSamples();
+int setNumDigitalSamples(int val);
+int getNumDigitalSamples();
+int setNumTransceiverSamples(int val);
+int getNumTransceiverSamples();
+
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+int setDelayAfterTrigger(int64_t val);
+int64_t getDelayAfterTrigger();
+int64_t getDelayAfterTriggerLeft();
+int64_t getPeriodLeft();
+int64_t getFramesFromStart();
+int64_t getActualTime();
+int64_t getMeasurementTime();
+
+// parameters - module, settings
+int setModule(sls_detector_module myMod, char *mess);
+
+// parameters - dac, adc, hv
+void setDAC(enum DACINDEX ind, int val, int mV);
+int getDAC(enum DACINDEX ind, int mV);
+int getMaxDacSteps();
+int dacToVoltage(int dac);
+int checkVLimitCompliant(int mV);
+int checkVLimitDacCompliant(int dac);
+int getVLimit();
+void setVLimit(int l);
+int getBitOffsetFromDACIndex(enum DACINDEX ind);
+int isPowerValid(enum DACINDEX ind, int val);
+int getPower();
+void setPower(enum DACINDEX ind, int val);
+int getADC(enum ADCINDEX ind, int *value);
+int getSlowADC(int ichan, int *retval);
+int getTemperature(int *retval);
+int setHighVoltage(int val);
+
+// parameters - timing, extsig
+void setTiming(enum timingMode arg);
+enum timingMode getTiming();
+
+// configure mac
+int getNumberofUDPInterfaces();
+void calcChecksum(udp_header *udp);
+int configureMAC();
+int setDetectorPosition(int pos[]);
+int *getDetectorPosition();
+
+// very detector specific
+
+// chip test board specific - configure frequency, phase, pll,
+// flashing firmware
+int setFrequency(enum CLKINDEX ind, int val);
+int getFrequency(enum CLKINDEX ind);
+
+// aquisition
+int startStateMachine();
+#ifdef VIRTUAL
+void *start_timer(void *arg);
+#endif
+int stopStateMachine();
+int softwareTrigger();
+enum runStatus getRunStatus();
+void waitForAcquisitionEnd();
+u_int32_t runBusy();
+
+// common
+int calculateDataBytes();
+int getTotalNumberOfChannels();
+void getNumberOfChannels(int *nchanx, int *nchany);
+int getNumberOfChips();
+int getNumberOfDACs();
+int getNumberOfChannelsPerChip();
\ No newline at end of file
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
index e557363aa..795937ee1 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
@@ -934,8 +934,8 @@ TEST_CASE("tsamples", "[.cmdcall]") {
         }
         if (det_type == defs::XILINX_CHIPTESTBOARD) {
             std::ostringstream oss;
-            caller.call("tsamples", {"2147483647"}, -1, PUT, oss);
-            REQUIRE(oss.str() == "tsamples 2147483647\n");
+            caller.call("tsamples", {"10000"}, -1, PUT, oss);
+            REQUIRE(oss.str() == "tsamples 10000\n");
         }
         for (int i = 0; i != det.size(); ++i) {
             det.setNumberOfTransceiverSamples(prev_val[i], {i});