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

Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_receiver_software into release

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-02-25 13:51:34 +01:00
commit 1ef91414d6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/sls_receiver_defs.h
View File

@ -112,7 +112,8 @@ public:
WAITING, /**< waiting for trigger or gate signal */ WAITING, /**< waiting for trigger or gate signal */
RUN_FINISHED, /**< acquisition not running but data in memory */ RUN_FINISHED, /**< acquisition not running but data in memory */
TRANSMITTING, /**< acquisition running and data in memory */ TRANSMITTING, /**< acquisition running and data in memory */
RUNNING /**< acquisition running, no data in memory */ RUNNING, /**< acquisition running, no data in memory */
STOPPED /**< acquisition stopped externally */
}; };
#ifdef __cplusplus #ifdef __cplusplus
@ -172,6 +173,7 @@ public:
case RUNNING: return std::string("running"); \ case RUNNING: return std::string("running"); \
case TRANSMITTING: return std::string("data"); \ case TRANSMITTING: return std::string("data"); \
case RUN_FINISHED: return std::string("finished"); \ case RUN_FINISHED: return std::string("finished"); \
case STOPPED: return std::string("stopped"); \
default: return std::string("idle"); \ default: return std::string("idle"); \
}}; }};