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

gotthard server: red in stopping server for debugging

Browse Source
This commit is contained in:
maliakal_d 2018-02-26 17:34:35 +01:00
parent f67323d1cc
commit 74f327a959
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -1537,12 +1537,8 @@ int startStateMachine(){
int stopStateMachine(){
//#ifdef VERBOSE
printf("*******Stopping State Machine*******\n");
cprintf(BG_RED,"*******Stopping State Machine*******\n");
//#endif
#ifdef SHAREDMEMORY
write_stop_sm(1);
write_status_sm("Stopped");
#endif
bus_w16(CONTROL_REG, STOP_ACQ_BIT);
bus_w16(CONTROL_REG, 0x0);
usleep(500);

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.3
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.4 Executable file
View File

Binary file not shown.

6
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1725,12 +1725,10 @@ int stop_acquisition(int file_des) {
int ret=OK;
int n;
sprintf(mess,"can't stop acquisition\n");
#ifdef VERBOSE
printf("Stopping acquisition\n");
#endif
cprintf(BG_RED,"Client command received to stop acquisition\n");
if (differentClients==1 && lockStatus==1) {