add TCS board assy for EM

2023-02-13 17:04:04 +01:00 · 2023-02-13 17:04:04 +01:00 · 17fa9a6e82
commit 17fa9a6e82
parent 2813d229bb
5 changed files with 43 additions and 28 deletions
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@ -343,6 +343,7 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, SerialCo

 #if OBSW_ADD_ACS_BOARD == 1
  std::string spiDev = q7s::SPI_DEFAULT_DEV;
+  std::array<DeviceHandlerBase*, 8> assemblyChildren;
  SpiCookie* spiCookie =
      new SpiCookie(addresses::MGM_0_LIS3, gpioIds::MGM_0_LIS3_CS, MGMLIS3MDL::MAX_BUFFER_SIZE,
                    spi::DEFAULT_LIS3_MODE, spi::DEFAULT_LIS3_SPEED);
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@ -21,6 +21,7 @@
 #include <dummies/SusDummy.h>
 #include <dummies/SyrlinksDummy.h>
 #include <mission/system/objects/CamSwitcher.h>
+#include <mission/system/objects/TcsBoardAssembly.h>

 #include "TemperatureSensorInserter.h"
 #include "dummies/Max31865Dummy.h"
@ -187,6 +188,10 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio

    new TemperatureSensorInserter(objects::THERMAL_TEMP_INSERTER, tempSensorDummies,
                                  tempTmpSensorDummies);
+    TcsBoardAssembly* tcsBoardAssy = ObjectFactory::createTcsBoardAssy(pwrSwitcher);
+    for (auto& rtd : tempSensorDummies) {
+      rtd.second->connectModeTreeParent(*tcsBoardAssy);
+    }
  }
  auto* camSwitcher = new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, power::NO_SWITCH);
  camSwitcher->connectModeTreeParent(satsystem::pl::SUBSYSTEM);
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@ -270,32 +270,13 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
      {addresses::RTD_IC_18, gpioIds::RTD_IC_18},
  }};
  // HSPD: Heatspreader
-  std::array<std::pair<object_id_t, std::string>, NUM_RTDS> rtdInfos = {{
-      {objects::RTD_0_IC3_PLOC_HEATSPREADER, "RTD_0_PLOC_HSPD"},
-      {objects::RTD_1_IC4_PLOC_MISSIONBOARD, "RTD_1_PLOC_MISSIONBRD"},
-      {objects::RTD_2_IC5_4K_CAMERA, "RTD_2_4K_CAMERA"},
-      {objects::RTD_3_IC6_DAC_HEATSPREADER, "RTD_3_DAC_HSPD"},
-      {objects::RTD_4_IC7_STARTRACKER, "RTD_4_STARTRACKER"},
-      {objects::RTD_5_IC8_RW1_MX_MY, "RTD_5_RW1_MX_MY"},
-      {objects::RTD_6_IC9_DRO, "RTD_6_DRO"},
-      {objects::RTD_7_IC10_SCEX, "RTD_7_SCEX"},
-      {objects::RTD_8_IC11_X8, "RTD_8_X8"},
-      {objects::RTD_9_IC12_HPA, "RTD_9_HPA"},
-      {objects::RTD_10_IC13_PL_TX, "RTD_10_PL_TX,"},
-      {objects::RTD_11_IC14_MPA, "RTD_11_MPA"},
-      {objects::RTD_12_IC15_ACU, "RTD_12_ACU"},
-      {objects::RTD_13_IC16_PLPCDU_HEATSPREADER, "RTD_13_PLPCDU_HSPD"},
-      {objects::RTD_14_IC17_TCS_BOARD, "RTD_14_TCS_BOARD"},
-      {objects::RTD_15_IC18_IMTQ, "RTD_15_IMTQ"},
-  }};
+
  std::array<SpiCookie*, NUM_RTDS> rtdCookies = {};
  std::array<Max31865EiveHandler*, NUM_RTDS> rtds = {};
  RtdFdir* rtdFdir = nullptr;

-  TcsBoardHelper helper(rtdInfos);
-  TcsBoardAssembly* tcsBoardAss = new TcsBoardAssembly(
-      objects::TCS_BOARD_ASS, pwrSwitcher, pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
-  tcsBoardAss->connectModeTreeParent(satsystem::tcs::SUBSYSTEM);
+  TcsBoardAssembly* tcsBoardAss = ObjectFactory::createTcsBoardAssy(*pwrSwitcher);
+
  // Create special low level reader communication interface
  new Max31865RtdReader(objects::SPI_RTD_COM_IF, comIF, gpioComIF);
  for (uint8_t idx = 0; idx < NUM_RTDS; idx++) {
@ -303,16 +284,16 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
                                    MAX31865::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
    rtdCookies[idx]->setMutexParams(MutexIF::TimeoutType::WAITING, spi::RTD_CS_TIMEOUT);
    Max31865ReaderCookie* rtdLowLevelCookie =
-        new Max31865ReaderCookie(rtdInfos[idx].first, idx, rtdInfos[idx].second, rtdCookies[idx]);
+        new Max31865ReaderCookie(RTD_INFOS[idx].first, idx, RTD_INFOS[idx].second, rtdCookies[idx]);
    rtds[idx] =
-        new Max31865EiveHandler(rtdInfos[idx].first, objects::SPI_RTD_COM_IF, rtdLowLevelCookie);
-    rtds[idx]->setDeviceInfo(idx, rtdInfos[idx].second);
+        new Max31865EiveHandler(RTD_INFOS[idx].first, objects::SPI_RTD_COM_IF, rtdLowLevelCookie);
+    rtds[idx]->setDeviceInfo(idx, RTD_INFOS[idx].second);
    ReturnValue_t result = rtds[idx]->connectModeTreeParent(*tcsBoardAss);
    if (result != returnvalue::OK) {
      sif::error << "Connecting RTD " << static_cast<int>(idx) << " to RTD Assembly failed"
                 << std::endl;
    }
-    rtdFdir = new RtdFdir(rtdInfos[idx].first);
+    rtdFdir = new RtdFdir(RTD_INFOS[idx].first);
    rtds[idx]->setCustomFdir(rtdFdir);
 #if OBSW_DEBUG_RTD == 1
    rtds[idx]->setDebugMode(true, 5);
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@ -30,6 +30,7 @@
 #include <mission/system/objects/AcsBoardAssembly.h>
 #include <mission/system/objects/RwAssembly.h>
 #include <mission/system/objects/SusAssembly.h>
+#include <mission/system/objects/TcsBoardAssembly.h>
 #include <mission/tmtc/CfdpTmFunnel.h>
 #include <mission/tmtc/PusTmFunnel.h>
 #include <mission/tmtc/TmFunnelHandler.h>
@ -282,4 +283,10 @@ void ObjectFactory::createAcsBoardAssy(PowerSwitchIF& pwrSwitcher,
  acsAss->connectModeTreeParent(satsystem::acs::ACS_SUBSYSTEM);
 }

-void ObjectFactory::createTcsBoardAssy(PowerSwitchIF& pwrSwitcher) {}
+TcsBoardAssembly* ObjectFactory::createTcsBoardAssy(PowerSwitchIF& pwrSwitcher) {
+  TcsBoardHelper helper(RTD_INFOS);
+  TcsBoardAssembly* tcsBoardAss = new TcsBoardAssembly(
+      objects::TCS_BOARD_ASS, &pwrSwitcher, pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
+  tcsBoardAss->connectModeTreeParent(satsystem::tcs::SUBSYSTEM);
+  return tcsBoardAss;
+}
--- a/mission/core/GenericFactory.h
+++ b/mission/core/GenericFactory.h
@ -6,12 +6,33 @@
 #include "fsfw/objectmanager/SystemObjectIF.h"
 #include "fsfw/power/PowerSwitchIF.h"
 #include "fsfw_hal/common/gpio/GpioIF.h"
+#include "mission/devices/devicedefinitions/Max31865Definitions.h"

 class HeaterHandler;
 class HealthTableIF;
 class PusTmFunnel;
 class CfdpTmFunnel;
 class ExtendedControllerBase;
+class TcsBoardAssembly;
+
+const std::array<std::pair<object_id_t, std::string>, EiveMax31855::NUM_RTDS> RTD_INFOS = {{
+    {objects::RTD_0_IC3_PLOC_HEATSPREADER, "RTD_0_PLOC_HSPD"},
+    {objects::RTD_1_IC4_PLOC_MISSIONBOARD, "RTD_1_PLOC_MISSIONBRD"},
+    {objects::RTD_2_IC5_4K_CAMERA, "RTD_2_4K_CAMERA"},
+    {objects::RTD_3_IC6_DAC_HEATSPREADER, "RTD_3_DAC_HSPD"},
+    {objects::RTD_4_IC7_STARTRACKER, "RTD_4_STARTRACKER"},
+    {objects::RTD_5_IC8_RW1_MX_MY, "RTD_5_RW1_MX_MY"},
+    {objects::RTD_6_IC9_DRO, "RTD_6_DRO"},
+    {objects::RTD_7_IC10_SCEX, "RTD_7_SCEX"},
+    {objects::RTD_8_IC11_X8, "RTD_8_X8"},
+    {objects::RTD_9_IC12_HPA, "RTD_9_HPA"},
+    {objects::RTD_10_IC13_PL_TX, "RTD_10_PL_TX,"},
+    {objects::RTD_11_IC14_MPA, "RTD_11_MPA"},
+    {objects::RTD_12_IC15_ACU, "RTD_12_ACU"},
+    {objects::RTD_13_IC16_PLPCDU_HEATSPREADER, "RTD_13_PLPCDU_HSPD"},
+    {objects::RTD_14_IC17_TCS_BOARD, "RTD_14_TCS_BOARD"},
+    {objects::RTD_15_IC18_IMTQ, "RTD_15_IMTQ"},
+}};

 namespace ObjectFactory {

@ -26,7 +47,7 @@ void createRwAssy(PowerSwitchIF& pwrSwitcher, power::Switch_t theSwitch,
 void createSusAssy(PowerSwitchIF& pwrSwitcher, std::array<DeviceHandlerBase*, 12> suses);
 void createAcsBoardAssy(PowerSwitchIF& pwrSwitcher, std::array<DeviceHandlerBase*, 8> assemblyDhbs,
                        ExtendedControllerBase* gpsCtrl, GpioIF* gpioComIF);
-void createTcsBoardAssy(PowerSwitchIF& pwrSwitcher);
+TcsBoardAssembly* createTcsBoardAssy(PowerSwitchIF& pwrSwitcher);

 }  // namespace ObjectFactory