Merge branch 'develop' into meier/ploc

linux/devices/CMakeLists.txt

@@ -2,9 +2,7 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
   target_sources(${OBSW_NAME} PRIVATE GPSHyperionLinuxController.cpp)
 endif()
 
-target_sources(${OBSW_NAME} PRIVATE
-	Max31865RtdLowlevelHandler.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE Max31865RtdLowlevelHandler.cpp)
 
 add_subdirectory(ploc)
 add_subdirectory(startracker)

linux/devices/GPSHyperionLinuxController.cpp

@@ -57,12 +57,12 @@ ReturnValue_t GPSHyperionLinuxController::executeAction(ActionId_t actionId,
                                                         MessageQueueId_t commandedBy,
                                                         const uint8_t *data, size_t size) {
   switch (actionId) {
-    case (GpsHyperion::TRIGGER_RESET_PIN): {
+    case (GpsHyperion::TRIGGER_RESET_PIN_GNSS): {
       if (resetCallback != nullptr) {
         PoolReadGuard pg(&gpsSet);
         // Set HK entries invalid
         gpsSet.setValidity(false, true);
-        resetCallback(resetCallbackArgs);
+        resetCallback(data, size, resetCallbackArgs);
         return HasActionsIF::EXECUTION_FINISHED;
       }
       return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;

linux/devices/GPSHyperionLinuxController.h

@@ -30,7 +30,7 @@ class GPSHyperionLinuxController : public ExtendedControllerBase {
                              bool debugHyperionGps = false);
   virtual ~GPSHyperionLinuxController();
 
-  using gpioResetFunction_t = ReturnValue_t (*)(void* args);
+  using gpioResetFunction_t = ReturnValue_t (*)(const uint8_t* actionData, size_t len, void* args);
 
   void setResetPinTriggerFunction(gpioResetFunction_t resetCallback, void* args);
   ReturnValue_t handleCommandMessage(CommandMessage* message) override;

linux/devices/Max31865RtdLowlevelHandler.cpp

@@ -112,9 +112,9 @@ bool Max31865RtdReader::periodicInitHandling() {
     }
     if (rtdIsActive(rtd->idx)) {
 #if OBSW_RTD_AUTO_MODE == 0
-      someRtdUsable = true;
       result = writeBiasSel(Bias::ON, rtd->spiCookie, BASE_CFG);
 #endif
+      someRtdUsable = true;
     }
   }
   return someRtdUsable;