detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-11-20 16:28:48 +01:00
parent a1bd54b16b
commit c097dfc8b3
18 changed files with 474 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -50,6 +50,7 @@ int enableTenGigabitEthernet(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);
#endif
#if defined(MYTHEND) || defined(GOTTHARDD)

51
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -178,7 +178,7 @@ int function_table() {
flist[F_SET_COUNTER_BIT]=&set_counter_bit;
flist[F_PULSE_PIXEL]=&pulse_pixel;
flist[F_PULSE_PIXEL_AND_MOVE]=&pulse_pixel_and_move;
flist[F_PULSE_CHIP]=&pulse_chip;
#ifdef VERBOSE
@ -3766,3 +3766,52 @@ int pulse_pixel_and_move(int file_des) {
}
int pulse_chip(int file_des) {
int ret=OK,ret1=OK;
int n;
int arg = -1;
sprintf(mess,"pulse chip failed\n");
n = receiveData(file_des,arg,sizeof(arg),INT32);
if (n < 0) {
sprintf(mess,"Error reading from socket\n");
ret=FAIL;
}
#ifndef EIGERD
ret = FAIL;
strcpy(mess,"Not applicable/implemented for this detector\n");
#else
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (ret==OK) {
if (differentClients==1 && lockStatus==1) {
ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else
ret=pulseChip(arg);
}
#endif
#endif
if(ret==OK){
if (differentClients)
ret=FORCE_UPDATE;
}
/* send answer */
/* send OK/failed */
//ret could be swapped during sendData
ret1 = ret;
n = sendData(file_des,&ret1,sizeof(ret),INT32);
if (ret==FAIL)
n += sendData(file_des,mess,sizeof(mess),OTHER);
/*return ok/fail*/
return ret;
}

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.h
View File

@ -86,5 +86,7 @@ int set_all_trimbits(int);
int set_counter_bit(int);
int pulse_pixel(int);
int pulse_pixel_and_move(int);
int pulse_chip(int);
#endif