diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 38f44330b..8628212f5 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 7617034ed..57f96cc18 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -285,6 +285,9 @@ u_int16_t getHardwareSerialNumber() { // is board 1.0?, with value 2 (resistor network) int isHardwareVersion2() { +#ifdef VIRTUAL + return 0; +#endif return (((bus_r(MOD_SERIAL_NUM_REG) & HARDWARE_VERSION_NUM_MSK) == HARDWARE_VERSION_2_VAL) ? 1 @@ -576,6 +579,13 @@ int readConfigFile() { // validations chipVersion = version; 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); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index fe025fe37..00187dfe0 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,7 +6,7 @@ #define APICTB 0x210727 #define APIGOTTHARD 0x210727 #define APIGOTTHARD2 0x210727 -#define APIJUNGFRAU 0x210727 #define APIMYTHEN3 0x210727 #define APIMOENCH 0x210727 #define APIEIGER 0x210727 +#define APIJUNGFRAU 0x210727