detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 23:28:04 +01:00
Code Issues Actions Packages Releases Activity

fixing conflics after merging back release to developer

Browse Source
This commit is contained in:
Erik Frojdh
2021-03-23 10:50:09 +01:00
parent e8fe203940 2f2fe4dd47
commit 60e3fb8aab
33 changed files with 836 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@@ -1395,7 +1395,7 @@ int Feb_Control_SetMaster(enum MASTERINDEX ind) {
int Feb_Control_SetQuad(int val) {
LOG(logINFO, ("Setting Quad to %d in Feb\n", val));
// only setting on the right feb if quad
return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_TOP, 0, 1);
return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_BOTTOM, 0, 1);
}
int Feb_Control_SetReadNLines(int value) {

2
slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt Executable file
View File

@@ -0,0 +1,2 @@
top 1
master 1

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0 Executable file
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1
View File

Binary file not shown.