introduced current program check
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
This commit is contained in:
parent
7adff2c9a8
commit
88a9f8f8de
@ -1145,6 +1145,8 @@ Password: raspberry
|
||||
To run the obsw perform the following steps:
|
||||
1. Build the cmake EGSE Configuration
|
||||
* the sysroots for the EGSE can be found [here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/egse&fileid=1190471)
|
||||
* toolchain for linux host can be downloaded from [here](https://github.com/Pro/raspi-toolchain)
|
||||
* toolchain for windows host from [here](https://gnutoolchains.com/raspberry/) (the raspios-buster-armhf toolchain is the right one for the EGSE)
|
||||
2. Disable the ser2net systemd service on the EGSE
|
||||
````sh
|
||||
$ sudo systemctl stop ser2net.service
|
||||
|
@ -1761,13 +1761,15 @@ ReturnValue_t StarTrackerHandler::prepareUploadCentroidCommand(const uint8_t* co
|
||||
result = j.getValue(startracker::UploadCentroidKeys::x_uncorrected, &req.x_uncorrected);
|
||||
if (result != RETURN_OK) {
|
||||
sif::warning << "StarTrackerHandler::prepareUploadCentroidCommand: The key "
|
||||
<< startracker::UploadCentroidKeys::x_uncorrected << " does not exist" << std::endl;
|
||||
<< startracker::UploadCentroidKeys::x_uncorrected << " does not exist"
|
||||
<< std::endl;
|
||||
return result;
|
||||
}
|
||||
result = j.getValue(startracker::UploadCentroidKeys::y_uncorrected, &req.y_uncorrected);
|
||||
if (result != RETURN_OK) {
|
||||
sif::warning << "StarTrackerHandler::prepareUploadCentroidCommand: The key "
|
||||
<< startracker::UploadCentroidKeys::y_uncorrected << " does not exist" << std::endl;
|
||||
<< startracker::UploadCentroidKeys::y_uncorrected << " does not exist"
|
||||
<< std::endl;
|
||||
return result;
|
||||
}
|
||||
result = j.getValue(startracker::UploadCentroidKeys::x_corrected, &req.x_corrected);
|
||||
@ -2272,11 +2274,10 @@ ReturnValue_t StarTrackerHandler::checkProgram() {
|
||||
currentProgram = startracker::Program::BOOTLOADER;
|
||||
if (startupState == StartupState::STARTUP_CHECK) {
|
||||
startupState = StartupState::BOOT;
|
||||
}
|
||||
else if (startupState == StartupState::FIRMWARE_CHECK) {
|
||||
} else if (startupState == StartupState::FIRMWARE_CHECK) {
|
||||
startupState = StartupState::FAILED_FIRMWARE_BOOT;
|
||||
}
|
||||
if (internalState == InternalState::CHECK_PROGRAM){
|
||||
if (internalState == InternalState::CHECK_PROGRAM) {
|
||||
// Firmware boot failed when trying to switch to normal mode
|
||||
internalState = InternalState::IDLE;
|
||||
sif::warning << "StarTrackerHandler::checkProgram: Failed to boot firmware when "
|
||||
@ -2425,7 +2426,7 @@ void StarTrackerHandler::handleStartup(const uint8_t* parameterId) {
|
||||
}
|
||||
|
||||
ReturnValue_t StarTrackerHandler::checkCommand(ActionId_t actionId) {
|
||||
switch(actionId) {
|
||||
switch (actionId) {
|
||||
case startracker::BOOT:
|
||||
if (currentProgram != startracker::Program::BOOTLOADER) {
|
||||
return STARTRACKER_ALREADY_BOOTED;
|
||||
|
@ -48,6 +48,9 @@ class StarTrackerHandler : public DeviceHandlerBase {
|
||||
|
||||
void performOperationHook() override;
|
||||
|
||||
static const Submode_t SUBMODE_BOOTLOADER = 0;
|
||||
static const Submode_t SUBMODE_FIRMWARE = 1;
|
||||
|
||||
protected:
|
||||
void doStartUp() override;
|
||||
void doShutDown() override;
|
||||
|
Loading…
Reference in New Issue
Block a user