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

gotthard2, dacs and onchip dacs from config file

Browse Source
This commit is contained in:
maliakal_d
2019-11-11 18:02:08 +01:00
parent bb26b993ea
commit 90c34e4942
19 changed files with 342 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

15
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -63,10 +63,7 @@ void basictests() {
"Could not map to memory. Dangerous to continue.\n");
FILE_LOG(logERROR, (initErrorMessage));
initError = FAIL;
initCheckDone = 1;
return;
}
initCheckDone = 1;
return;
#else
@ -77,7 +74,6 @@ void basictests() {
"Could not map to memory. Dangerous to continue.\n");
FILE_LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL;
initCheckDone = 1;
return;
}
@ -87,7 +83,6 @@ void basictests() {
"Could not pass basic tests of FPGA and bus. Dangerous to continue.\n");
FILE_LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL;
initCheckDone = 1;
return;
}
@ -129,7 +124,6 @@ void basictests() {
// return if flag is not zero, debug mode
if (debugflag) {
initCheckDone = 1;
return;
}
@ -141,7 +135,6 @@ void basictests() {
"Cant read versions from FPGA. Please update firmware.\n");
FILE_LOG(logERROR, (initErrorMessage));
initError = FAIL;
initCheckDone = 1;
return;
}
@ -154,7 +147,6 @@ void basictests() {
(long long int)requiredFirmwareVersion);
FILE_LOG(logERROR, (initErrorMessage));
initError = FAIL;
initCheckDone = 1;
return;
}
@ -167,11 +159,9 @@ void basictests() {
(long long int)requiredFirmwareVersion);
FILE_LOG(logERROR, (initErrorMessage));
initError = FAIL;
initCheckDone = 1;
return;
}
FILE_LOG(logINFO, ("Compatibility - success\n"));
initCheckDone = 1;
#endif
}
@ -347,7 +337,10 @@ u_int32_t getDetectorIP(){
/* initialization */
void initControlServer(){
setupDetector();
if (initError == OK) {
setupDetector();
}
initCheckDone = 1;
}