From f2f350116f4b42ea725c684903a55927ae8e7a82 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Mar 2022 12:09:17 +0200 Subject: [PATCH] tmtc update --- mission/devices/PayloadPcduHandler.cpp | 3 ++- tmtc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index c9574b83..60bf26a0 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -547,8 +547,9 @@ bool PayloadPcduHandler::checkCurrent(float val, float upperBound, Event event) ReturnValue_t PayloadPcduHandler::isModeCombinationValid(Mode_t mode, Submode_t submode) { using namespace plpcdu; if (mode == MODE_NORMAL) { + // Also deals with the case where the mode is MODE_ON, submode should be 0 here if (submode == NormalSubmodes::SOLID_STATE_RELAYS_ADC_ON and - this->submode != NormalSubmodes::ALL_OFF) { + (this->mode == MODE_NORMAL and this->submode != NormalSubmodes::ALL_OFF)) { return TRANS_NOT_ALLOWED; } if ((submode == NormalSubmodes::DRO_ON and diff --git a/tmtc b/tmtc index e3743042..b5a9dac8 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e37430423e814b9e05f25d63970f2c2b5048cfb1 +Subproject commit b5a9dac8f6d3733779a67a72b14a20091069a346