assign rtd fdir , create TCS BOARD ASS

bsp_q7s/core/ObjectFactory.cpp

@@ -7,8 +7,10 @@
 #include <linux/obc/Ptme.h>
 #include <linux/obc/PtmeConfig.h>
 #include <mission/system/AcsBoardFdir.h>
+#include <mission/system/RtdFdir.h>
 #include <mission/system/SusAssembly.h>
 #include <mission/system/SusFdir.h>
+#include <mission/system/TcsBoardAssembly.h>
 
 #include "OBSWConfig.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
@@ -150,7 +152,7 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_SYRLINKS == 1
   createSyrlinksComponents();
 #endif /* OBSW_ADD_SYRLINKS == 1 */
-  createRtdComponents(gpioComIF);
+  createRtdComponents(gpioComIF, pwrSwitcher);
 
 #if OBSW_ADD_MGT == 1
   I2cCookie* imtqI2cCookie =
@@ -824,7 +826,7 @@ void ObjectFactory::createSyrlinksComponents() {
   new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie);
 }
 
-void ObjectFactory::createRtdComponents(LinuxLibgpioIF* gpioComIF) {
+void ObjectFactory::createRtdComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher) {
   using namespace gpio;
   GpioCookie* rtdGpioCookie = new GpioCookie;
 
@@ -879,142 +881,58 @@ void ObjectFactory::createRtdComponents(LinuxLibgpioIF* gpioComIF) {
 
   gpioComIF->addGpios(rtdGpioCookie);
 
+  static constexpr uint8_t NUMBER_RTDS = 16;
 #if OBSW_ADD_RTD_DEVICES == 1
-  SpiCookie* spiRtdIc0 =
+  std::array<std::pair<address_t, gpioId_t>, NUMBER_RTDS> cookieArgs = {{
-      new SpiCookie(addresses::RTD_IC_3, gpioIds::RTD_IC_3, q7s::SPI_DEFAULT_DEV,
+      {addresses::RTD_IC_3, gpioIds::RTD_IC_3},
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+      {addresses::RTD_IC_4, gpioIds::RTD_IC_4},
-  SpiCookie* spiRtdIc1 =
+      {addresses::RTD_IC_5, gpioIds::RTD_IC_5},
-      new SpiCookie(addresses::RTD_IC_4, gpioIds::RTD_IC_4, q7s::SPI_DEFAULT_DEV,
+      {addresses::RTD_IC_6, gpioIds::RTD_IC_6},
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+      {addresses::RTD_IC_7, gpioIds::RTD_IC_7},
-  SpiCookie* spiRtdIc2 =
+      {addresses::RTD_IC_8, gpioIds::RTD_IC_8},
-      new SpiCookie(addresses::RTD_IC_5, gpioIds::RTD_IC_5, q7s::SPI_DEFAULT_DEV,
+      {addresses::RTD_IC_9, gpioIds::RTD_IC_9},
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+      {addresses::RTD_IC_10, gpioIds::RTD_IC_10},
-  SpiCookie* spiRtdIc3 =
+      {addresses::RTD_IC_11, gpioIds::RTD_IC_11},
-      new SpiCookie(addresses::RTD_IC_6, gpioIds::RTD_IC_6, q7s::SPI_DEFAULT_DEV,
+      {addresses::RTD_IC_12, gpioIds::RTD_IC_12},
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+      {addresses::RTD_IC_13, gpioIds::RTD_IC_13},
-  SpiCookie* spiRtdIc4 =
+      {addresses::RTD_IC_14, gpioIds::RTD_IC_14},
-      new SpiCookie(addresses::RTD_IC_7, gpioIds::RTD_IC_7, q7s::SPI_DEFAULT_DEV,
+      {addresses::RTD_IC_15, gpioIds::RTD_IC_15},
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+      {addresses::RTD_IC_16, gpioIds::RTD_IC_16},
-  SpiCookie* spiRtdIc5 =
+      {addresses::RTD_IC_17, gpioIds::RTD_IC_17},
-      new SpiCookie(addresses::RTD_IC_8, gpioIds::RTD_IC_8, q7s::SPI_DEFAULT_DEV,
+      {addresses::RTD_IC_18, gpioIds::RTD_IC_18},
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+  }};
-  SpiCookie* spiRtdIc6 =
+  std::array<object_id_t, NUMBER_RTDS> rtdIds = {
-      new SpiCookie(addresses::RTD_IC_9, gpioIds::RTD_IC_9, q7s::SPI_DEFAULT_DEV,
+      objects::RTD_IC_3,  objects::RTD_IC_4,  objects::RTD_IC_5,  objects::RTD_IC_6,
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+      objects::RTD_IC_7,  objects::RTD_IC_8,  objects::RTD_IC_9,  objects::RTD_IC_10,
-  SpiCookie* spiRtdIc7 =
+      objects::RTD_IC_11, objects::RTD_IC_12, objects::RTD_IC_13, objects::RTD_IC_14,
-      new SpiCookie(addresses::RTD_IC_10, gpioIds::RTD_IC_10, q7s::SPI_DEFAULT_DEV,
+      objects::RTD_IC_15, objects::RTD_IC_16, objects::RTD_IC_17, objects::RTD_IC_18};
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+  std::array<SpiCookie*, NUMBER_RTDS> rtdCookies = {};
-  SpiCookie* spiRtdIc8 =
+  std::array<Max31865PT1000Handler*, NUMBER_RTDS> rtds = {};
-      new SpiCookie(addresses::RTD_IC_11, gpioIds::RTD_IC_11, q7s::SPI_DEFAULT_DEV,
+  RtdFdir* rtdFdir = nullptr;
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+  for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
-  SpiCookie* spiRtdIc9 =
+    rtdCookies[idx] =
-      new SpiCookie(addresses::RTD_IC_12, gpioIds::RTD_IC_12, q7s::SPI_DEFAULT_DEV,
+        new SpiCookie(cookieArgs[idx].first, cookieArgs[idx].second, q7s::SPI_DEFAULT_DEV,
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+                      Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-  SpiCookie* spiRtdIc10 =
+    rtds[idx] = new Max31865PT1000Handler(rtdIds[idx], objects::SPI_COM_IF, rtdCookies[idx]);
-      new SpiCookie(addresses::RTD_IC_13, gpioIds::RTD_IC_13, q7s::SPI_DEFAULT_DEV,
+    rtds[idx]->setParent(objects::TCS_BOARD_ASS);
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+    rtdFdir = new RtdFdir(rtdIds[idx]);
-  SpiCookie* spiRtdIc11 =
+    rtds[idx]->setCustomFdir(rtdFdir);
-      new SpiCookie(addresses::RTD_IC_14, gpioIds::RTD_IC_14, q7s::SPI_DEFAULT_DEV,
+  }
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-  SpiCookie* spiRtdIc12 =
-      new SpiCookie(addresses::RTD_IC_15, gpioIds::RTD_IC_15, q7s::SPI_DEFAULT_DEV,
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-  SpiCookie* spiRtdIc13 =
-      new SpiCookie(addresses::RTD_IC_16, gpioIds::RTD_IC_16, std::string(q7s::SPI_DEFAULT_DEV),
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-  SpiCookie* spiRtdIc14 =
-      new SpiCookie(addresses::RTD_IC_17, gpioIds::RTD_IC_17, q7s::SPI_DEFAULT_DEV,
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-  SpiCookie* spiRtdIc15 =
-      new SpiCookie(addresses::RTD_IC_18, gpioIds::RTD_IC_18, q7s::SPI_DEFAULT_DEV,
-                    Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-
-  Max31865PT1000Handler* rtdIc0 =
-      new Max31865PT1000Handler(objects::RTD_IC_3, objects::SPI_COM_IF, spiRtdIc0);
-  Max31865PT1000Handler* rtdIc1 =
-      new Max31865PT1000Handler(objects::RTD_IC_4, objects::SPI_COM_IF, spiRtdIc1);
-  Max31865PT1000Handler* rtdIc2 =
-      new Max31865PT1000Handler(objects::RTD_IC_5, objects::SPI_COM_IF, spiRtdIc2);
-  Max31865PT1000Handler* rtdIc3 =
-      new Max31865PT1000Handler(objects::RTD_IC_6, objects::SPI_COM_IF, spiRtdIc3);
-  Max31865PT1000Handler* rtdIc4 =
-      new Max31865PT1000Handler(objects::RTD_IC_7, objects::SPI_COM_IF, spiRtdIc4);
-  Max31865PT1000Handler* rtdIc5 =
-      new Max31865PT1000Handler(objects::RTD_IC_8, objects::SPI_COM_IF, spiRtdIc5);
-  Max31865PT1000Handler* rtdIc6 =
-      new Max31865PT1000Handler(objects::RTD_IC_9, objects::SPI_COM_IF, spiRtdIc6);
-  Max31865PT1000Handler* rtdIc7 =
-      new Max31865PT1000Handler(objects::RTD_IC_10, objects::SPI_COM_IF, spiRtdIc7);
-  Max31865PT1000Handler* rtdIc8 =
-      new Max31865PT1000Handler(objects::RTD_IC_11, objects::SPI_COM_IF, spiRtdIc8);
-  Max31865PT1000Handler* rtdIc9 =
-      new Max31865PT1000Handler(objects::RTD_IC_12, objects::SPI_COM_IF, spiRtdIc9);
-  Max31865PT1000Handler* rtdIc10 =
-      new Max31865PT1000Handler(objects::RTD_IC_13, objects::SPI_COM_IF, spiRtdIc10);
-  Max31865PT1000Handler* rtdIc11 =
-      new Max31865PT1000Handler(objects::RTD_IC_14, objects::SPI_COM_IF, spiRtdIc11);
-  Max31865PT1000Handler* rtdIc12 =
-      new Max31865PT1000Handler(objects::RTD_IC_15, objects::SPI_COM_IF, spiRtdIc12);
-  Max31865PT1000Handler* rtdIc13 =
-      new Max31865PT1000Handler(objects::RTD_IC_16, objects::SPI_COM_IF, spiRtdIc13);
-  Max31865PT1000Handler* rtdIc14 =
-      new Max31865PT1000Handler(objects::RTD_IC_17, objects::SPI_COM_IF, spiRtdIc14);
-  Max31865PT1000Handler* rtdIc15 =
-      new Max31865PT1000Handler(objects::RTD_IC_18, objects::SPI_COM_IF, spiRtdIc15);
 
 #if OBSW_TEST_RTD == 1
-  rtdIc0->setStartUpImmediately();
+  for (auto& rtd : rtds) {
-  rtdIc1->setStartUpImmediately();
+    if (rtd != nullptr) {
-  rtdIc2->setStartUpImmediately();
+      rtd->setStartUpImmediately();
-  rtdIc3->setStartUpImmediately();
+      rtd->setInstantNormal(true);
-  rtdIc4->setStartUpImmediately();
+    }
-  rtdIc5->setStartUpImmediately();
+  }
-  rtdIc6->setStartUpImmediately();
+#endif  // OBSW_TEST_RTD == 1
-  rtdIc7->setStartUpImmediately();
+  TcsBoardHelper helper(rtdIds);
-  rtdIc8->setStartUpImmediately();
+  TcsBoardAssembly* tcsBoardAss =
-  rtdIc9->setStartUpImmediately();
+      new TcsBoardAssembly(objects::TCS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
-  rtdIc10->setStartUpImmediately();
+                           pcduSwitches::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
-  rtdIc11->setStartUpImmediately();
+  static_cast<void>(tcsBoardAss);
-  rtdIc12->setStartUpImmediately();
+#endif  // OBSW_ADD_RTD_DEVICES == 1
-  rtdIc13->setStartUpImmediately();
-  rtdIc14->setStartUpImmediately();
-  rtdIc15->setStartUpImmediately();
-
-  rtdIc0->setInstantNormal(true);
-  rtdIc1->setInstantNormal(true);
-  rtdIc2->setInstantNormal(true);
-  rtdIc3->setInstantNormal(true);
-  rtdIc4->setInstantNormal(true);
-  rtdIc5->setInstantNormal(true);
-  rtdIc6->setInstantNormal(true);
-  rtdIc7->setInstantNormal(true);
-  rtdIc8->setInstantNormal(true);
-  rtdIc9->setInstantNormal(true);
-  rtdIc10->setInstantNormal(true);
-  rtdIc11->setInstantNormal(true);
-  rtdIc12->setInstantNormal(true);
-  rtdIc13->setInstantNormal(true);
-  rtdIc14->setInstantNormal(true);
-  rtdIc15->setInstantNormal(true);
-#endif
-
-  static_cast<void>(rtdIc0);
-  static_cast<void>(rtdIc1);
-  static_cast<void>(rtdIc2);
-  static_cast<void>(rtdIc3);
-  static_cast<void>(rtdIc4);
-  static_cast<void>(rtdIc5);
-  static_cast<void>(rtdIc6);
-  static_cast<void>(rtdIc7);
-  static_cast<void>(rtdIc8);
-  static_cast<void>(rtdIc9);
-  static_cast<void>(rtdIc10);
-  static_cast<void>(rtdIc11);
-  static_cast<void>(rtdIc12);
-  static_cast<void>(rtdIc13);
-  static_cast<void>(rtdIc14);
-  static_cast<void>(rtdIc15);
-#endif
 }
 
 void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {

bsp_q7s/core/ObjectFactory.h

@@ -25,7 +25,7 @@ void createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
 void createHeaterComponents();
 void createSolarArrayDeploymentComponents();
 void createSyrlinksComponents();
-void createRtdComponents(LinuxLibgpioIF* gpioComIF);
+void createRtdComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher);
 void createReactionWheelComponents(LinuxLibgpioIF* gpioComIF);
 void createCcsdsComponents(LinuxLibgpioIF* gpioComIF);
 void createTestComponents(LinuxLibgpioIF* gpioComIF);