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

do not complain when setting timers

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-16 16:26:57 +02:00
parent c724756b5f
commit e8217b0867
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -977,23 +977,15 @@ int slsReceiverTCPIPInterface::set_timer() {
if (index[1] >= 0) { if (index[1] >= 0) {
if (mySock->differentClients && lockStatus) if (mySock->differentClients && lockStatus)
receiverlocked(); receiverlocked();
else if (receiverBase->getStatus() != IDLE) // else if (receiverBase->getStatus() != IDLE)
receiverNotIdle(); // receiverNotIdle();
else { else {
switch (index[0]) { switch (index[0]) {
case ACQUISITION_TIME: case ACQUISITION_TIME:
ret = receiverBase->setAcquisitionTime(index[1]); ret = receiverBase->setAcquisitionTime(index[1]);
if (ret == FAIL) {
strcpy(mess,"Could not allocate memory for listening fifo\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
break; break;
case FRAME_PERIOD: case FRAME_PERIOD:
ret = receiverBase->setAcquisitionPeriod(index[1]); ret = receiverBase->setAcquisitionPeriod(index[1]);
if (ret == FAIL) {
strcpy(mess,"Could not allocate memory for listening fifo\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
break; break;
case FRAME_NUMBER: case FRAME_NUMBER:
case CYCLES_NUMBER: case CYCLES_NUMBER: