detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

gotthard server: configmac should also set cycles for sending dummy frame

Browse Source
This commit is contained in:
maliakal_d 2019-01-30 18:24:25 +01:00
parent 12f8166d25
commit 2f11681d3f
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/commonFiles/versionAPI.h
View File

@ -2,4 +2,4 @@
#define APIRECEIVER 0x180823 #define APIRECEIVER 0x180823
#define APIEIGER 0x181130 #define APIEIGER 0x181130
#define APIJUNGFRAU 0x190107 #define APIJUNGFRAU 0x190107
#define APIGOTTHARD 0x181204 #define APIGOTTHARD 0x190130

13
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -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 * when switching back and forth between roi and no roi
*/ */
// remember old parameters // remember old parameters
uint64_t oldtiming = setTiming(-1); int oldtiming = setTiming(-1);
uint64_t oldframes = setFrames(-1); uint64_t oldframes = setFrames(-1);
uint64_t oldcycles = setTrains(-1);
uint64_t oldPeriod = setPeriod(-1); uint64_t oldPeriod = setPeriod(-1);
uint64_t oldExptime = setExposureTime(-1); uint64_t oldExptime = setExposureTime(-1);
// set to basic parameters // set to basic parameters
printf("Setting basic parameters\n");
setTiming(AUTO_TIMING); setTiming(AUTO_TIMING);
setFrames(1); setFrames(1);
setTrains(1);
setPeriod(1e6); setPeriod(1e6);
setExposureTime(1e5); setExposureTime(1e5);
@ -1458,8 +1461,16 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
waitForAcquisitionFinish(); waitForAcquisitionFinish();
// set to previous parameters // 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); setTiming(oldtiming);
setFrames(oldframes); setFrames(oldframes);
setTrains(oldcycles);
setPeriod(oldPeriod); setPeriod(oldPeriod);
setExposureTime(oldExptime); setExposureTime(oldExptime);

8
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: d9551fa07f98641452b3c08f08893e79d3d06ae1 Repsitory UUID: 12f8166d257e14485cc37392689d03ed8ec6dbb9
Revision: 245 Revision: 246
Branch: 4.0.1-rc Branch: 4.0.1-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4045 Last Changed Rev: 4056
Last Changed Date: 2019-01-03 11:11:08.000000002 +0100 ./server_funcs.h Last Changed Date: 2019-01-30 18:21:07.000000002 +0100 ./firmware_funcs.c

6
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "d9551fa07f98641452b3c08f08893e79d3d06ae1" #define GITREPUUID "12f8166d257e14485cc37392689d03ed8ec6dbb9"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4045 #define GITREV 0x4056
#define GITDATE 0x20190103 #define GITDATE 0x20190130
#define GITBRANCH "4.0.1-rc" #define GITBRANCH "4.0.1-rc"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.3 Executable file
View File

Binary file not shown.

5
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -2593,7 +2593,7 @@ int configure_mac(int file_des) {
sscanf(arg[3], "%llx", &idetectormacadd); sscanf(arg[3], "%llx", &idetectormacadd);
sscanf(arg[4], "%x", &detipad); sscanf(arg[4], "%x", &detipad);
//arg[5] is udpport2 for eiger //arg[5] is udpport2 for eiger
#ifdef VERBOSE //#ifdef VERBOSE
int i; int i;
printf("\ndigital_test_bit in server %d\t",digitalTestBit); printf("\ndigital_test_bit in server %d\t",digitalTestBit);
printf("\nipadd %x\t",ipad); printf("\nipadd %x\t",ipad);
@ -2606,8 +2606,9 @@ int configure_mac(int file_des) {
for (i=0;i<6;i++) for (i=0;i<6;i++)
printf("detector mac adress %d is 0x%x \n",6-i,(unsigned int)(((idetectormacadd>>(8*i))&0xFF))); printf("detector mac adress %d is 0x%x \n",6-i,(unsigned int)(((idetectormacadd>>(8*i))&0xFF)));
printf("detipad %x\n",detipad); 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"); printf("\n");
#endif //#endif