merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file

This commit is contained in:
2018-02-07 11:02:36 +01:00
31 changed files with 170 additions and 163 deletions

View File

@ -532,7 +532,7 @@ class multiSlsDetector : public slsDetectorUtils {
int64_t getId(idMode mode, int imod=0);
int digitalTest(digitalTestMode mode, int imod=0);
int executeTrimming(trimMode mode, int par1, int par2, int imod=-1);
const char *getSettingsFile();
string getSettingsFile();
int decodeNMod(int i, int &idet, int &imod);