From 637941e089caae1abf5515753ab4b862e6bafe49 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 31 Mar 2022 14:40:42 +0200 Subject: [PATCH] important bugfixes --- linux/fsfwconfig/OBSWConfig.h.in | 6 +++--- mission/devices/PayloadPcduHandler.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in index 69e6744b..a3ef335c 100644 --- a/linux/fsfwconfig/OBSWConfig.h.in +++ b/linux/fsfwconfig/OBSWConfig.h.in @@ -50,7 +50,7 @@ debugging. */ #define OBSW_ADD_RTD_DEVICES 1 #define OBSW_ADD_TMP_DEVICES 0 #define OBSW_ADD_RAD_SENSORS 1 -#define OBSW_ADD_PL_PCDU 0 +#define OBSW_ADD_PL_PCDU 1 #define OBSW_ADD_SYRLINKS 0 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT 0 #define OBSW_STAR_TRACKER_GROUND_CONFIG 1 @@ -88,10 +88,10 @@ debugging. */ #define OBSW_ADD_PL_PCDU 0 #define OBSW_ADD_SYRLINKS 0 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT 0 -#define OBSW_SYRLINKS_SIMULATED 1 +#define OBSW_SYRLINKS_SIMULATED 1 #define OBSW_STAR_TRACKER_GROUND_CONFIG 1 #define OBSW_ENABLE_PERIODIC_HK 0 -#define OBSW_PRINT_CORE_HK 0 +#define OBSW_PRINT_CORE_HK 0 #define OBSW_INITIALIZE_SWITCHES 0 #endif diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index 36835051..7a1924c1 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -75,7 +75,7 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_ } if (state == States::POWER_CHANNELS_ON) { #if OBSW_VERBOSE_LEVEL >= 1 - sif::info << "Switching on SSR VBAT0 & VBAT1 GPIOs" << std::endl; + sif::info << "Switching on SSR VBAT0 & VBAT1 GPIOs" << std::endl; #endif // Switch on relays here gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT0); @@ -132,7 +132,7 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_ sif::info << "Enabling PL PCDU X8 module" << std::endl; #endif // Switch on DRO and start monitoring for negative voltages - gpioIF->pullHigh(gpioIds::PLPCDU_ENB_DRO); + gpioIF->pullHigh(gpioIds::PLPCDU_ENB_X8); adcCountdown.setTimeout(100); adcCountdown.resetTimer(); setMode(MODE_NORMAL, submode); @@ -563,7 +563,7 @@ ReturnValue_t PayloadPcduHandler::isModeCombinationValid(Mode_t mode, Submode_t if ((submode == NormalSubmodes::TX_ON and this->submode != NormalSubmodes::X8_ON)) { return TRANS_NOT_ALLOWED; } - if ((submode == NormalSubmodes::MPA_ON and this->submode != NormalSubmodes::MPA_ON)) { + if ((submode == NormalSubmodes::MPA_ON and this->submode != NormalSubmodes::TX_ON)) { return TRANS_NOT_ALLOWED; } if ((submode == NormalSubmodes::HPA_ON and this->submode != NormalSubmodes::MPA_ON)) {