Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init

2022-08-29 15:53:57 +02:00
parent 4649c97205 04fb2b1261
commit 3ad7a35f0e
331 changed files with 5495 additions and 19776 deletions
--- a/mission/system/objects/DualLanePowerStateMachine.cpp
+++ b/mission/system/objects/DualLanePowerStateMachine.cpp
@ -11,8 +11,8 @@ DualLanePowerStateMachine::DualLanePowerStateMachine(power::Switch_t switchA,

 power::OpCodes DualLanePowerStateMachine::fsm() {
  using namespace duallane;
-  ReturnValue_t switchStateA = RETURN_OK;
-  ReturnValue_t switchStateB = RETURN_OK;
+  ReturnValue_t switchStateA = returnvalue::OK;
+  ReturnValue_t switchStateB = returnvalue::OK;
  if (state == power::States::IDLE or state == power::States::MODE_COMMANDING) {
    return opResult;
  }