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

WIP

Browse Source
This commit is contained in:
maliakal_d
2020-04-06 19:38:35 +02:00
parent 456b96446f
commit 83283b672a
4 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -329,7 +329,7 @@ void initStopServer() {
#ifdef VIRTUAL
virtual_stop = 0;
if (!isControlServer) {
ComVirtual_writeStop(virtual_stop);
ComVirtual_setStop(virtual_stop);
}
#endif
}
@ -359,7 +359,7 @@ void setupDetector() {
#ifdef VIRTUAL
virtual_status = 0;
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
ComVirtual_setStatus(virtual_status);
}
#endif
@ -1366,8 +1366,8 @@ int startStateMachine(){
// set status to running
virtual_status = 1;
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
ComVirtual_readStop(&virtual_stop);
ComVirtual_setStatus(virtual_status);
virtual_stop = ComVirtual_getStop();
if (virtual_stop != 0) {
LOG(logERROR, ("Cant start acquisition. "
"Stop server has not updated stop status to 0\n"));
@ -1378,7 +1378,7 @@ int startStateMachine(){
LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
virtual_status = 0;
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
ComVirtual_setStatus(virtual_status);
}
return FAIL;
}
@ -1431,7 +1431,7 @@ void* start_timer(void* arg) {
for (frameNr = 0; frameNr != numFrames; ++frameNr) {
// update the virtual stop from stop server
ComVirtual_readStop(&virtual_stop);
virtual_stop = ComVirtual_getStop();
//check if virtual_stop is high
if(virtual_stop == 1){
break;
@ -1487,7 +1487,7 @@ void* start_timer(void* arg) {
virtual_status = 0;
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
ComVirtual_setStatus(virtual_status);
}
LOG(logINFOBLUE, ("Finished Acquiring\n"));
return NULL;
@ -1500,14 +1500,14 @@ int stopStateMachine(){
#ifdef VIRTUAL
if (!isControlServer) {
virtual_stop = 1;
ComVirtual_writeStop(virtual_stop);
ComVirtual_setStop(virtual_stop);
// read till status is idle
int tempStatus = 1;
while(tempStatus == 1) {
ComVirtual_readStatus(&tempStatus);
tempStatus = ComVirtual_getStatus();
}
virtual_stop = 0;
ComVirtual_writeStop(virtual_stop);
ComVirtual_setStop(virtual_stop);
LOG(logINFO, ("Stopped State Machine\n"));
}
return OK;
@ -1521,7 +1521,7 @@ int stopStateMachine(){
enum runStatus getRunStatus(){
#ifdef VIRTUAL
if (!isControlServer) {
ComVirtual_readStatus(&virtual_status);
virtual_status = ComVirtual_getStatus();
}
if(virtual_status == 0){
LOG(logINFOBLUE, ("Status: IDLE\n"));
@ -1599,7 +1599,7 @@ void readFrame(int *ret, char *mess) {
u_int32_t runBusy() {
#ifdef VIRTUAL
if (!isControlServer) {
ComVirtual_readStatus(&virtual_status);
virtual_status = ComVirtual_getStatus();
}
return virtual_status;
#endif