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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2022-02-03 13:03:40 +01:00
parent 1a1533cad8 97417737b6
commit bc4cf95d0e
39 changed files with 395 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -480,9 +480,6 @@ void setupDetector() {
setInitialExtSignals();
// 10G UDP
enableTenGigabitEthernet(1);
#ifdef VIRTUAL
enableTenGigabitEthernet(0);
#endif
getModuleIdInFile(&initError, initErrorMessage, ID_FILE);
if (initError == FAIL) {
return;

2
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -95,7 +95,7 @@ enum DACINDEX {
#define DAC_NAMES \
"vcassh", "vth2", "vrshaper", "vrshaper_n", "vipre_out", "vth3", "vth1", \
"vicin", "vcas", "vrpreamp", "vcal_n", "vipre", "vishaper", "vcal_p", \
"vtrim", "vdcsh"
"vtrim", "vdcsh", "vthreshold"
#define DEFAULT_DAC_VALS \
{ \
1200, /* casSh */ \