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

fix this some other time
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
EIVE/-/pipeline/pr-main Build queued...
Details

Browse Source
This commit is contained in:
Robin Müller 2023-04-16 11:35:30 +02:00
parent 67351d5ada
commit 3aad452357
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,7 @@ ReturnValue_t StarTrackerHandler::buildTransitionDeviceCommand(DeviceCommandId_t
*id = startracker::REQ_VERSION; *id = startracker::REQ_VERSION;
return buildCommandFromCommand(*id, nullptr, 0); return buildCommandFromCommand(*id, nullptr, 0);
} }
case(FwBootState::SET_TIME): { case (FwBootState::SET_TIME): {
bootState = FwBootState::WAIT_FOR_EXECUTION; bootState = FwBootState::WAIT_FOR_EXECUTION;
*id = startracker::SET_TIME; *id = startracker::SET_TIME;
return buildCommandFromCommand(*id, nullptr, 0); return buildCommandFromCommand(*id, nullptr, 0);
@ -446,7 +446,7 @@ ReturnValue_t StarTrackerHandler::buildCommandFromCommand(DeviceCommandId_t devi
preparePingRequest(); preparePingRequest();
return returnvalue::OK; return returnvalue::OK;
} }
case(startracker::SET_TIME): { case (startracker::SET_TIME): {
SetTimeActionRequest setTimeRequest; SetTimeActionRequest setTimeRequest;
time_t epoch; time_t epoch;
timeval tv; timeval tv;
@ -1366,7 +1366,7 @@ ReturnValue_t StarTrackerHandler::scanForActionReply(uint8_t replyId, DeviceComm
*foundId = startracker::UPLOAD_IMAGE; *foundId = startracker::UPLOAD_IMAGE;
break; break;
} }
case(ARC_ACTION_REQ_SETTIME_ID): { case (ARC_ACTION_REQ_SETTIME_ID): {
*foundId = startracker::SET_TIME; *foundId = startracker::SET_TIME;
break; break;
} }
@ -1982,7 +1982,7 @@ ReturnValue_t StarTrackerHandler::checkProgram() {
startupState = StartupState::BOOT_BOOTLOADER; startupState = StartupState::BOOT_BOOTLOADER;
} }
if (bootState == FwBootState::VERIFY_BOOT) { if (bootState == FwBootState::VERIFY_BOOT) {
bootState = FwBootState::LOGLEVEL; bootState = FwBootState::SET_TIME;
} else if (internalState == InternalState::BOOTLOADER_CHECK) { } else if (internalState == InternalState::BOOTLOADER_CHECK) {
triggerEvent(BOOTING_BOOTLOADER_FAILED_EVENT); triggerEvent(BOOTING_BOOTLOADER_FAILED_EVENT);
internalState = InternalState::FAILED_BOOTLOADER_BOOT; internalState = InternalState::FAILED_BOOTLOADER_BOOT;
@ -2060,16 +2060,16 @@ ReturnValue_t StarTrackerHandler::handleActionReplySet(const uint8_t* rawFrame,
} }
void StarTrackerHandler::handleStartup(uint8_t tmType, uint8_t parameterId) { void StarTrackerHandler::handleStartup(uint8_t tmType, uint8_t parameterId) {
switch(tmType) { switch (tmType) {
case(TMTC_ACTIONREPLY): { case (TMTC_ACTIONREPLY): {
case(ARC_ACTION_REQ_SETTIME_ID): { case (ARC_ACTION_REQ_SETTIME_ID): {
bootState = FwBootState::LOGLEVEL; bootState = FwBootState::LOGLEVEL;
return; return;
}
default: {
break;
}
} }
default: {
break;
}
}
} }
switch (parameterId) { switch (parameterId) {
case (startracker::ID::LOG_LEVEL): { case (startracker::ID::LOG_LEVEL): {