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

STR time #611

Merged
muellerr merged 25 commits from str_set_time into main 2023-07-14 12:43:21 +02:00
Conversation 0 Commits 25 Files Changed 8 +1 -2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fec85ffa6c - Show all commits

3
mission/acs/str/StarTrackerHandler.cpp
View File

@ -786,13 +786,11 @@ void StarTrackerHandler::doOnTransition(Submode_t subModeFrom) {
void StarTrackerHandler::doNormalTransition(Mode_t modeFrom, Submode_t subModeFrom) { void StarTrackerHandler::doNormalTransition(Mode_t modeFrom, Submode_t subModeFrom) {
using namespace startracker; using namespace startracker;
if (subModeFrom == SUBMODE_FIRMWARE) { if (subModeFrom == SUBMODE_FIRMWARE) {
solutionSet.setReportingEnabled(true);
setMode(MODE_NORMAL); setMode(MODE_NORMAL);
} else if (subModeFrom == SUBMODE_BOOTLOADER) { } else if (subModeFrom == SUBMODE_BOOTLOADER) {
bootFirmware(MODE_NORMAL); bootFirmware(MODE_NORMAL);
} else if (modeFrom == MODE_NORMAL && subModeFrom == SUBMODE_NONE) { } else if (modeFrom == MODE_NORMAL && subModeFrom == SUBMODE_NONE) {
// Device handler already in mode normal // Device handler already in mode normal
solutionSet.setReportingEnabled(true);
setMode(MODE_NORMAL); setMode(MODE_NORMAL);
} }
} }
@ -814,6 +812,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
} else { } else {
setMode(toMode, startracker::SUBMODE_FIRMWARE); setMode(toMode, startracker::SUBMODE_FIRMWARE);
} }
solutionSet.setReportingEnabled(true);
sif::info << "STR: Firmware boot success" << std::endl; sif::info << "STR: Firmware boot success" << std::endl;
internalState = InternalState::IDLE; internalState = InternalState::IDLE;
startupState = StartupState::IDLE; startupState = StartupState::IDLE;