Merge remote-tracking branch 'origin/main' into active-sd-info-event

CHANGELOG.md

@@ -22,6 +22,8 @@ will consitute of a breaking change warranting a new major release:
   still trigger an event if a reply is taking too long, and FDIR should still work via reply
   timeouts.
 - Re-ordered some functions of the core controller in the initialize function.
+- Rad sensor is now only polled every 30 minutes instead of every device cycle to reduce wear of
+  the RADFET electronics.
 
 ## Added
 
@@ -36,6 +38,7 @@ will consitute of a breaking change warranting a new major release:
 ## Fixed
 
 - SUS dummy handler went to `MODE_NORMAL` for ON commands.
+- PL PCDU dummy went to `MODE_NORMAL` for ON commands.
 
 # [v6.1.0] 2023-07-13
 

dummies/PlPcduDummy.cpp

@@ -7,7 +7,7 @@ PlPcduDummy::PlPcduDummy(object_id_t objectId, object_id_t comif, CookieIF *comC
 
 PlPcduDummy::~PlPcduDummy() {}
 
-void PlPcduDummy::doStartUp() { setMode(MODE_NORMAL); }
+void PlPcduDummy::doStartUp() { setMode(MODE_ON); }
 
 void PlPcduDummy::doShutDown() { setMode(MODE_OFF); }
 

mission/payload/RadiationSensorHandler.cpp

@@ -15,6 +15,8 @@ RadiationSensorHandler::RadiationSensorHandler(object_id_t objectId, object_id_t
   if (comCookie == nullptr) {
     sif::error << "RadiationSensorHandler: Invalid com cookie" << std::endl;
   }
+  // Time out immediately so we get an immediate measurement at device startup.
+  measurementCd.timeOut();
 }
 
 RadiationSensorHandler::~RadiationSensorHandler() {}
@@ -51,6 +53,9 @@ void RadiationSensorHandler::doShutDown() {
 }
 
 ReturnValue_t RadiationSensorHandler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
+  if (measurementCd.isBusy()) {
+    return NOTHING_TO_SEND;
+  }
   switch (communicationStep) {
     case CommunicationStep::START_CONVERSION: {
       *id = radSens::START_CONVERSION;
@@ -177,22 +182,25 @@ ReturnValue_t RadiationSensorHandler::interpretDeviceReply(DeviceCommandId_t id,
   switch (id) {
     case radSens::READ_CONVERSIONS: {
       uint8_t offset = 0;
-      PoolReadGuard readSet(&dataset);
+      measurementCd.resetTimer();
-      uint16_t tempRaw = ((packet[offset] & 0x0f) << 8) | packet[offset + 1];
+      {
-      dataset.temperatureCelcius = max1227::getTemperature(tempRaw);
+        PoolReadGuard readSet(&dataset);
-      offset += 2;
+        uint16_t tempRaw = ((packet[offset] & 0x0f) << 8) | packet[offset + 1];
-      dataset.ain0 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.temperatureCelcius = max1227::getTemperature(tempRaw);
-      offset += 2;
+        offset += 2;
-      dataset.ain1 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.ain0 = (*(packet + offset) << 8) | *(packet + offset + 1);
-      offset += 6;
+        offset += 2;
-      dataset.ain4 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.ain1 = (*(packet + offset) << 8) | *(packet + offset + 1);
-      offset += 2;
+        offset += 6;
-      dataset.ain5 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.ain4 = (*(packet + offset) << 8) | *(packet + offset + 1);
-      offset += 2;
+        offset += 2;
-      dataset.ain6 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.ain5 = (*(packet + offset) << 8) | *(packet + offset + 1);
-      offset += 2;
+        offset += 2;
-      dataset.ain7 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.ain6 = (*(packet + offset) << 8) | *(packet + offset + 1);
-      dataset.setValidity(true, true);
+        offset += 2;
+        dataset.ain7 = (*(packet + offset) << 8) | *(packet + offset + 1);
+        dataset.setValidity(true, true);
+      }
       if (printPeriodicData) {
         sif::info << "Radiation sensor temperature: " << dataset.temperatureCelcius << " °C"
                   << std::dec << std::endl;
@@ -203,6 +211,12 @@ ReturnValue_t RadiationSensorHandler::interpretDeviceReply(DeviceCommandId_t id,
         sif::info << "Radiation sensor ADC value channel 6: " << dataset.ain6 << std::endl;
         sif::info << "Radiation sensor ADC value channel 7: " << dataset.ain7 << std::endl;
       }
+      ReturnValue_t result =
+          getHkManagerHandle()->generateHousekeepingPacket(dataset.getSid(), &dataset, true);
+      if (result != returnvalue::OK) {
+        // TODO: Maybe add event?
+        sif::error << "Generating HK set for radiation sensor failed" << std::endl;
+      }
       break;
     }
     default: {
@@ -226,8 +240,11 @@ ReturnValue_t RadiationSensorHandler::initializeLocalDataPool(localpool::DataPoo
   localDataPoolMap.emplace(radSens::AIN5, new PoolEntry<uint16_t>({0}));
   localDataPoolMap.emplace(radSens::AIN6, new PoolEntry<uint16_t>({0}));
   localDataPoolMap.emplace(radSens::AIN7, new PoolEntry<uint16_t>({0}));
+  // It should normally not be necessary to enable this set, as a sample TM will be generated
+  // after a measurement. If this is still enabled, sample with double the measurement frequency
+  // to ensure we get all measurements.
   poolManager.subscribeForRegularPeriodicPacket(
-      subdp::RegularHkPeriodicParams(dataset.getSid(), false, 20.0));
+      subdp::RegularHkPeriodicParams(dataset.getSid(), false, DEFAULT_MEASUREMENT_CD_MS / 2));
   return returnvalue::OK;
 }
 

mission/payload/RadiationSensorHandler.h

@@ -38,12 +38,15 @@ class RadiationSensorHandler : public DeviceHandlerBase {
                                         LocalDataPoolManager &poolManager) override;
 
  private:
+  static constexpr uint32_t DEFAULT_MEASUREMENT_CD_MS = 30 * 60 * 1000;
+
   enum class CommunicationStep { START_CONVERSION, READ_CONVERSIONS };
 
   enum class InternalState { OFF, POWER_SWITCHING, SETUP, CONFIGURED };
 
   bool printPeriodicData = false;
   radSens::RadSensorDataset dataset;
+  Countdown measurementCd = Countdown(DEFAULT_MEASUREMENT_CD_MS);
   static const uint8_t MAX_CMD_LEN = radSens::READ_SIZE;
   GpioIF *gpioIF = nullptr;
   Stack5VHandler &stackHandler;