diff --git a/bsp_q7s/OBSWConfig.h.in b/bsp_q7s/OBSWConfig.h.in index b60472d6..3502a7bb 100644 --- a/bsp_q7s/OBSWConfig.h.in +++ b/bsp_q7s/OBSWConfig.h.in @@ -43,7 +43,9 @@ #define OBSW_ADD_PL_PCDU @OBSW_ADD_PL_PCDU@ #define OBSW_ADD_SYRLINKS @OBSW_ADD_SYRLINKS@ #define OBSW_ADD_CCSDS_IP_CORES @OBSW_ADD_CCSDS_IP_CORES@ +// Only relevant for EM for TCS tests. #define OBSW_ADD_THERMAL_TEMP_INSERTER @OBSW_ADD_THERMAL_TEMP_INSERTER@ + // Set to 1 if all telemetry should be sent to the PTME IP Core #define OBSW_TM_TO_PTME @OBSW_TM_TO_PTME@ // Set to 1 if telecommands are received via the PDEC IP Core diff --git a/dummies/TemperatureSensorInserter.cpp b/dummies/TemperatureSensorInserter.cpp index 057f1704..b6f46fb8 100644 --- a/dummies/TemperatureSensorInserter.cpp +++ b/dummies/TemperatureSensorInserter.cpp @@ -15,7 +15,7 @@ TemperatureSensorInserter::TemperatureSensorInserter(object_id_t objectId, tmp1075DummyMap(std::move(tempTmpSensorDummies_)) {} ReturnValue_t TemperatureSensorInserter::initialize() { - testCase = TestCase::COOL_STR; + testCase = TestCase::COLD_STR_CONSECUTIVE; return returnvalue::OK; } @@ -35,7 +35,7 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { case (TestCase::NONE): { break; } - case (TestCase::COOL_SYRLINKS): { + case (TestCase::COLD_SYRLINKS): { // TODO: How do I insert this? // Does not work on EM, where a real syrlinks device is connected. if (cycles == 15) { @@ -52,7 +52,7 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { } break; } - case (TestCase::COOL_HPA): { + case (TestCase::COLD_HPA): { if (cycles == 15) { sif::debug << "Setting cold HPA temperature" << std::endl; max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-60, true); @@ -63,7 +63,7 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { } break; } - case (TestCase::COOL_MGT): { + case (TestCase::COLD_MGT): { if (cycles == 15) { sif::debug << "Setting cold MGT temperature" << std::endl; max31865DummyMap[objects::RTD_15_IC18_IMTQ]->setTemperature(-60, true); @@ -74,7 +74,8 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { } break; } - case(TestCase::COOL_STR): { + case (TestCase::COLD_STR): + case (TestCase::COLD_STR_CONSECUTIVE): { if (cycles == 15) { sif::debug << "Setting cold STR temperature" << std::endl; max31865DummyMap[objects::RTD_4_IC7_STARTRACKER]->setTemperature(-40, true); @@ -83,8 +84,17 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { sif::debug << "Setting STR temperature back to normal" << std::endl; max31865DummyMap[objects::RTD_4_IC7_STARTRACKER]->setTemperature(0, true); } + if (testCase == TestCase::COLD_STR_CONSECUTIVE) { + if (cycles == 45) { + sif::debug << "Setting cold STR temperature again" << std::endl; + max31865DummyMap[objects::RTD_4_IC7_STARTRACKER]->setTemperature(-40, true); + } + if (cycles == 60) { + sif::debug << "Setting STR temperature back to normal again" << std::endl; + max31865DummyMap[objects::RTD_4_IC7_STARTRACKER]->setTemperature(0, true); + } + } break; - } } cycles++; diff --git a/dummies/TemperatureSensorInserter.h b/dummies/TemperatureSensorInserter.h index d7d2f1ab..675bcd91 100644 --- a/dummies/TemperatureSensorInserter.h +++ b/dummies/TemperatureSensorInserter.h @@ -24,7 +24,14 @@ class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject Max31865DummyMap max31865DummyMap; Tmp1075DummyMap tmp1075DummyMap; - enum TestCase { NONE = 0, COOL_SYRLINKS = 1, COOL_HPA = 2, COOL_MGT = 3, COOL_STR = 4 }; + enum TestCase { + NONE = 0, + COLD_SYRLINKS = 1, + COLD_HPA = 2, + COLD_MGT = 3, + COLD_STR = 4, + COLD_STR_CONSECUTIVE = 5, + }; int iteration = 0; uint32_t cycles = 0; bool tempsWereInitialized = false; diff --git a/dummies/helperFactory.cpp b/dummies/helperFactory.cpp index 6d29b47f..54ca3e89 100644 --- a/dummies/helperFactory.cpp +++ b/dummies/helperFactory.cpp @@ -194,9 +194,10 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio objects::TMP1075_HANDLER_PLPCDU_0, new Tmp1075Dummy(objects::TMP1075_HANDLER_PLPCDU_0, objects::DUMMY_COM_IF, comCookieDummy)); // damaged. -// tmpSensorDummies.emplace( -// objects::TMP1075_HANDLER_PLPCDU_1, -// new Tmp1075Dummy(objects::TMP1075_HANDLER_PLPCDU_1, objects::DUMMY_COM_IF, comCookieDummy)); + // tmpSensorDummies.emplace( + // objects::TMP1075_HANDLER_PLPCDU_1, + // new Tmp1075Dummy(objects::TMP1075_HANDLER_PLPCDU_1, objects::DUMMY_COM_IF, + // comCookieDummy)); tmpSensorDummies.emplace( objects::TMP1075_HANDLER_IF_BOARD, new Tmp1075Dummy(objects::TMP1075_HANDLER_IF_BOARD, objects::DUMMY_COM_IF, comCookieDummy));