added eive specific max31865 handler

mission/devices/CMakeLists.txt

@@ -8,6 +8,7 @@ target_sources(${LIB_EIVE_MISSION} PRIVATE
     PDU2Handler.cpp
     ACUHandler.cpp
     SyrlinksHkHandler.cpp
+    Max31865EiveHandler.cpp
     Max31865PT1000Handler.cpp
     IMTQHandler.cpp
     HeaterHandler.cpp

mission/devices/Max31865EiveHandler.cpp

@@ -0,0 +1,132 @@
+#include "Max31865EiveHandler.h"
+
+Max31865EiveHandler::Max31865EiveHandler(object_id_t objectId, object_id_t comIF,
+                                         CookieIF* comCookie)
+    : DeviceHandlerBase(objectId, comIF, comCookie, nullptr),
+      sensorDataset(this, EiveMax31855::RtdCommands::EXCHANGE_SET_ID) {}
+
+void Max31865EiveHandler::doStartUp() {
+  if (state == InternalState::NONE or state == InternalState::INACTIVE) {
+    if (instantNormal) {
+      state = InternalState::ACTIVE;
+    } else {
+      state = InternalState::ON;
+    }
+    transitionOk = false;
+  }
+  if ((state == InternalState::ON or state == InternalState::ACTIVE) and transitionOk) {
+    if (instantNormal) {
+      setMode(_MODE_TO_NORMAL);
+    } else {
+      setMode(MODE_ON);
+    }
+  }
+}
+
+void Max31865EiveHandler::doShutDown() {
+  if (state == InternalState::NONE or state == InternalState::ACTIVE or
+      state == InternalState::ON) {
+    state = InternalState::INACTIVE;
+    transitionOk = false;
+  } else {
+    transitionOk = true;
+  }
+  if (state == InternalState::INACTIVE and transitionOk) {
+    setMode(_MODE_POWER_DOWN);
+  }
+}
+
+ReturnValue_t Max31865EiveHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
+  *id = EiveMax31855::RtdCommands::EXCHANGE_SET_ID;
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865EiveHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
+  if (state == InternalState::ON) {
+    *id = EiveMax31855::RtdCommands::ON;
+    buildCommandFromCommand(*id, nullptr, 0);
+  }
+  if (state == InternalState::ACTIVE) {
+    *id = EiveMax31855::RtdCommands::ACTIVE;
+    buildCommandFromCommand(*id, nullptr, 0);
+  }
+  if (state == InternalState::INACTIVE) {
+    *id = EiveMax31855::RtdCommands::OFF;
+    buildCommandFromCommand(*id, nullptr, 0);
+  }
+  return NOTHING_TO_SEND;
+}
+
+ReturnValue_t Max31865EiveHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
+                                                           const uint8_t* commandData,
+                                                           size_t commandDataLen) {
+  auto cmdTyped = static_cast<EiveMax31855::RtdCommands>(deviceCommand);
+  switch (cmdTyped) {
+    case (EiveMax31855::RtdCommands::ON):
+    case (EiveMax31855::RtdCommands::ACTIVE):
+    case (EiveMax31855::RtdCommands::OFF): {
+      simpleCommand(cmdTyped);
+      break;
+    }
+    case (EiveMax31855::RtdCommands::LOW_THRESHOLD):
+    case (EiveMax31855::RtdCommands::HIGH_TRESHOLD): {
+      break;
+    }
+    case (EiveMax31855::RtdCommands::CFG): {
+      break;
+    }
+    default:
+      return NOTHING_TO_SEND;
+  }
+  return RETURN_OK;
+}
+
+void Max31865EiveHandler::simpleCommand(EiveMax31855::RtdCommands cmd) {
+  cmdBuf[0] = cmd;
+  rawPacket = cmdBuf.data();
+  rawPacketLen = 1;
+}
+void Max31865EiveHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
+  if (mode == _MODE_TO_NORMAL) {
+    state = InternalState::ACTIVE;
+    transitionOk = false;
+    if (transitionOk) {
+      setMode(MODE_NORMAL);
+    }
+  } else {
+    DeviceHandlerBase::doTransition(modeFrom, subModeFrom);
+  }
+}
+
+void Max31865EiveHandler::fillCommandAndReplyMap() {
+  insertInReplyMap(EiveMax31855::RtdCommands::EXCHANGE_SET_ID, 2, &sensorDataset);
+}
+
+ReturnValue_t Max31865EiveHandler::scanForReply(const uint8_t* start, size_t remainingSize,
+                                                DeviceCommandId_t* foundId, size_t* foundLen) {
+  if (remainingSize != exchangeStruct.getSerializedSize()) {
+    sif::error << "Invalid reply from RTD reader detected, reply size " << remainingSize
+               << "not equal to exchange struct size" << exchangeStruct.getSerializedSize()
+               << std::endl;
+    return RETURN_FAILED;
+  }
+  *foundId = EiveMax31855::RtdCommands::EXCHANGE_SET_ID;
+  *foundLen = remainingSize;
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865EiveHandler::interpretDeviceReply(DeviceCommandId_t id,
+                                                        const uint8_t* packet) {
+  return RETURN_OK;
+}
+
+uint32_t Max31865EiveHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 2000; }
+
+ReturnValue_t Max31865EiveHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
+                                                           LocalDataPoolManager& poolManager) {
+  localDataPoolMap.emplace(MAX31865::PoolIds::RTD_VALUE, new PoolEntry<float>({0}));
+  localDataPoolMap.emplace(MAX31865::PoolIds::TEMPERATURE_C, new PoolEntry<float>({0}));
+  localDataPoolMap.emplace(MAX31865::PoolIds::FAULT_BYTE, new PoolEntry<uint8_t>({0}));
+  poolManager.subscribeForPeriodicPacket(sensorDataset.getSid(), false, 30.0, false);
+  return RETURN_OK;
+}

mission/devices/Max31865EiveHandler.h

@@ -0,0 +1,37 @@
+#ifndef MISSION_DEVICES_MAX31865EIVEHANDLER_H_
+#define MISSION_DEVICES_MAX31865EIVEHANDLER_H_
+
+#include <fsfw/devicehandlers/DeviceHandlerBase.h>
+
+#include "devicedefinitions/Max31865Definitions.h"
+
+class Max31865EiveHandler : public DeviceHandlerBase {
+ public:
+  Max31865EiveHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
+
+ private:
+  void doStartUp() override;
+  void doShutDown() override;
+  void doTransition(Mode_t modeFrom, Submode_t subModeFrom) override;
+  ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t* id) override;
+  ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t* id) override;
+  void fillCommandAndReplyMap() override;
+  ReturnValue_t buildCommandFromCommand(DeviceCommandId_t deviceCommand, const uint8_t* commandData,
+                                        size_t commandDataLen) override;
+  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;
+  uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
+  ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
+                                        LocalDataPoolManager& poolManager) override;
+
+  void simpleCommand(EiveMax31855::RtdCommands cmd);
+  std::array<uint8_t, 12> cmdBuf = {};
+  EiveMax31855::ReadOutStruct exchangeStruct;
+  bool instantNormal = false;
+  MAX31865::Max31865Set sensorDataset;
+  enum class InternalState { NONE, ON, ACTIVE, INACTIVE } state = InternalState::NONE;
+  bool transitionOk = false;
+};
+
+#endif /* MISSION_DEVICES_MAX31865EIVEHANDLER_H_ */

mission/devices/Max31865PT1000Handler.cpp

@@ -8,7 +8,7 @@
 Max31865PT1000Handler::Max31865PT1000Handler(object_id_t objectId, object_id_t comIF,
                                              CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comIF, comCookie),
-      sensorDataset(this),
+      sensorDataset(this, MAX31865::REQUEST_RTD),
       sensorDatasetSid(sensorDataset.getSid()) {
 #if OBSW_VERBOSE_LEVEL >= 1
   debugDivider = new PeriodicOperationDivider(10);

mission/devices/devicedefinitions/Max31865Definitions.h

@@ -28,6 +28,8 @@ enum CfgBitPos {
   BIAS_SEL = 7
 };
 
+static constexpr uint32_t WARMUP_MS = 100;
+
 static constexpr DeviceCommandId_t CONFIG_CMD = 0x80;
 static constexpr DeviceCommandId_t WRITE_HIGH_THRESHOLD = 0x83;
 static constexpr DeviceCommandId_t WRITE_LOW_THRESHOLD = 0x85;
@@ -50,20 +52,20 @@ static constexpr uint8_t REG_RTD = 0x01;
 
 static constexpr size_t MAX_REPLY_SIZE = 5;
 
-class Max31865Set : public StaticLocalDataSet<sizeof(float) + sizeof(uint8_t)> {
+class Max31865Set : public StaticLocalDataSet<3> {
  public:
   /**
    * Constructor used by owner and data creators like device handlers.
    * @param owner
    * @param setId
    */
-  Max31865Set(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, MAX31865_SET_ID) {}
+  Max31865Set(HasLocalDataPoolIF* owner, uint32_t setId) : StaticLocalDataSet(owner, setId) {}
 
   /**
    * Constructor used by data users like controllers.
    * @param sid
    */
-  Max31865Set(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, MAX31865_SET_ID)) {}
+  Max31865Set(object_id_t objectId, uint32_t setId) : StaticLocalDataSet(sid_t(objectId, setId)) {}
 
   lp_var_t<float> rtdValue = lp_var_t<float>(sid.objectId, PoolIds::RTD_VALUE, this);
   lp_var_t<float> temperatureCelcius = lp_var_t<float>(sid.objectId, PoolIds::TEMPERATURE_C, this);
@@ -72,4 +74,50 @@ class Max31865Set : public StaticLocalDataSet<sizeof(float) + sizeof(uint8_t)> {
 
 }  // namespace MAX31865
 
+namespace EiveMax31855 {
+
+static constexpr uint8_t NUM_RTDS = 16;
+
+enum RtdCommands : DeviceCommandId_t {
+  ON = 0,
+  EXCHANGE_SET_ID = MAX31865::REQUEST_RTD,
+  ACTIVE = 2,
+  LOW_THRESHOLD = 3,
+  HIGH_TRESHOLD = 4,
+  OFF = 5,
+  CFG = 6,
+
+};
+
+class ReadOutStruct : public SerialLinkedListAdapter<SerializeIF> {
+ public:
+  ReadOutStruct() { setLinks(); }
+  ReadOutStruct(bool active, uint32_t spiErrCnt, bool faultBitSet, uint8_t faultVal,
+                uint16_t rtdVal)
+      : active(active),
+        rtdVal(rtdVal),
+        faultBitSet(faultBitSet),
+        faultValue(faultVal),
+        spiErrorCount(spiErrCnt) {
+    setLinks();
+  }
+
+  SerializeElement<bool> active = false;
+  SerializeElement<uint16_t> rtdVal = 0;
+  SerializeElement<bool> faultBitSet = false;
+  SerializeElement<uint8_t> faultValue = 0;
+  SerializeElement<uint32_t> spiErrorCount = 0;
+
+ private:
+  void setLinks() {
+    setStart(&active);
+    active.setNext(&rtdVal);
+    rtdVal.setNext(&faultBitSet);
+    faultBitSet.setNext(&faultValue);
+    faultValue.setNext(&spiErrorCount);
+  };
+};
+
+};  // namespace EiveMax31855
+
 #endif /* MISSION_DEVICES_DEVICEDEFINITIONS_MAX13865DEFINITIONS_H_ */

mission/devices/devicedefinitions/Max31865DeviceDefinitions.cpp

@@ -1 +0,0 @@
-#include "Max31865Definitions.h"