From 210bc32e464e2336a9fcaa72da7a70b6c01a998b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 1 Sep 2021 17:11:04 +0200 Subject: [PATCH] wip --- slsDetectorServers/eigerDetectorServer/FebControl.c | 2 +- slsDetectorServers/eigerDetectorServer/FebControl.h | 2 +- .../eigerDetectorServer/slsDetectorFunctionList.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c index f44c768b6..6ca0b85ae 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.c +++ b/slsDetectorServers/eigerDetectorServer/FebControl.c @@ -57,7 +57,7 @@ void Feb_Control_FebControl() { 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_normal = normal; Feb_Interface_SetAddress(Feb_Control_rightAddress, Feb_Control_leftAddress); diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.h b/slsDetectorServers/eigerDetectorServer/FebControl.h index 14f1fb731..d600a6ca8 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.h +++ b/slsDetectorServers/eigerDetectorServer/FebControl.h @@ -6,7 +6,7 @@ // setup void Feb_Control_activate(int activate); 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(); void Feb_Control_CloseSerialCommunication(); int Feb_Control_CheckSetup(); diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index dede44bfb..7a29478fe 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -317,7 +317,7 @@ void initControlServer() { Feb_Interface_FebInterface(); Feb_Control_FebControl(); // same addresses for top and bottom - if (!Feb_Control_Init(master, normal, getDetectorNumber())) { + if (!Feb_Control_Init(master, normal)) { initError = FAIL; sprintf(initErrorMessage, "Could not intitalize feb control\n"); LOG(logERROR, (initErrorMessage));