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

Dual Lane Boards: Allow Side Switches #412

Merged
muellerr merged 6 commits from feature_allow_side_switch into develop 2023-03-24 21:10:56 +01:00
Conversation 0 Commits 6 Files Changed 10 +17 -14
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36f820a07a - Show all commits

1
mission/devices/SusHandler.h
View File

@ -3,6 +3,7 @@
#include <eive/eventSubsystemIds.h> #include <eive/eventSubsystemIds.h>
#include <eive/resultClassIds.h> #include <eive/resultClassIds.h>
#include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "fsfw/globalfunctions/PeriodicOperationDivider.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
#include "mission/devices/devicedefinitions/acsPolling.h" #include "mission/devices/devicedefinitions/acsPolling.h"

7
mission/system/objects/DualLaneAssemblyBase.cpp
View File

@ -34,7 +34,12 @@ void DualLaneAssemblyBase::startTransition(Mode_t mode, Submode_t submode) {
// doStartTransition(mode, submode); // doStartTransition(mode, submode);
using namespace duallane; using namespace duallane;
pwrStateMachine.reset(); pwrStateMachine.reset();
if (mode != MODE_OFF) { bool pwrStateMachineToOff = false;
if (mode == MODE_OFF or
(this->submode == duallane::Submodes::DUAL_MODE and submode != Submodes::DUAL_MODE)) {
pwrStateMachineToOff = true;
}
if (not pwrStateMachineToOff) {
// If anything other than MODE_OFF is commanded, perform power state machine first // If anything other than MODE_OFF is commanded, perform power state machine first
// Cache the target modes, required by power state machine // Cache the target modes, required by power state machine
pwrStateMachine.start(mode, submode); pwrStateMachine.start(mode, submode);

7
mission/system/objects/DualLaneAssemblyBase.h
View File

@ -31,13 +31,10 @@ class DualLaneAssemblyBase : public AssemblyBase, public ConfirmsFailuresIF {
uint8_t powerRetryCounter = 0; uint8_t powerRetryCounter = 0;
bool tryingOtherSide = false; bool tryingOtherSide = false;
bool dualModeErrorSwitch = true; bool dualModeErrorSwitch = true;
bool pwrStateMachineFirst = false;
duallane::Submodes defaultSubmode = duallane::Submodes::A_SIDE; duallane::Submodes defaultSubmode = duallane::Submodes::A_SIDE;
enum SideSwitchState { enum SideSwitchState { NONE, TO_DUAL, DISABLE_OTHER_SIDE };
NONE,
TO_DUAL,
DISABLE_OTHER_SIDE
};
SideSwitchState sideSwitchState = SideSwitchState::NONE; SideSwitchState sideSwitchState = SideSwitchState::NONE;
duallane::Submodes targetSubmodeForSideSwitch = duallane::Submodes::B_SIDE; duallane::Submodes targetSubmodeForSideSwitch = duallane::Submodes::B_SIDE;