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

wip: eiger stop acquisition send complete frmes

Browse Source
This commit is contained in:
maliakal_d 2021-06-09 12:31:26 +02:00
parent ac5dece221
commit 08a588bb01
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -996,7 +996,21 @@ int Feb_Control_StartAcquisition() {
return 1; return 1;
} }
int Feb_Control_StopAcquisition() { return Feb_Control_Reset(); } int Feb_Control_StopAcquisition() {
if (!Feb_Control_Reset()) {
return 0;
}
if (Feb_Control_activated) {
if (!Feb_Interface_WriteRegister(Feb_Control_AddressToAll(),
DAQ_REG_CTRL, DAQ_CTRL_STOP, 0, 0)) {
LOG(logERROR,
("Trouble stopping acquisition to send complete frames\n"));
return 0;
}
}
LOG(logINFO, ("Acquisition stop command sent!\n"));
return 1;
}
int Feb_Control_SoftwareTrigger() { int Feb_Control_SoftwareTrigger() {
if (Feb_Control_activated) { if (Feb_Control_activated) {

2
slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
View File

@ -38,7 +38,7 @@
#define DAQ_CTRL_RESET 0x80000000 #define DAQ_CTRL_RESET 0x80000000
#define DAQ_CTRL_START 0x40000000 #define DAQ_CTRL_START 0x40000000
#define ACQ_CTRL_START 0x50000000 // this is 0x10000000 (acq) | 0x40000000 (daq) #define ACQ_CTRL_START 0x50000000 // this is 0x10000000 (acq) | 0x40000000 (daq)
#define DAQ_CTRL_STOP 0x00000000 #define DAQ_CTRL_STOP 0x08000000 // sends last complete frame
// direct chip commands to the DAQ_REG_CHIP_CMDS register // direct chip commands to the DAQ_REG_CHIP_CMDS register
#define DAQ_SET_STATIC_BIT 0x00000001 #define DAQ_SET_STATIC_BIT 0x00000001