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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2020-09-03 17:20:48 +02:00
commit 35c7e46d60
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -249,15 +249,15 @@ u_int16_t getHardwareVersionNumber() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return 0;
#endif #endif
return bus_r(MCB_SERIAL_NO_REG); return ((bus_r(MCB_SERIAL_NO_REG) & MCB_SERIAL_NO_VRSN_MSK) >>
MCB_SERIAL_NO_VRSN_OFST);
} }
u_int32_t getDetectorNumber() { u_int32_t getDetectorNumber() {
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return 0;
#endif #endif
return ((bus_r(MCB_SERIAL_NO_REG) & MCB_SERIAL_NO_VRSN_MSK) >> return bus_r(MCB_SERIAL_NO_REG);
MCB_SERIAL_NO_VRSN_OFST);
} }
u_int64_t getDetectorMAC() { u_int64_t getDetectorMAC() {

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIJUNGFRAU 0x200810 #define APIJUNGFRAU 0x200810
#define APIMOENCH 0x200810 #define APIMOENCH 0x200810
#define APIEIGER 0x200831 #define APIEIGER 0x200831
#define APIMYTHEN3 0x200901
#define APIGOTTHARD2 0x200902 #define APIGOTTHARD2 0x200902
#define APIMYTHEN3 0x200903