diff --git a/slsDetectorSoftware/commonFiles/versionAPI.h b/slsDetectorSoftware/commonFiles/versionAPI.h index ae6182675..d25a1e5c3 100644 --- a/slsDetectorSoftware/commonFiles/versionAPI.h +++ b/slsDetectorSoftware/commonFiles/versionAPI.h @@ -2,4 +2,4 @@ #define APIRECEIVER 0x180823 #define APIEIGER 0x181130 #define APIJUNGFRAU 0x190107 -#define APIGOTTHARD 0x181204 +#define APIGOTTHARD 0x190130 diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c index cca8dc400..b904b6ab4 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c @@ -1442,14 +1442,17 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d * when switching back and forth between roi and no roi */ // remember old parameters - uint64_t oldtiming = setTiming(-1); + int oldtiming = setTiming(-1); uint64_t oldframes = setFrames(-1); + uint64_t oldcycles = setTrains(-1); uint64_t oldPeriod = setPeriod(-1); uint64_t oldExptime = setExposureTime(-1); // set to basic parameters + printf("Setting basic parameters\n"); setTiming(AUTO_TIMING); setFrames(1); + setTrains(1); setPeriod(1e6); setExposureTime(1e5); @@ -1458,8 +1461,16 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d waitForAcquisitionFinish(); // set to previous parameters + printf("Setting previous parameters: " + "Timing: %d, " + "frames: %lld, " + "cycles: %lld, " + "period: %lld ns, " + "exptime:%lld ns\n", + oldtiming, oldframes, oldcycles, oldPeriod, oldExptime); setTiming(oldtiming); setFrames(oldframes); + setTrains(oldcycles); setPeriod(oldPeriod); setExposureTime(oldExptime); diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 0636ee9ba..0d3bdfa87 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: d9551fa07f98641452b3c08f08893e79d3d06ae1 -Revision: 245 +Repsitory UUID: 12f8166d257e14485cc37392689d03ed8ec6dbb9 +Revision: 246 Branch: 4.0.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4045 -Last Changed Date: 2019-01-03 11:11:08.000000002 +0100 ./server_funcs.h +Last Changed Rev: 4056 +Last Changed Date: 2019-01-30 18:21:07.000000002 +0100 ./firmware_funcs.c diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 8c5996310..6512575d7 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "d9551fa07f98641452b3c08f08893e79d3d06ae1" +#define GITREPUUID "12f8166d257e14485cc37392689d03ed8ec6dbb9" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4045 -#define GITDATE 0x20190103 +#define GITREV 0x4056 +#define GITDATE 0x20190130 #define GITBRANCH "4.0.1-rc" diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.3 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.3 new file mode 100755 index 000000000..4b8cfb7a1 Binary files /dev/null and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.3 differ diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index cc614a721..c1959c5a4 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -2593,7 +2593,7 @@ int configure_mac(int file_des) { sscanf(arg[3], "%llx", &idetectormacadd); sscanf(arg[4], "%x", &detipad); //arg[5] is udpport2 for eiger -#ifdef VERBOSE +//#ifdef VERBOSE int i; printf("\ndigital_test_bit in server %d\t",digitalTestBit); printf("\nipadd %x\t",ipad); @@ -2606,8 +2606,9 @@ int configure_mac(int file_des) { for (i=0;i<6;i++) printf("detector mac adress %d is 0x%x \n",6-i,(unsigned int)(((idetectormacadd>>(8*i))&0xFF))); printf("detipad %x\n",detipad); + printf("destination ip is %d.%d.%d.%d = 0x%x \n",(detipad>>24)&0xff,(detipad>>16)&0xff,(detipad>>8)&0xff,(detipad)&0xff,detipad); printf("\n"); -#endif +//#endif