Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates

bsp_q7s/core/ObjectFactory.cpp

@@ -305,8 +305,8 @@ void ObjectFactory::createRadSensorComponent(LinuxLibgpioIF* gpioComIF) {
   SpiCookie* spiCookieRadSensor = new SpiCookie(
       addresses::RAD_SENSOR, gpioIds::CS_RAD_SENSOR, std::string(q7s::SPI_DEFAULT_DEV),
       RAD_SENSOR::READ_SIZE, spi::DEFAULT_MAX_1227_MODE, spi::DEFAULT_MAX_1227_SPEED);
-  auto radSensor =
+  auto radSensor = new RadiationSensorHandler(objects::RAD_SENSOR, objects::SPI_COM_IF,
-      new RadiationSensorHandler(objects::RAD_SENSOR, objects::SPI_COM_IF, spiCookieRadSensor);
+                                              spiCookieRadSensor, gpioComIF);
   static_cast<void>(radSensor);
 #if OBSW_TEST_RAD_SENSOR == 1
   radSensor->setStartUpImmediately();

mission/devices/RadiationSensorHandler.cpp

@@ -1,11 +1,12 @@
 #include <OBSWConfig.h>
+#include <devices/gpioIds.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <mission/devices/RadiationSensorHandler.h>
 
 RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t comIF,
-                                               CookieIF *comCookie)
+                                               CookieIF *comCookie, GpioIF *gpioIF)
-    : DeviceHandlerBase(objectId, comIF, comCookie), dataset(this) {
+    : DeviceHandlerBase(objectId, comIF, comCookie), dataset(this), gpioIF(gpioIF) {
-  if (comCookie == NULL) {
+  if (comCookie == nullptr) {
     sif::error << "RadiationSensorHandler: Invalid com cookie" << std::endl;
   }
 }
@@ -68,6 +69,14 @@ ReturnValue_t RadiationSensorHandler::buildCommandFromCommand(DeviceCommandId_t
       return RETURN_OK;
     }
     case (RAD_SENSOR::START_CONVERSION): {
+      ReturnValue_t result = gpioIF->pullHigh(gpioIds::ENABLE_RADFET);
+      if (result != HasReturnvaluesIF::RETURN_OK) {
+#if OBSW_VERBOSE_LEVEL >= 1
+        sif::warning << "RadiationSensorHandler::buildCommandFromCommand; Pulling RADFET Enale pin "
+                        "high failed"
+                     << std::endl;
+#endif
+      }
       /* First the fifo will be reset here */
       cmdBuffer[0] = RAD_SENSOR::RESET_DEFINITION;
       cmdBuffer[1] = RAD_SENSOR::CONVERSION_DEFINITION;
@@ -82,14 +91,6 @@ ReturnValue_t RadiationSensorHandler::buildCommandFromCommand(DeviceCommandId_t
       rawPacketLen = RAD_SENSOR::READ_SIZE;
       return RETURN_OK;
     }
-      //    case(RAD_SENSOR::AIN0_AND_TMP_CONVERSION): {
-      //        /* First the fifo will be reset here */
-      //        cmdBuffer[0] = RAD_SENSOR::RESET_DEFINITION;
-      //        cmdBuffer[1] = RAD_SENSOR::CONVERSION_DEFINITION;
-      //        rawPacket = cmdBuffer;
-      //        rawPacketLen = 2;
-      //        return RETURN_OK;
-      //    }
     default:
       return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
   }
@@ -111,6 +112,17 @@ ReturnValue_t RadiationSensorHandler::scanForReply(const uint8_t *start, size_t
     case RAD_SENSOR::START_CONVERSION:
     case RAD_SENSOR::WRITE_SETUP:
       return IGNORE_REPLY_DATA;
+    case RAD_SENSOR::READ_CONVERSIONS: {
+      ReturnValue_t result = gpioIF->pullLow(gpioIds::ENABLE_RADFET);
+      if (result != HasReturnvaluesIF::RETURN_OK) {
+#if OBSW_VERBOSE_LEVEL >= 1
+        sif::warning << "RadiationSensorHandler::buildCommandFromCommand; Pulling RADFET Enale pin "
+                        "low failed"
+                     << std::endl;
+#endif
+      }
+      break;
+    }
     default:
       break;
   }
@@ -141,7 +153,7 @@ ReturnValue_t RadiationSensorHandler::interpretDeviceReply(DeviceCommandId_t id,
       offset += 2;
       dataset.ain7 = (*(packet + offset) << 8 | *(packet + offset + 1));
 
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_RAD_SENSOR
+#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_RAD_SENSOR == 1
       sif::info << "Radiation sensor temperature: " << dataset.temperatureCelcius << " °C"
                 << std::endl;
       sif::info << "Radiation sensor ADC value channel 0: " << dataset.ain0 << std::endl;
@@ -161,8 +173,6 @@ ReturnValue_t RadiationSensorHandler::interpretDeviceReply(DeviceCommandId_t id,
   return HasReturnvaluesIF::RETURN_OK;
 }
 
-void RadiationSensorHandler::setNormalDatapoolEntriesInvalid() {}
-
 uint32_t RadiationSensorHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) {
   return 5000;
 }

mission/devices/RadiationSensorHandler.h

@@ -4,6 +4,8 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
 
+class GpioIF;
+
 /**
  * @brief	This is the device handler class for radiation sensor on the OBC IF Board. The
  * sensor is based on the MAX1227 ADC converter.
@@ -14,7 +16,8 @@
  */
 class RadiationSensorHandler : public DeviceHandlerBase {
  public:
-  RadiationSensorHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie);
+  RadiationSensorHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie,
+                         GpioIF *gpioIF);
   virtual ~RadiationSensorHandler();
   void setToGoToNormalModeImmediately();
 
@@ -29,7 +32,6 @@ class RadiationSensorHandler : public DeviceHandlerBase {
   ReturnValue_t scanForReply(const uint8_t *start, size_t remainingSize, DeviceCommandId_t *foundId,
                              size_t *foundLen) override;
   ReturnValue_t interpretDeviceReply(DeviceCommandId_t id, const uint8_t *packet) override;
-  void setNormalDatapoolEntriesInvalid() override;
   uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
   ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                         LocalDataPoolManager &poolManager) override;
@@ -40,8 +42,8 @@ class RadiationSensorHandler : public DeviceHandlerBase {
   enum class InternalState { SETUP, CONFIGURED };
 
   RAD_SENSOR::RadSensorDataset dataset;
-
   static const uint8_t MAX_CMD_LEN = RAD_SENSOR::READ_SIZE;
+  GpioIF *gpioIF = nullptr;
 
   bool goToNormalMode = false;
   uint8_t cmdBuffer[MAX_CMD_LEN];

mission/devices/SusHandler.cpp

@@ -214,7 +214,8 @@ void SusHandler::setToGoToNormalMode(bool enable) { this->goToNormalModeImmediat
 void SusHandler::printDataset() {
   if (periodicPrintout) {
     if (divider.checkAndIncrement()) {
-      sif::info << "SUS ADC " << static_cast<int>(susIdx) << " hex [" << std::setfill('0') << std::hex;
+      sif::info << "SUS ADC " << static_cast<int>(susIdx) << " hex [" << std::setfill('0')
+                << std::hex;
       for (uint8_t idx = 0; idx < 6; idx++) {
         sif::info << std::setw(3) << dataset.channels[idx];
         if (idx < 6 - 1) {