From c4ae876ca70179be9396e5d984a0b1b12d4dee8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Br=C3=BCckner?= Date: Tue, 7 Apr 2020 17:45:53 +0200 Subject: [PATCH] Add Eiger server Init() modification also to initStopServer() --- .../eigerDetectorServer/slsDetectorFunctionList.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 27ce285e6..8b74cc2eb 100755 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -371,7 +371,14 @@ void initStopServer() { getModuleConfiguration(); Feb_Interface_FebInterface(); Feb_Control_FebControl(); - Feb_Control_Init(master,top,normal,getDetectorNumber()); + // different addresses for top and bottom + if (getFirmwareVersion() < FIRMWARE_VERSION_SAME_TOP_BOT_ADDR) { + Feb_Control_Init(master,top,normal, getDetectorNumber()); + } + // same addresses for top and bottom + else { + Feb_Control_Init(master,1, normal, getDetectorNumber()); + } LOG(logDEBUG1, ("Stop server: FEB Initialization done\n")); // activate (if it gets ip) (later FW will deactivate at startup) // also needed for stop server for status