detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 13:53:21 +01:00
Code Issues Actions Packages Releases Activity

fixed stop server not starting up with setup variables (#949)

Browse Source 
* m3: fixed stop server not starting up with setup variables

* all servers except eiger fixed for virtual stop server to start up with setupDetector function called

* virtual tests work

* eiger: versions print neednt be in stop server

* jungfrau: stop server (not virtual) also needs to read config file

* ensuring master is setup for virtual and real servers
This commit is contained in:
maliakal_d
2024-09-10 15:24:51 +02:00
committed by GitHub
parent 38d7fb0c38
commit c6477e0ed6
22 changed files with 173 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

15
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -449,6 +449,7 @@ void initControlServer() {
void initStopServer() {
if (!updateFlag && initError == OK) {
usleep(CTRL_SRVR_INIT_TIME_US);
LOG(logINFOBLUE, ("Configuring Stop server\n"));
if (mapCSP0() == FAIL) {
initError = FAIL;
strcpy(initErrorMessage,
@@ -458,7 +459,7 @@ void initStopServer() {
return;
}
#ifdef VIRTUAL
sharedMemory_setStop(0);
setupDetector();
#endif
}
initCheckDone = 1;
@@ -512,10 +513,16 @@ void setupDetector() {
ndSamples = 1;
ntSamples = 1;
#ifdef VIRTUAL
sharedMemory_setStatus(IDLE);
initializePatternWord();
if (isControlServer) {
sharedMemory_setStatus(IDLE);
initializePatternWord();
} else {
sharedMemory_setStop(0);
}
#endif
setupUDPCommParameters();
if (isControlServer) {
setupUDPCommParameters();
}
// altera pll
ALTERA_PLL_SetDefines(PLL_CNTRL_REG, PLL_PARAM_REG,