detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-07-13 18:36:04 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into add-rx-header
Build on RHEL9 docker image / build (push) Successful in 3m33s
Details
Build on RHEL8 docker image / build (push) Successful in 4m46s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m42s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m18s
Details

Browse Source
This commit is contained in:
lunin_l
2026-05-06 10:47:27 +02:00
committed by GitHub
co-authored by GitHub
parent cf156944af 4ffb81e7ff
commit db86044f83
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
BIN
View File
Binary file not shown.
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+2 -1
View File
@@ -1793,7 +1793,8 @@ int getPowerADC(enum powerIndex index, int *retval, char *mess) {
#ifdef VIRTUAL
return 0;
#endif
*retval = bus_r(POWER_MONITOR_BASE_REG + ((int)adcIndex << MEM_MAP_SHIFT));
// read register containing the measurement (16-bit signed), sign extend to int
*retval = (int)(int16_t)bus_r(POWER_MONITOR_BASE_REG + ((int)adcIndex << MEM_MAP_SHIFT));
return OK;
}
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "sls/sls_detector_defs.h"
#define MIN_REQRD_VRSN_T_RD_API 0x181130
#define REQRD_FRMWR_VRSN 0x230705
#define REQRD_FRMWR_VRSN 0x260504
#define NUM_HARDWARE_VERSIONS (1)
#define HARDWARE_VERSION_NUMBERS \