detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +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/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

19
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -88,16 +88,9 @@ void basictests() {
initCheckDone = 0;
memset(initErrorMessage, 0, MAX_STR_LENGTH);
#ifdef VIRTUAL
LOG(logINFOBLUE,
("******** Moench Detector Virtual Server *****************\n"));
if (mapCSP0() == FAIL) {
strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n");
LOG(logERROR, (initErrorMessage));
initError = FAIL;
}
return;
LOG(logINFOBLUE, ("********* Moench Detector Virtual Server *********\n"));
#else
LOG(logINFOBLUE, ("************* Moench Detector Server *************\n"));
initError = defineGPIOpins(initErrorMessage);
if (initError == FAIL) {
@ -107,6 +100,7 @@ void basictests() {
if (initError == FAIL) {
return;
}
#endif
if (mapCSP0() == FAIL) {
strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n");
@ -114,7 +108,7 @@ void basictests() {
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) ||
@ -125,7 +119,7 @@ void basictests() {
initError = FAIL;
return;
}
#endif
uint16_t hversion = getHardwareVersionNumber();
uint16_t hsnumber = getHardwareSerialNumber();
uint32_t ipadd = getDetectorIP();
@ -138,7 +132,7 @@ void basictests() {
if (fwversion >= MIN_REQRD_VRSN_T_RD_API)
sw_fw_apiversion = getFirmwareAPIVersion();
LOG(logINFOBLUE,
("************ Moench Detector Server *********************\n"
("**************************************************\n"
"Hardware Version:\t\t 0x%x\n"
"Hardware Serial Nr:\t\t 0x%x\n"
@ -156,6 +150,7 @@ void basictests() {
(long long int)sw_fw_apiversion, REQRD_FRMWR_VRSN,
(long long int)client_sw_apiversion));
#ifndef VIRTUAL
// return if flag is not zero, debug mode
if (debugflag || updateFlag) {
return;