Merge branch 'smaller-str-fix' into str_set_time
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
This commit is contained in:
commit
d3f3a3efd0
@ -89,7 +89,6 @@ void StarTrackerHandler::doStartUp() {
|
|||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
solutionSet.setReportingEnabled(true);
|
|
||||||
startupState = StartupState::DONE;
|
startupState = StartupState::DONE;
|
||||||
internalState = InternalState::IDLE;
|
internalState = InternalState::IDLE;
|
||||||
setMode(_MODE_TO_ON);
|
setMode(_MODE_TO_ON);
|
||||||
@ -809,11 +808,13 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user