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

Fix tests (#698)

Browse Source 
* fix firmwareversion to reqd version as fw version cannot be 0 for virtual
This commit is contained in:
Dhanya Thattil 2023-03-28 15:22:36 +02:00 committed by GitHub
parent 500442fd6b
commit 7e01095684
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -332,7 +332,7 @@ void getServerVersion(char *version) { strcpy(version, APICTB); }
uint64_t getFirmwareVersion() { uint64_t getFirmwareVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return REQRD_FRMWR_VRSN;
#endif #endif
return ((bus_r(FPGA_VERSION_REG) & FPGA_VERSION_BRD_RVSN_MSK) >> return ((bus_r(FPGA_VERSION_REG) & FPGA_VERSION_BRD_RVSN_MSK) >>
FPGA_VERSION_BRD_RVSN_OFST); FPGA_VERSION_BRD_RVSN_OFST);

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -256,7 +256,7 @@ void getServerVersion(char *version) { strcpy(version, APIGOTTHARD2); }
u_int64_t getFirmwareVersion() { u_int64_t getFirmwareVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return REQRD_FRMWRE_VRSN;
#endif #endif
return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >> return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >>
FPGA_COMPILATION_DATE_OFST); FPGA_COMPILATION_DATE_OFST);

2
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -275,7 +275,7 @@ void getServerVersion(char *version) { strcpy(version, APIGOTTHARD); }
u_int64_t getFirmwareVersion() { u_int64_t getFirmwareVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return 1;
#endif #endif
return ((bus_r(FPGA_VERSION_REG) & FPGA_VERSION_MSK) >> FPGA_VERSION_OFST); return ((bus_r(FPGA_VERSION_REG) & FPGA_VERSION_MSK) >> FPGA_VERSION_OFST);
} }

2
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -266,7 +266,7 @@ void getServerVersion(char *version) { strcpy(version, APIJUNGFRAU); }
u_int64_t getFirmwareVersion() { u_int64_t getFirmwareVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return REQRD_FRMWRE_VRSN;
#endif #endif
return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >> return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >>
FPGA_COMPILATION_DATE_OFST); FPGA_COMPILATION_DATE_OFST);

3
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -270,7 +270,8 @@ void getServerVersion(char *version) { strcpy(version, APIMOENCH); }
u_int64_t getFirmwareVersion() { u_int64_t getFirmwareVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return (isHardwareVersion_1_0() ? REQRD_FRMWRE_VRSN
: REQRD_FRMWRE_VRSN_BOARD2);
#endif #endif
return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >> return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >>
FPGA_COMPILATION_DATE_OFST); FPGA_COMPILATION_DATE_OFST);

2
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -250,7 +250,7 @@ void getServerVersion(char *version) { strcpy(version, APIMYTHEN3); }
u_int64_t getFirmwareVersion() { u_int64_t getFirmwareVersion() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return REQRD_FRMWRE_VRSN;
#endif #endif
return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >> return ((bus_r(FPGA_VERSION_REG) & FPGA_COMPILATION_DATE_MSK) >>
FPGA_COMPILATION_DATE_OFST); FPGA_COMPILATION_DATE_OFST);