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

some code fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-04-05 15:11:37 +02:00
parent 0ade2ae0ee
commit 600921e3a0
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,7 +277,7 @@ void StarTrackerHandler::performOperationHook() {
} }
} }
Submode_t StarTrackerHandler::getInitialSubmode() { return SUBMODE_BOOTLOADER; } Submode_t StarTrackerHandler::getInitialSubmode() { return startracker::SUBMODE_BOOTLOADER; }
ReturnValue_t StarTrackerHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) { ReturnValue_t StarTrackerHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
if (strHelperHandlingSpecialRequest) { if (strHelperHandlingSpecialRequest) {
@ -705,7 +705,7 @@ ReturnValue_t StarTrackerHandler::isModeCombinationValid(Mode_t mode, Submode_t
return INVALID_SUBMODE; return INVALID_SUBMODE;
} }
case MODE_ON: case MODE_ON:
if (submode == SUBMODE_BOOTLOADER || submode == SUBMODE_FIRMWARE) { if (submode == startracker::SUBMODE_BOOTLOADER || submode == startracker::SUBMODE_FIRMWARE) {
return returnvalue::OK; return returnvalue::OK;
} else { } else {
return INVALID_SUBMODE; return INVALID_SUBMODE;
@ -736,6 +736,7 @@ void StarTrackerHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
} }
void StarTrackerHandler::doOnTransition(Submode_t subModeFrom) { void StarTrackerHandler::doOnTransition(Submode_t subModeFrom) {
using namespace startracker;
uint8_t dhbSubmode = getSubmode(); uint8_t dhbSubmode = getSubmode();
// We hide that the transition to submode firmware actually goes through the submode bootloader. // We hide that the transition to submode firmware actually goes through the submode bootloader.
// This is because the startracker always starts in bootloader mode but we want to allow direct // This is because the startracker always starts in bootloader mode but we want to allow direct
@ -762,6 +763,7 @@ 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;
if (subModeFrom == SUBMODE_FIRMWARE) { if (subModeFrom == SUBMODE_FIRMWARE) {
setMode(MODE_NORMAL); setMode(MODE_NORMAL);
} else if (subModeFrom == SUBMODE_BOOTLOADER) { } else if (subModeFrom == SUBMODE_BOOTLOADER) {
@ -787,7 +789,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
if (toMode == MODE_NORMAL) { if (toMode == MODE_NORMAL) {
setMode(toMode, 0); setMode(toMode, 0);
} else { } else {
setMode(toMode, SUBMODE_FIRMWARE); setMode(toMode, startracker::SUBMODE_FIRMWARE);
} }
sif::info << "STR: Firmware boot success" << std::endl; sif::info << "STR: Firmware boot success" << std::endl;
internalState = InternalState::IDLE; internalState = InternalState::IDLE;