removed te0720 code form q7s files

bsp_q7s/core/InitMission.cpp

@@ -55,14 +55,12 @@ void initmission::initTasks() {
   void (*missedDeadlineFunc)(void) = nullptr;
 #endif
 
-#if BOARD_TE0720 == 0
   PeriodicTaskIF* coreController = factory->createPeriodicTask(
       "CORE_CTRL", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.4, missedDeadlineFunc);
   result = coreController->addComponent(objects::CORE_CONTROLLER);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("CORE_CTRL", objects::CORE_CONTROLLER);
   }
-#endif
 
   /* TMTC Distribution */
   PeriodicTaskIF* tmTcDistributor = factory->createPeriodicTask(
@@ -140,7 +138,6 @@ void initmission::initTasks() {
     initmission::printAddObjectError("TCS_BOARD_ASS", objects::TCS_BOARD_ASS);
   }
 
-#if BOARD_TE0720 == 0
   // FS task, task interval does not matter because it runs in permanent loop, priority low
   // because it is a non-essential background task
   PeriodicTaskIF* fsTask = factory->createPeriodicTask(
@@ -159,8 +156,6 @@ void initmission::initTasks() {
   }
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
-#endif /* BOARD_TE0720 */
-
 #if OBSW_ADD_PLOC_MPSOC == 1
   PeriodicTaskIF* mpsocHelperTask = factory->createPeriodicTask(
       "PLOC_MPSOC_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
@@ -212,9 +207,7 @@ void initmission::initTasks() {
   pdecHandlerTask->startTask();
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
 
-#if BOARD_TE0720 == 0
   coreController->startTask();
-#endif
 
   taskStarter(pstTasks, "PST task vector");
   taskStarter(pusTasks, "PUS task vector");
@@ -226,12 +219,10 @@ void initmission::initTasks() {
   ptmeTestTask->startTask();
 #endif
 
-#if BOARD_TE0720 == 0
   fsTask->startTask();
 #if OBSW_ADD_STAR_TRACKER == 1
   strHelperTask > startTask();
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
-#endif
 
 #if OBSW_ADD_ACS_HANDLERS == 1
   acsTask->startTask();
@@ -245,7 +236,6 @@ void initmission::createPstTasks(TaskFactory& factory,
                                  TaskDeadlineMissedFunction missedDeadlineFunc,
                                  std::vector<PeriodicTaskIF*>& taskVec) {
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
-#if BOARD_TE0720 == 0
   /* Polling Sequence Table Default */
 #if OBSW_ADD_SPI_TEST_CODE == 0
   FixedTimeslotTaskIF* spiPst = factory.createFixedTimeslotTask(
@@ -311,15 +301,6 @@ void initmission::createPstTasks(TaskFactory& factory,
     }
   }
   taskVec.push_back(gomSpacePstTask);
-#else  /* BOARD_TE7020 == 0 */
-  FixedTimeslotTaskIF* pollingSequenceTaskTE0720 = factory.createFixedTimeslotTask(
-      "PST_TASK_TE0720", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE * 8, 3.0, missedDeadlineFunc);
-  result = pst::pollingSequenceTE0720(pollingSequenceTaskTE0720);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "InitMission::initTasks: Creating TE0720 PST failed!" << std::endl;
-  }
-  taskVec.push_back(pollingSequenceTaskTE0720);
-#endif /* BOARD_TE7020 == 1 */
 }
 
 void initmission::createPusTasks(TaskFactory& factory,
@@ -426,12 +407,6 @@ void initmission::createTestTasks(TaskFactory& factory,
   }
 #endif
 
-#if BOARD_TE0720 == 1 && OBSW_TEST_LIBGPIOD == 1
-  result = testTask->addComponent(objects::LIBGPIOD_TEST);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    initmission::printAddObjectError("GPIOD_TEST", objects::LIBGPIOD_TEST);
-  }
-#endif /* BOARD_TE0720 == 1 && OBSW_TEST_LIBGPIOD == 1 */
   taskVec.push_back(testTask);
 
 #endif  // OBSW_ADD_TEST_TASK == 1 && OBSW_ADD_TEST_CODE == 1

bsp_q7s/core/ObjectFactory.cpp

@@ -135,7 +135,6 @@ void ObjectFactory::produce(void* args) {
   PowerSwitchIF* pwrSwitcher = nullptr;
   createCommunicationInterfaces(&gpioComIF, &uartComIF, &spiComIF, &i2cComIF);
   createTmpComponents();
-#if BOARD_TE0720 == 0
   new CoreController(objects::CORE_CONTROLLER);
 
   gpioCallbacks::disableAllDecoder();
@@ -215,8 +214,6 @@ void ObjectFactory::produce(void* args) {
 
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
-#endif /* TE7020 == 0 */
-
 #if OBSW_USE_CCSDS_IP_CORE == 1
   createCcsdsComponents(gpioComIF);
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
@@ -231,17 +228,10 @@ void ObjectFactory::produce(void* args) {
 }
 
 void ObjectFactory::createTmpComponents() {
-#if BOARD_TE0720 == 1
-  I2cCookie* i2cCookieTmp1075tcs1 =
-      new I2cCookie(addresses::TMP1075_TCS_1, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
-  I2cCookie* i2cCookieTmp1075tcs2 =
-      new I2cCookie(addresses::TMP1075_TCS_2, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
-#else
   I2cCookie* i2cCookieTmp1075tcs1 =
       new I2cCookie(addresses::TMP1075_TCS_1, TMP1075::MAX_REPLY_LENGTH, q7s::I2C_DEFAULT_DEV);
   I2cCookie* i2cCookieTmp1075tcs2 =
       new I2cCookie(addresses::TMP1075_TCS_2, TMP1075::MAX_REPLY_LENGTH, q7s::I2C_DEFAULT_DEV);
-#endif
 
   /* Temperature sensors */
   Tmp1075Handler* tmp1075Handler_1 =
@@ -266,10 +256,8 @@ void ObjectFactory::createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, Ua
   *uartComIF = new UartComIF(objects::UART_COM_IF);
   *spiComIF = new SpiComIF(objects::SPI_COM_IF, *gpioComIF);
 
-#if BOARD_TE0720 == 0
   /* Adding gpios for chip select decoding to the gpioComIf */
   gpioCallbacks::initSpiCsDecoder(*gpioComIF);
-#endif
 }
 
 void ObjectFactory::createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF** pwrSwitcher) {
@@ -1124,7 +1112,6 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
   new PdecHandler(objects::PDEC_HANDLER, objects::CCSDS_HANDLER, gpioComIF, gpioIds::PDEC_RESET,
                   q7s::UIO_PDEC_CONFIG_MEMORY, q7s::UIO_PDEC_RAM, q7s::UIO_PDEC_REGISTERS);
 
-#if BOARD_TE0720 == 0
   GpioCookie* gpioRS485Chip = new GpioCookie;
   gpio = new GpiodRegularByLineName(q7s::gpioNames::RS485_EN_TX_CLOCK, "RS485 Transceiver",
                                     Direction::OUT, Levels::LOW);
@@ -1142,7 +1129,6 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
   gpioRS485Chip->addGpio(gpioIds::RS485_EN_RX_DATA, gpio);
 
   gpioComIF->addGpios(gpioRS485Chip);
-#endif /* BOARD_TE0720 == 0 */
 }
 
 void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF) {
@@ -1207,9 +1193,7 @@ void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF*
 }
 
 void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {
-#if BOARD_TE0720 == 0
   new Q7STestTask(objects::TEST_TASK);
-#endif
 #if OBSW_ADD_SPI_TEST_CODE == 1
   new SpiTestClass(objects::SPI_TEST, gpioComIF);
 #endif

bsp_q7s/core/obsw.cpp

@@ -15,7 +15,7 @@ static int OBSW_ALREADY_RUNNING = -2;
 int obsw::obsw() {
   using namespace fsfw;
   std::cout << "-- EIVE OBSW --" << std::endl;
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
   std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
 #else
   std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;

bsp_te0720_1cfa/ObjectFactory.cpp

@@ -130,4 +130,17 @@ void ObjectFactory::produce(void* args) {
       objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF, plocSupervisorCookie);
   plocSupervisor->setStartUpImmediately();
 #endif
+
+I2cCookie* i2cCookieTmp1075tcs1 =
+  new I2cCookie(addresses::TMP1075_TCS_1, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
+I2cCookie* i2cCookieTmp1075tcs2 =
+  new I2cCookie(addresses::TMP1075_TCS_2, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
+
+/* Temperature sensors */
+Tmp1075Handler* tmp1075Handler_1 =
+    new Tmp1075Handler(objects::TMP1075_HANDLER_1, objects::I2C_COM_IF, i2cCookieTmp1075tcs1);
+(void)tmp1075Handler_1;
+Tmp1075Handler* tmp1075Handler_2 =
+    new Tmp1075Handler(objects::TMP1075_HANDLER_2, objects::I2C_COM_IF, i2cCookieTmp1075tcs2);
+(void)tmp1075Handler_2;
 }

common/config/devices/powerSwitcherList.h

@@ -39,7 +39,7 @@ static const uint8_t OFF = 0;
 const std::array<uint8_t, NUMBER_OF_SWITCHES> INIT_SWITCH_STATES = {
     // PDU 1
 // Because the TE0720 is not connected to the PCDU, this switch is always on
-#if BOARD_TE0720 == 1
+#ifdef TE0720_1CFA
     ON,
 #else
     OFF,

linux/devices/ploc/PlocSupervisorHandler.cpp

@@ -31,7 +31,7 @@ ReturnValue_t PlocSupervisorHandler::initialize() {
         sif::warning << "PlocSupervisorHandler::initialize: Invalid uart com if" << std::endl;
         return ObjectManagerIF::CHILD_INIT_FAILED;
     }
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
     sdcMan = SdCardManager::instance();
 #endif /* BOARD_TE0720 == 0 */
     return result;
@@ -1487,7 +1487,7 @@ ReturnValue_t PlocSupervisorHandler::createMramDumpFile() {
 
     std::string filename = "mram-dump--" + timeStamp + ".bin";
 
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
     std::string currentMountPrefix = sdcMan->getCurrentMountPrefix();
 #else
     std::string currentMountPrefix("/mnt/sd0");

linux/devices/ploc/PlocSupervisorHandler.h

@@ -123,7 +123,7 @@ private:
     /** This buffer is used to concatenate space packets received in two different read steps */
     uint8_t spacePacketBuffer[PLOC_SPV::MAX_PACKET_SIZE];
 
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
     SdCardManager* sdcMan = nullptr;
 #endif /* BOARD_TE0720 == 0 */
 

linux/devices/ploc/PlocUpdater.cpp

@@ -16,7 +16,7 @@ PlocUpdater::PlocUpdater(object_id_t objectId)
 PlocUpdater::~PlocUpdater() {}
 
 ReturnValue_t PlocUpdater::initialize() {
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
   sdcMan = SdCardManager::instance();
 #endif
   ReturnValue_t result = SystemObject::initialize();
@@ -163,7 +163,7 @@ ReturnValue_t PlocUpdater::getImageLocation(const uint8_t* data, size_t size) {
     return result;
   }
 
-#if BOARD_TE0720 == 0
+#ifdef XIPHOS_Q7S
   // Check if file is stored on SD card and if associated SD card is mounted
   if (std::string(reinterpret_cast<const char*>(data), SD_PREFIX_LENGTH) ==
       std::string(SdCardManager::SD_0_MOUNT_POINT)) {

linux/devices/ploc/PlocUpdater.h

@@ -105,7 +105,7 @@ class PlocUpdater : public SystemObject,
 
   MessageQueueIF* commandQueue = nullptr;
 
-#if BOARD_TE0720 == 0
+#ifdef XIPHOS_Q7S
   SdCardManager* sdcMan = nullptr;
 #endif
   CommandActionHelper commandActionHelper;

linux/fsfwconfig/OBSWConfig.h.in

@@ -18,9 +18,7 @@
 /* These defines should be disabled for mission code but are useful for
 debugging. */
 #define OBSW_VERBOSE_LEVEL                          1
-
+                             
-//! Board defines
-#define BOARD_TE0720                                0                                   
 #define Q7S_EM                                      0
 
 /*******************************************************************/

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -592,68 +592,3 @@ ReturnValue_t pst::pstTest(FixedTimeslotTaskIF *thisSequence) {
   }
   return HasReturnvaluesIF::RETURN_OK;
 }
-
-#if BOARD_TE0720 == 1
-ReturnValue_t pst::pollingSequenceTE0720(FixedTimeslotTaskIF *thisSequence) {
-  uint32_t length = thisSequence->getPeriodMs();
-
-#if OBSW_ADD_PLOC_MPSOC == 1
-    thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-    thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-    thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.4, DeviceHandlerIF::GET_WRITE);
-    thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.6, DeviceHandlerIF::SEND_READ);
-    thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ);
-#endif
-
-#if OBSW_TEST_RAD_SENSOR == 1
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.8, DeviceHandlerIF::GET_READ);
-#endif
-
-#if OBSW_TEST_SUS == 1
-  /* Write setup */
-  thisSequence->addSlot(objects::SUS_1, length * 0.901, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::SUS_1, length * 0.902, SusHandler::FIRST_WRITE);
-  thisSequence->addSlot(objects::SUS_1, length * 0.903, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::SUS_1, length * 0.904, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::SUS_1, length * 0.905, DeviceHandlerIF::GET_READ);
-
-  /* Start conversion*/
-  thisSequence->addSlot(objects::SUS_1, length * 0.906, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::SUS_1, length * 0.907, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::SUS_1, length * 0.908, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::SUS_1, length * 0.909, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::SUS_1, length * 0.91, DeviceHandlerIF::GET_READ);
-
-  /* Read conversions */
-  thisSequence->addSlot(objects::SUS_1, length * 0.911, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::SUS_1, length * 0.912, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::SUS_1, length * 0.913, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::SUS_1, length * 0.914, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::SUS_1, length * 0.915, DeviceHandlerIF::GET_READ);
-#endif
-
-#if OBSW_ADD_PLOC_SUPERVISOR == 1
-  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.2,
-                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.7, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ);
-#endif
-
-  thisSequence->addSlot(objects::PLOC_UPDATER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::PLOC_MEMORY_DUMPER, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-
-  if (thisSequence->checkSequence() != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "Initialization of TE0720 PST failed" << std::endl;
-    return HasReturnvaluesIF::RETURN_FAILED;
-  }
-  return HasReturnvaluesIF::RETURN_OK;
-}
-#endif /* BOARD_TE0720 == 1 */

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h

@@ -54,14 +54,6 @@ ReturnValue_t pstI2c(FixedTimeslotTaskIF* thisSequence);
  * @return
  */
 ReturnValue_t pstTest(FixedTimeslotTaskIF* thisSequence);
-
-#if BOARD_TE0720 == 1
-/**
- * @brief   This polling sequence will be created when the software is compiled for the TE0720.
- */
-ReturnValue_t pollingSequenceTE0720(FixedTimeslotTaskIF* thisSequence);
-#endif
-
 }  // namespace pst
 
 #endif /* POLLINGSEQUENCEINIT_H_ */

linux/obc/PdecHandler.h

@@ -153,7 +153,7 @@ class PdecHandler : public SystemObject,
   static const uint32_t PDEC_SLEN_OFFSET = 0xA26;
   static const uint32_t PDEC_MON_OFFSET = 0xA27;
 
-#if BOARD_TE0720 == 1
+#ifdef TE0720_1CFA
   static const int CONFIG_MEMORY_MAP_SIZE = 0x400;
   static const int RAM_MAP_SIZE = 0x4000;
   static const int REGISTER_MAP_SIZE = 0x10000;
@@ -169,7 +169,7 @@ class PdecHandler : public SystemObject,
   static const size_t MAX_TC_SEGMENT_SIZE = 1017;
   static const uint8_t MAP_ID_MASK = 0x3F;
 
-#if BOARD_TE0720 == 1
+#ifdef TE0720_1CFA
   static const uint32_t PHYSICAL_RAM_BASE_ADDRESS = 0x32000000;
 #else
   static const uint32_t PHYSICAL_RAM_BASE_ADDRESS = 0x26000000;

mission/devices/PCDUHandler.cpp

@@ -419,7 +419,7 @@ ReturnValue_t PCDUHandler::initializeLocalDataPool(localpool::DataPool& localDat
       new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8]}));
   localDataPoolMap.emplace(P60System::PDU2_OUT_EN_RW,
                            new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH2_RW_5V]}));
-#if BOARD_TE0720 == 1
+#ifdef TE0720_1CFA
   localDataPoolMap.emplace(P60System::PDU2_OUT_EN_TCS_BOARD_HEATER_IN, new PoolEntry<uint8_t>({1}));
 #else
   localDataPoolMap.emplace(

mission/tmtc/CCSDSHandler.cpp

@@ -313,7 +313,7 @@ void CCSDSHandler::enableTransmit() {
     return;
   }
   transmitterCountdown.setTimeout(TRANSMITTER_TIMEOUT);
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
   gpioIF->pullHigh(enTxClock);
   gpioIF->pullHigh(enTxData);
 #endif /* BOARD_TE0720 == 0 */
@@ -332,7 +332,7 @@ void CCSDSHandler::checkTxTimer() {
 }
 
 void CCSDSHandler::disableTransmit() {
-#if BOARD_TE0720 == 0
+#ifdef TE0720_1CFA
   gpioIF->pullLow(enTxClock);
   gpioIF->pullLow(enTxData);
 #endif /* BOARD_TE0720 == 0 */