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

Eiger: add hardware version (#688)

Browse Source 
* eiger: hardwareversion, fix firmware version unable to read version scenarios, check to see if febl, febr and beb have same fw version

* feb versions can be picked up only after feb initialization
This commit is contained in:
Dhanya Thattil
2023-03-16 11:59:06 +01:00
committed by GitHub
parent bc46d0f6ab
commit d23722a4b7
16 changed files with 153 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -82,8 +82,10 @@ u_int64_t getFirmwareVersion();
uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition);
#endif
u_int64_t getFirmwareAPIVersion();
#ifndef EIGERD
void getHardwareVersion(char *version);
#ifdef EIGERD
int getHardwareVersionNumber();
#else
u_int16_t getHardwareVersionNumber();
#endif
#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)

26
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -732,8 +732,14 @@ int get_firmware_version(int file_des) {
memset(mess, 0, sizeof(mess));
int64_t retval = -1;
retval = getFirmwareVersion();
LOG(logDEBUG1,
("firmware version retval: 0x%llx\n", (long long int)retval));
if (retval == 0) {
ret = FAIL;
strcpy(mess, "Could not get firmware version\n");
LOG(logERROR, (mess));
} else {
LOG(logDEBUG1,
("firmware version retval: 0x%llx\n", (long long int)retval));
}
return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
}
@ -10138,12 +10144,8 @@ int get_hardware_version(int file_des) {
memset(mess, 0, sizeof(mess));
char retvals[MAX_STR_LENGTH];
memset(retvals, 0, MAX_STR_LENGTH);
#ifdef EIGERD
functionNotImplemented();
#else
getHardwareVersion(retvals);
LOG(logDEBUG1, ("hardware version retval: %s\n", retvals));
#endif
return Server_SendResult(file_des, OTHER, retvals, sizeof(retvals));
}
@ -10171,9 +10173,15 @@ int get_frontend_firmware_version(int file_des) {
}
if (ret == OK) {
retval = getFrontEndFirmwareVersion(arg);
LOG(logDEBUG1,
("Front %s version retval: 0x%llx\n",
(arg == FRONT_LEFT ? "left" : "right"), (long long int)retval));
if (retval == 0) {
ret = FAIL;
strcpy(mess, "Could not get febl/r firmware version\n");
LOG(logERROR, (mess));
} else {
LOG(logDEBUG1, ("Front %s version retval: 0x%llx\n",
(arg == FRONT_LEFT ? "left" : "right"),
(long long int)retval));
}
}
#endif
return Server_SendResult(file_des, INT64, &retval, sizeof(retval));