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

v6.1.0-branch #750

Closed
muellerr wants to merge 117 commits from v6.1.0-branch into v6.0.0-branch
pull from: v6.1.0-branch
merge into: eive:v6.0.0-branch
Conversation 0 Commits 117 Files Changed 53 +12 -5
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce2755e161 - Show all commits

10
dummies/TemperatureSensorInserter.cpp
View File

@ -15,7 +15,7 @@ TemperatureSensorInserter::TemperatureSensorInserter(
tmp1075DummyMap(std::move(tempTmpSensorDummies_)) {} tmp1075DummyMap(std::move(tempTmpSensorDummies_)) {}
ReturnValue_t TemperatureSensorInserter::initialize() { ReturnValue_t TemperatureSensorInserter::initialize() {
testCase = TestCase::COLD_PLOC_STAYS_COLD; testCase = TestCase::COLD_CAMERA_STAYS_COLD;
return returnvalue::OK; return returnvalue::OK;
} }
@ -133,6 +133,14 @@ ReturnValue_t TemperatureSensorInserter::performOperation(uint8_t opCode) {
sif::debug << "Setting cold PLOC temperature" << std::endl; sif::debug << "Setting cold PLOC temperature" << std::endl;
max31865DummyMap[objects::RTD_0_IC3_PLOC_HEATSPREADER]->setTemperature(-40, true); max31865DummyMap[objects::RTD_0_IC3_PLOC_HEATSPREADER]->setTemperature(-40, true);
} }
break;
}
case (TestCase::COLD_CAMERA_STAYS_COLD): {
if (cycles == 15) {
sif::debug << "Setting cold PLOC temperature" << std::endl;
max31865DummyMap[objects::RTD_2_IC5_4K_CAMERA]->setTemperature(-40, true);
}
break;
} }
} }
cycles++; cycles++;

3
dummies/TemperatureSensorInserter.h
View File

@ -33,7 +33,8 @@ class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject
COLD_STR_CONSECUTIVE = 5, COLD_STR_CONSECUTIVE = 5,
COLD_CAMERA = 6, COLD_CAMERA = 6,
COLD_PLOC_CONSECUTIVE = 7, COLD_PLOC_CONSECUTIVE = 7,
COLD_PLOC_STAYS_COLD = 8 COLD_PLOC_STAYS_COLD = 8,
COLD_CAMERA_STAYS_COLD = 9
}; };
int iteration = 0; int iteration = 0;
uint32_t cycles = 0; uint32_t cycles = 0;

2
mission/controller/ThermalController.cpp
View File

@ -1798,8 +1798,6 @@ void ThermalController::heaterMaxDurationControl(const HeaterSwitchStates& curre
// The heater might still be one for some thermal components, so cross-check // The heater might still be one for some thermal components, so cross-check
// those components // those components
crossCheckHeaterStateOfComponentsWhenHeaterGoesOff(static_cast<heater::Switch>(i)); crossCheckHeaterStateOfComponentsWhenHeaterGoesOff(static_cast<heater::Switch>(i));
} else if (currentHeaterStates[i] == HeaterHandler::SwitchState::OFF) {
heaterStates[i].heaterOnPeriod.resetTimer();
} }
} }
} }

2
mission/controller/ThermalController.h
View File

@ -111,7 +111,7 @@ class ThermalController : public ExtendedControllerBase {
// 1 hour // 1 hour
static constexpr uint32_t DEFAULT_MAX_HEATER_ON_DURATION_MS = 60 * 60 * 1000; static constexpr uint32_t DEFAULT_MAX_HEATER_ON_DURATION_MS = 60 * 60 * 1000;
static constexpr uint32_t MAX_HEATER_ON_DURATIONS_MS[8] = {// PLOC PROC board static constexpr uint32_t MAX_HEATER_ON_DURATIONS_MS[8] = {// PLOC PROC board
60 * 1000, DEFAULT_MAX_HEATER_ON_DURATION_MS,
// PCDU PDU // PCDU PDU
DEFAULT_MAX_HEATER_ON_DURATION_MS, DEFAULT_MAX_HEATER_ON_DURATION_MS,
// ACS Board // ACS Board