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

IMTQ: Lower Integration Time #552

Merged
muellerr merged 9 commits from imtq_lower_integration_time into develop 2023-04-03 15:43:31 +02:00
Conversation 0 Commits 9 Files Changed 10 +141 -54
11 changed files with 141 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8585114041 - Show all commits

2
mission/acs/ImtqHandler.cpp
View File

@@ -196,7 +196,7 @@ ReturnValue_t ImtqHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
} }
ReturnValue_t ImtqHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) { ReturnValue_t ImtqHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
if (internalState == InternalState::STARTUP) { if (internalState == InternalState::STARTUP or internalState == InternalState::SHUTDOWN) {
*id = imtq::cmdIds::REQUEST; *id = imtq::cmdIds::REQUEST;
return buildCommandFromCommand(*id, nullptr, 0); return buildCommandFromCommand(*id, nullptr, 0);
} }

2
mission/controller/ThermalController.cpp
View File

@@ -129,7 +129,7 @@ void ThermalController::performControlOperation() {
hpaLimits.opUpperLimit = 0; hpaLimits.opUpperLimit = 0;
hpaLimits.nopUpperLimit = 0; hpaLimits.nopUpperLimit = 0;
#endif #endif
if(changedLimits) { if (changedLimits) {
sif::debug << "ThermalController: changing limits" << std::endl; // TODO: rausschmeissen sif::debug << "ThermalController: changing limits" << std::endl; // TODO: rausschmeissen
} }
} }