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

wip, setmaster

Browse Source
This commit is contained in:
maliakal_d
2022-02-23 12:26:37 +01:00
parent ef3df36e55
commit 89edf58f41
7 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -400,6 +400,7 @@ void setVirtualDefaultModuleConfigurations() {
#else
normal = 1;
#endif
#endif
}
int updateModuleConfiguration() {
@ -420,7 +421,7 @@ int getModuleConfiguration(int *m, int *t, int *n) {
#ifdef VIRTUAL
*m = master;
*t = top;
*n = nomal;
*n = normal;
#else
if (Beb_GetModuleConfiguration(&m, &t, &n) == FAIL) {
initError = FAIL;
@ -553,13 +554,13 @@ int readConfigFile() {
line);
break;
}
if (m != 0 && m != 1)) {
sprintf(initErrorMessage,
"Invalid master argument from on-board server "
"config file. Line:[%s].\n",
line);
break;
}
if (m != 0 && m != 1) {
sprintf(initErrorMessage,
"Invalid master argument from on-board server "
"config file. Line:[%s].\n",
line);
break;
}
if (setMaster(m) == FAIL) {
sprintf(initErrorMessage,
"Could not set master from config file. Line:[%s].\n",

4
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -1554,7 +1554,9 @@ int isMaster(int *retval) {
void setTiming(enum timingMode arg) {
if (!isMaster() && arg == AUTO_TIMING)
int master = 0;
isMaster(&master);
if (master && arg == AUTO_TIMING)
arg = TRIGGER_EXPOSURE;
uint32_t addr = CONFIG_REG;

5
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -468,7 +468,7 @@ void function_table() {
flist[F_UPDATE_DETECTOR_SERVER] = &update_detector_server;
flist[F_GET_UPDATE_MODE] = &get_update_mode;
flist[F_SET_UPDATE_MODE] = &set_update_mode;
flist[F_SET_MASTER]] = &set_master;
flist[F_SET_MASTER] = &set_master;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@ -8228,9 +8228,10 @@ int set_master(int file_des) {
} else {
ret = setMaster(arg);
if (ret == FAIL) {
strcpy("Could not set master\n");
strcpy(mess, "Could not set master\n");
LOG(logERROR, (mess));
} else {
int retval = 0;
ret = isMaster(&retval);
if (ret == FAIL) {
strcpy(mess, "Could not get master\n");