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

merge fix

Browse Source
This commit is contained in:
maliakal_d 2021-08-06 15:06:32 +02:00
commit 69ca1e7fee
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

23
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2670,7 +2670,28 @@ enum vetoAlgorithm getVetoAlgorithm(enum ethernetInterface interface) {
} }
void setVetoAlgorithm(enum ethernetInterface interface, void setVetoAlgorithm(enum ethernetInterface interface,
enum vetoAlgorithm alg) {} enum vetoAlgorithm alg) {
uint32_t addr = CONFIG_REG;
uint32_t value = bus_r(addr);
switch (alg) {
// more to follow
case DEFAULT_ALGORITHM:
if (interface == I3GBE) {
LOG(logINFO, ("Setting default veto algorithm for 3Gbe\n"));
value &= (~CONFIG_VETO_CH_3GB_ALG_MSK);
value |= CONFIG_VETO_CH_3GB_ALG_DEFAULT_VAL;
} else {
LOG(logINFO, ("Setting default veto algorithm for 10Gbe\n"));
value &= (~CONFIG_VETO_CH_10GB_ALG_MSK);
value |= CONFIG_VETO_CH_10GB_ALG_DEFAULT_VAL;
}
break;
default:
LOG(logERROR, ("unknown algorithm %d for 3gbe\n", alg));
return;
}
bus_w(addr, value);
}
void setBadChannels(int nch, int *channels) { void setBadChannels(int nch, int *channels) {
LOG(logINFO, ("Setting %d bad channels\n", nch)); LOG(logINFO, ("Setting %d bad channels\n", nch));

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

@ -5,8 +5,8 @@
#define APIGUI 0x210225 #define APIGUI 0x210225
#define APICTB 0x210729 #define APICTB 0x210729
#define APIGOTTHARD 0x210729 #define APIGOTTHARD 0x210729
#define APIGOTTHARD2 0x210729
#define APIMYTHEN3 0x210729 #define APIMYTHEN3 0x210729
#define APIMOENCH 0x210729 #define APIMOENCH 0x210729
#define APIEIGER 0x210729 #define APIEIGER 0x210729
#define APIJUNGFRAU 0x210802 #define APIJUNGFRAU 0x210802
#define APIGOTTHARD2 0x210806