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/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

12
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -109,7 +109,10 @@ void basictests() {
memset(initErrorMessage, 0, MAX_STR_LENGTH);
#ifdef VIRTUAL
LOG(logINFOBLUE,
("************ EIGER Virtual Server *****************\n\n"));
("************ EIGER Virtual Server ****************\n\n"));
#else
LOG(logINFOBLUE,
("**************** EIGER Server ********************\n\n"));
#endif
uint32_t ipadd = getDetectorIP();
uint64_t macadd = getDetectorMAC();
@ -119,7 +122,7 @@ void basictests() {
int64_t client_sw_apiversion = getClientServerAPIVersion();
LOG(logINFOBLUE,
("**************** EIGER Server *********************\n\n"
("**************************************************\n"
"Detector IP Addr:\t\t 0x%x\n"
"Detector MAC Addr:\t\t 0x%llx\n"
@ -142,9 +145,7 @@ void basictests() {
udpDetails[iRxEntry].srcmac = macadd;
}
#ifdef VIRTUAL
return;
#endif
#ifndef VIRTUAL
// return if debugflag is not zero, debug mode
if (debugflag || updateFlag) {
return;
@ -186,6 +187,7 @@ void basictests() {
return;
}
LOG(logINFO, ("Compatibility - success\n"));
#endif
}
#ifdef VIRTUAL