From 8fde9ee9be81535b0c18261876125ba92337fd72 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 11:01:30 +0100 Subject: [PATCH] small fix for PL PCDU handler shutdown handling --- mission/devices/PayloadPcduHandler.cpp | 10 +--------- tmtc | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index c5956b6b..bcba7a6c 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -66,14 +66,6 @@ void PayloadPcduHandler::doShutDown() { if (retval == BUSY) { return; } - state = States::STACK_5V_PENDING; - } - if (state == States::STACK_5V_PENDING) { - if (not stackHandler.isSwitchOn()) { - state = States::STACK_5V_CORRECT; - } - } - if (state == States::STACK_5V_CORRECT) { state = States::PL_PCDU_OFF; // No need to set mode _MODE_POWER_DOWN, power switching was already handled setMode(MODE_OFF); @@ -93,7 +85,7 @@ void PayloadPcduHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) { gpioIF->pullLow(gpioIds::PLPCDU_ENB_TX); gpioIF->pullLow(gpioIds::PLPCDU_ENB_VBAT0); gpioIF->pullLow(gpioIds::PLPCDU_ENB_VBAT1); - state = States::POWER_CHANNELS_ON; + state = States::STACK_5V_CORRECT; } DeviceHandlerBase::doTransition(modeFrom, subModeFrom); } diff --git a/tmtc b/tmtc index 24f6a59c..c4dbf3d8 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 24f6a59cf98a01676beba37280d8840c3d0a3dbe +Subproject commit c4dbf3d8bedc7be1848945629c6367586390c4f4