Compare commits

...

3 Commits

4 changed files with 13 additions and 2 deletions

View File

@ -371,7 +371,14 @@ void initStopServer() {
getModuleConfiguration(); getModuleConfiguration();
Feb_Interface_FebInterface(); Feb_Interface_FebInterface();
Feb_Control_FebControl(); 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")); LOG(logDEBUG1, ("Stop server: FEB Initialization done\n"));
// activate (if it gets ip) (later FW will deactivate at startup) // activate (if it gets ip) (later FW will deactivate at startup)
// also needed for stop server for status // also needed for stop server for status

View File

@ -3216,6 +3216,10 @@ bool Module::enableTenGigabitEthernet(int value) {
int retval = -1; int retval = -1;
LOG(logDEBUG1) << "Enabling / Disabling 10Gbe: " << value; LOG(logDEBUG1) << "Enabling / Disabling 10Gbe: " << value;
sendToDetector(F_ENABLE_TEN_GIGA, value, retval); sendToDetector(F_ENABLE_TEN_GIGA, value, retval);
if (value != -1) {
int stopRetval = -1;
sendToDetectorStop(F_ENABLE_TEN_GIGA, value, stopRetval);
}
LOG(logDEBUG1) << "10Gbe: " << retval; LOG(logDEBUG1) << "10Gbe: " << retval;
value = retval; value = retval;
if (shm()->useReceiverFlag && value != -1) { if (shm()->useReceiverFlag && value != -1) {

View File

@ -9,4 +9,4 @@
#define APIJUNGFRAU 0x200407 #define APIJUNGFRAU 0x200407
#define APIMYTHEN3 0x200407 #define APIMYTHEN3 0x200407
#define APIMOENCH 0x200407 #define APIMOENCH 0x200407
#define APIEIGER 0x200407 #define APIEIGER 0x200408