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

jungfrau: chip1.1 incompatible with HW 1.0

Browse Source
This commit is contained in:
maliakal_d 2021-07-27 17:46:48 +02:00
parent 6461fddc5d
commit b15b66b82d
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

10
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -285,6 +285,9 @@ u_int16_t getHardwareSerialNumber() {
// is board 1.0?, with value 2 (resistor network) // is board 1.0?, with value 2 (resistor network)
int isHardwareVersion2() { int isHardwareVersion2() {
#ifdef VIRTUAL
return 0;
#endif
return (((bus_r(MOD_SERIAL_NUM_REG) & HARDWARE_VERSION_NUM_MSK) == return (((bus_r(MOD_SERIAL_NUM_REG) & HARDWARE_VERSION_NUM_MSK) ==
HARDWARE_VERSION_2_VAL) HARDWARE_VERSION_2_VAL)
? 1 ? 1
@ -576,6 +579,13 @@ int readConfigFile() {
// validations // validations
chipVersion = version; chipVersion = version;
LOG(logINFOBLUE, ("Chip Version: v%.01f\n", chipVersion / 10.0)); LOG(logINFOBLUE, ("Chip Version: v%.01f\n", chipVersion / 10.0));
// version 1.1 and HW 1.0 (version reg value = 2) is incompatible
if (chipVersion == 11 && isHardwareVersion2()) {
strcpy(initErrorMessage,
"Chip version 1.1 (from on-board config file) is incompatible with old board (v1.0). Please update board or correct on-board config file.\n");
break;
}
} }
memset(line, 0, LZ); memset(line, 0, LZ);

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -6,7 +6,7 @@
#define APICTB 0x210727 #define APICTB 0x210727
#define APIGOTTHARD 0x210727 #define APIGOTTHARD 0x210727
#define APIGOTTHARD2 0x210727 #define APIGOTTHARD2 0x210727
#define APIJUNGFRAU 0x210727
#define APIMYTHEN3 0x210727 #define APIMYTHEN3 0x210727
#define APIMOENCH 0x210727 #define APIMOENCH 0x210727
#define APIEIGER 0x210727 #define APIEIGER 0x210727
#define APIJUNGFRAU 0x210727