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

G2hdi (#510)

Browse Source 
* g2: new hdi values, write hdi value to reg, set slave/master to reg, able to set master from server config file, server command line and client

* print versions for virtual as well
This commit is contained in:
Dhanya Thattil
2022-08-16 09:31:13 +02:00
committed by GitHub
parent 409a3977db
commit 22b9562629
24 changed files with 251 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

19
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -82,22 +82,16 @@ void basictests() {
memset(initErrorMessage, 0, MAX_STR_LENGTH);
#ifdef VIRTUAL
LOG(logINFOBLUE, ("******** Gotthard Virtual Server *****************\n"));
#else
LOG(logINFOBLUE, ("**************** Gotthard Server *****************\n"));
#endif
if (mapCSP0() == FAIL) {
strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n");
LOG(logERROR, (initErrorMessage));
initError = FAIL;
}
return;
#else
if (mapCSP0() == FAIL) {
strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n");
LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL;
return;
}
#ifndef VIRTUAL
// does check only if flag is 0 (by default), set by command line
if ((!debugflag) && (!updateFlag) &&
((checkType() == FAIL) || (testFpga() == FAIL) ||
@ -108,7 +102,7 @@ void basictests() {
initError = FAIL;
return;
}
#endif
uint32_t boardrev = getBoardRevision();
uint32_t ipadd = getDetectorIP();
uint64_t macadd = getDetectorMAC();
@ -117,7 +111,7 @@ void basictests() {
int64_t client_sw_apiversion = getClientServerAPIVersion();
LOG(logINFOBLUE,
("************ Gotthard Server *********************\n"
("**************************************************\n"
"Board Revision : 0x%x\n"
"Detector IP Addr : 0x%x\n"
@ -134,6 +128,7 @@ void basictests() {
(long long int)fwversion, (long long int)swversion,
(long long int)client_sw_apiversion));
#ifndef VIRTUAL
if (!debugflag || updateFlag) {
LOG(logINFO, ("Basic Tests - success\n"));
}