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

some further investigation
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-07-13 17:03:56 +02:00
parent 39022ce2f6
commit e9d4104f88
Signed by: muellerr
GPG Key ID: 407F9B00F858F270
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -16,6 +16,15 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [unreleased]
## Changed
- STR missed reply handling is now moved to DHB rather than the COM interface. The COM IF will
still trigger an event if a reply is taking too long.
- The FM and EM STR FDIR now have different maximum reply tresholds. This is because the
EM STR behaved odd and sometimes takes 3-4 seconds to respond to a reply, which must be
investigated further.
# [v6.1.0] 2023-07-13 # [v6.1.0] 2023-07-13
- `eive-tmtc`: v5.2.0 - `eive-tmtc`: v5.2.0

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

@ -794,13 +794,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);
} }
} }
@ -823,6 +821,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
setMode(toMode, startracker::SUBMODE_FIRMWARE); setMode(toMode, startracker::SUBMODE_FIRMWARE);
} }
sif::info << "STR: Firmware boot success" << std::endl; sif::info << "STR: Firmware boot success" << std::endl;
solutionSet.setReportingEnabled(true);
internalState = InternalState::IDLE; internalState = InternalState::IDLE;
startupState = StartupState::IDLE; startupState = StartupState::IDLE;
break; break;