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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-09-01 17:11:04 +02:00
parent cda82e5648
commit 210bc32e46
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -57,7 +57,7 @@ void Feb_Control_FebControl() {
malloc(Feb_Control_trimbit_size * sizeof(int)); malloc(Feb_Control_trimbit_size * sizeof(int));
} }
int Feb_Control_Init(int master, int normal, int module_num) { int Feb_Control_Init(int master, int normal) {
Feb_Control_master = master; Feb_Control_master = master;
Feb_Control_normal = normal; Feb_Control_normal = normal;
Feb_Interface_SetAddress(Feb_Control_rightAddress, Feb_Control_leftAddress); Feb_Interface_SetAddress(Feb_Control_rightAddress, Feb_Control_leftAddress);

2
slsDetectorServers/eigerDetectorServer/FebControl.h
View File

@ -6,7 +6,7 @@
// setup // setup
void Feb_Control_activate(int activate); void Feb_Control_activate(int activate);
void Feb_Control_FebControl(); void Feb_Control_FebControl();
int Feb_Control_Init(int master, int normal, int module_num); int Feb_Control_Init(int master, int normal);
int Feb_Control_OpenSerialCommunication(); int Feb_Control_OpenSerialCommunication();
void Feb_Control_CloseSerialCommunication(); void Feb_Control_CloseSerialCommunication();
int Feb_Control_CheckSetup(); int Feb_Control_CheckSetup();

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -317,7 +317,7 @@ void initControlServer() {
Feb_Interface_FebInterface(); Feb_Interface_FebInterface();
Feb_Control_FebControl(); Feb_Control_FebControl();
// same addresses for top and bottom // same addresses for top and bottom
if (!Feb_Control_Init(master, normal, getDetectorNumber())) { if (!Feb_Control_Init(master, normal)) {
initError = FAIL; initError = FAIL;
sprintf(initErrorMessage, "Could not intitalize feb control\n"); sprintf(initErrorMessage, "Could not intitalize feb control\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));