dev:Eiger febl febr (#601)

* eiger: get febl and febr versions in versions command, also added in python

slsDetectorServers/eigerDetectorServer/FebControl.c

@@ -2180,6 +2180,36 @@ int Feb_Control_GetRightFPGATemp() {
     return (int)temperature;
 }
 
+int64_t Feb_Control_GetFrontLeftFirmwareVersion() {
+    if (!Feb_Control_activated) {
+        return 0;
+    }
+    unsigned int value = 0;
+    if (!Feb_Interface_ReadRegister(Feb_Control_leftAddress, FEB_REG_STATUS,
+                                    &value)) {
+        LOG(logERROR, ("Trouble reading FEB_REG_STATUS reg to get left feb "
+                       "fw version\n"));
+        return 0;
+    }
+    return ((value & FEB_REG_STATUS_FW_VERSION_MSK) >>
+            FEB_REG_STATUS_FW_VERSION_OFST);
+}
+
+int64_t Feb_Control_GetFrontRightFirmwareVersion() {
+    if (!Feb_Control_activated) {
+        return 0;
+    }
+    unsigned int value = 0;
+    if (!Feb_Interface_ReadRegister(Feb_Control_rightAddress, FEB_REG_STATUS,
+                                    &value)) {
+        LOG(logERROR, ("Trouble reading FEB_REG_STATUS reg to get right feb "
+                       "fw version\n"));
+        return 0;
+    }
+    return ((value & FEB_REG_STATUS_FW_VERSION_MSK) >>
+            FEB_REG_STATUS_FW_VERSION_OFST);
+}
+
 int64_t Feb_Control_GetMeasuredPeriod() {
     if (!Feb_Control_activated) {
         return 0;

slsDetectorServers/eigerDetectorServer/FebControl.h

@@ -116,5 +116,7 @@ int Feb_Control_PrintCorrectedValues();
 // adcs
 int Feb_Control_GetLeftFPGATemp();
 int Feb_Control_GetRightFPGATemp();
+int64_t Feb_Control_GetFrontLeftFirmwareVersion();
+int64_t Feb_Control_GetFrontRightFirmwareVersion();
 int64_t Feb_Control_GetMeasuredPeriod();
 int64_t Feb_Control_GetSubMeasuredPeriod();

slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h

@@ -46,6 +46,8 @@
 #define FEB_REG_STATUS_WAIT_FOR_TRGGR_MSK   (0x00000001 << FEB_REG_STATUS_WAIT_FOR_TRGGR_OFST)
 #define FEB_REG_STATUS_ACQ_DONE_OFST        (6)
 #define FEB_REG_STATUS_ACQ_DONE_MSK         (0x00000001 << FEB_REG_STATUS_ACQ_DONE_OFST)
+#define FEB_REG_STATUS_FW_VERSION_OFST      (8)
+#define FEB_REG_STATUS_FW_VERSION_MSK       (0x000000FF << FEB_REG_STATUS_FW_VERSION_OFST)
 #define FEB_REG_STATUS_TEMP_OFST            (16)
 #define FEB_REG_STATUS_TEMP_MSK             (0x0000FFFF << FEB_REG_STATUS_TEMP_OFST)
 

slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c

@@ -216,6 +216,27 @@ u_int64_t getFirmwareVersion() {
 #endif
 }
 
+uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition) {
+    uint64_t retval = 0;
+#ifndef VIRTUAL
+    sharedMemory_lockLocalLink();
+    switch (fpgaPosition) {
+    case FRONT_LEFT:
+        retval = Feb_Control_GetFrontLeftFirmwareVersion(fpgaPosition);
+        break;
+    case FRONT_RIGHT:
+        retval = Feb_Control_GetFrontRightFirmwareVersion(fpgaPosition);
+        break;
+    default:
+        LOG(logERROR,
+            ("unknown index for fpga position to read firmware version\n"));
+        retval = -1;
+    }
+    sharedMemory_unlockLocalLink();
+#endif
+    return retval;
+}
+
 u_int64_t getFirmwareAPIVersion() {
 #ifdef VIRTUAL
     return 0;

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -78,6 +78,9 @@ int getTestImageMode();
 // Ids
 void getServerVersion(char *version);
 u_int64_t getFirmwareVersion();
+#ifdef EIGERD
+uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition);
+#endif
 u_int64_t getFirmwareAPIVersion();
 #ifndef EIGERD
 void getHardwareVersion(char *version);

slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h

@@ -306,3 +306,4 @@ int get_module(int);
 int get_synchronization(int);
 int set_synchronization(int);
 int get_hardware_version(int);
+int get_frontend_firmware_version(int);

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -471,6 +471,7 @@ void function_table() {
     flist[F_GET_SYNCHRONIZATION] = &get_synchronization;
     flist[F_SET_SYNCHRONIZATION] = &set_synchronization;
     flist[F_GET_HARDWARE_VERSION] = &get_hardware_version;
+    flist[F_GET_FRONTEND_FIRMWARE_VERSION] = &get_frontend_firmware_version;
 
     // check
     if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@@ -10136,3 +10137,35 @@ int get_hardware_version(int file_des) {
 #endif
     return Server_SendResult(file_des, OTHER, retvals, sizeof(retvals));
 }
+
+int get_frontend_firmware_version(int file_des) {
+    ret = OK;
+    memset(mess, 0, sizeof(mess));
+    enum fpgaPosition arg = FRONT_LEFT;
+    int64_t retval = -1;
+
+    if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
+        return printSocketReadError();
+    LOG(logDEBUG1, ("Getting front end firmware version: %s\n",
+                    (arg == FRONT_LEFT ? "left" : "right")));
+
+#if !defined(EIGERD)
+    functionNotImplemented();
+#else
+    switch (arg) {
+    case FRONT_LEFT:
+    case FRONT_RIGHT:
+        break;
+    default:
+        modeNotImplemented("Fpga position Index", (int)arg);
+        break;
+    }
+    if (ret == OK) {
+        retval = getFrontEndFirmwareVersion(arg);
+        LOG(logDEBUG1,
+            ("Front %s version retval: 0x%llx\n",
+             (arg == FRONT_LEFT ? "left" : "right"), (long long int)retval));
+    }
+#endif
+    return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
+}