diff --git a/dummies/TemperatureSensorInserter.cpp b/dummies/TemperatureSensorInserter.cpp index 9d97836e..609c7b1b 100644 --- a/dummies/TemperatureSensorInserter.cpp +++ b/dummies/TemperatureSensorInserter.cpp @@ -32,12 +32,25 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { tempsWereInitialized = true; } - //TDOD: -hpa mpa gleichzeitig - if (cycles == 10) { max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-100, true); max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(-100, true); + } + + if (cycles == 35){ + max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(0, true); + max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(0, true); + max31865DummyMap[objects::RTD_2_IC5_4K_CAMERA]->setTemperature(-100, true); + + + } + if (cycles == 60){ + max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-100, true); + max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(0, true); + + } + /* ReturnValue_t result = max31865PlocHeatspreaderSet.read(); if (result != returnvalue::OK) { diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 1ef24e9d..3d69f7d8 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -1360,12 +1360,12 @@ void ThermalController::performThermalModuleCtrl() { // ctrlPlocMissionBoard(); // ctrlPlocProcessingBoard(); // ctrlDac(); - ctrlCameraBody(); + ctrlCameraBody(); // ctrlDro(); // ctrlX8(); - // ctrlHpa(); + ctrlHpa(); // ctrlTx(); - // ctrlMpa(); + ctrlMpa(); // ctrlScexBoard(); // heaterTransitionControl(); } diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index fbae8c55..cfcaf96f 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -183,10 +183,10 @@ class ThermalController : public ExtendedControllerBase { TempLimits dacLimits = TempLimits(-65.0, -40.0, 113.0, 118.0, 150.0); TempLimits cameraLimits = TempLimits(-40.0, -30.0, 60.0, 65.0, 85.0); TempLimits droLimits = TempLimits(-40.0, -30.0, 75.0, 80.0, 90.0); - TempLimits x8Limits = TempLimits(-40.0, -30.0, -75.0, 80.0, 90.0); - TempLimits hpaLimits = TempLimits(-40.0, -30.0, -75.0, 80.0, 90.0); - TempLimits txLimits = TempLimits(-40.0, -30.0, -75.0, 80.0, 90.0); - TempLimits mpaLimits = TempLimits(-40.0, -30.0, -75.0, 80.0, 90.0); + TempLimits x8Limits = TempLimits(-40.0, -30.0, 75.0, 80.0, 90.0); + TempLimits hpaLimits = TempLimits(-40.0, -30.0, 75.0, 80.0, 90.0); + TempLimits txLimits = TempLimits(-40.0, -30.0, 75.0, 80.0, 90.0); + TempLimits mpaLimits = TempLimits(-40.0, -30.0, 75.0, 80.0, 90.0); TempLimits scexBoardLimits = TempLimits(-60.0, -40.0, 80.0, 85.0, 150.0); double sensorTemp = INVALID_TEMPERATURE;