eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

position heaterTransitionControl()
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Irini Kosmidou 2023-03-09 09:37:10 +01:00
parent 7a62624687
commit 131c508cae
2 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dummies/TemperatureSensorInserter.cpp
View File

@ -22,6 +22,7 @@ ReturnValue_t TemperatureSensorInserter::initialize() {
} }
ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) { ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) {
// TODO: deviceSensors
if (not tempsWereInitialized) { if (not tempsWereInitialized) {
for (auto& rtdDummy : max31865DummyMap) { for (auto& rtdDummy : max31865DummyMap) {
rtdDummy.second->setTemperature(10, true); rtdDummy.second->setTemperature(10, true);
@ -35,20 +36,16 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) {
if (cycles == 10) { if (cycles == 10) {
max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-100, true); max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-100, true);
max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(-100, true); max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(-100, true);
} }
if (cycles == 35){ if (cycles == 35) {
max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(0, true); max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(0, true);
max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(0, true); max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(0, true);
max31865DummyMap[objects::RTD_2_IC5_4K_CAMERA]->setTemperature(-100, true); max31865DummyMap[objects::RTD_2_IC5_4K_CAMERA]->setTemperature(-100, true);
} }
if (cycles == 60){ if (cycles == 60) {
max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-100, true); max31865DummyMap[objects::RTD_9_IC12_HPA]->setTemperature(-100, true);
max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(0, true); max31865DummyMap[objects::RTD_11_IC14_MPA]->setTemperature(0, true);
} }
/* /*

54
mission/controller/ThermalController.cpp
View File

@ -1168,7 +1168,7 @@ void ThermalController::ctrlPcduAcu() {
bool sensorTempAvailable = true; bool sensorTempAvailable = true;
if (deviceTemperatures.acu.value[0] != if (deviceTemperatures.acu.value[0] !=
INVALID_TEMPERATURE) { // TODO: war invalid aber Wert 0 stat 999 INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[0]; sensorTemp = deviceTemperatures.acu.value[0];
} else if (deviceTemperatures.acu.value[1] != INVALID_TEMPERATURE) { } else if (deviceTemperatures.acu.value[1] != INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[1]; sensorTemp = deviceTemperatures.acu.value[1];
@ -1344,30 +1344,30 @@ void ThermalController::ctrlScexBoard() {
} }
void ThermalController::performThermalModuleCtrl() { void ThermalController::performThermalModuleCtrl() {
// ctrlAcsBoard(); ctrlAcsBoard();
// ctrlMgt(); ctrlMgt();
// ctrlRw(); ctrlRw();
// ctrlStr(); ctrlStr();
// ctrlIfBoard(); ctrlIfBoard();
// ctrlTcsBoard(); ctrlTcsBoard();
// ctrlObc(); ctrlObc();
// ctrlObcIfBoard(); ctrlObcIfBoard();
// ctrlSBandTransceiver(); // ctrlSBandTransceiver();
// ctrlPcduP60Board(); ctrlPcduP60Board();
// ctrlPcduAcu(); // ctrlPcduAcu();
// ctrlPcduPdu(); ctrlPcduPdu();
// ctrlPlPcduBoard(); ctrlPlPcduBoard();
// ctrlPlocMissionBoard(); ctrlPlocMissionBoard();
// ctrlPlocProcessingBoard(); ctrlPlocProcessingBoard();
// ctrlDac(); ctrlDac();
ctrlCameraBody(); ctrlCameraBody();
// ctrlDro(); ctrlDro();
// ctrlX8(); ctrlX8();
ctrlHpa(); ctrlHpa();
// ctrlTx(); ctrlTx();
ctrlMpa(); ctrlMpa();
// ctrlScexBoard(); ctrlScexBoard();
// heaterTransitionControl(); heaterTransitionControl();
} }
void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr, void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
heater::Switchers redSwitchNr, heater::Switchers redSwitchNr,
@ -1385,7 +1385,6 @@ void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
} }
} }
} }
heaterTransitionControl();
resetSensorsArray(); resetSensorsArray();
} }
bool ThermalController::selectAndReadSensorTemp() { bool ThermalController::selectAndReadSensorTemp() {
@ -1439,7 +1438,7 @@ void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers
heaterStates[switchNr].switchTransition = true; heaterStates[switchNr].switchTransition = true;
thermalStates[thermalComponent].heating = true; thermalStates[thermalComponent].heating = true;
// TODO: EVENT; aber heaterHandler erstellt schon event // TODO: EVENT; aber heaterHandler erstellt schon event
}else{ } else {
thermalStates[thermalComponent].heating = false; thermalStates[thermalComponent].heating = false;
} }
@ -1479,6 +1478,7 @@ void ThermalController::resetSensorsArray() {
thermalComponent = NONE; thermalComponent = NONE;
} }
void ThermalController::heaterTransitionControl() { void ThermalController::heaterTransitionControl() {
// TODO: Test
for (unsigned i = 0; i < 7; i++) { for (unsigned i = 0; i < 7; i++) {
if (heaterStates[i].switchTransition) { if (heaterStates[i].switchTransition) {
if (heaterStates[i].heaterSwitchControlErrorCounter > 3) { if (heaterStates[i].heaterSwitchControlErrorCounter > 3) {