From 007badc3248bb076967b982e591d8edd43d4b6a0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 3 Apr 2022 20:35:49 +0200 Subject: [PATCH] bugfix in SUS device handler --- bsp_q7s/core/obsw.cpp | 4 ++-- mission/devices/SusHandler.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp index aede1698..bd81f4ac 100644 --- a/bsp_q7s/core/obsw.cpp +++ b/bsp_q7s/core/obsw.cpp @@ -16,9 +16,9 @@ int obsw::obsw() { using namespace fsfw; std::cout << "-- EIVE OBSW --" << std::endl; #ifdef TE0720_1CFA - std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl; -#else std::cout << "-- Compiled for Linux (TE0720) --" << std::endl; +#else + std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl; #endif std::cout << "-- OBSW v" << SW_VERSION << "." << SW_SUBVERSION << "." << SW_REVISION << ", FSFW v" << FSFW_VERSION << "--" << std::endl; diff --git a/mission/devices/SusHandler.cpp b/mission/devices/SusHandler.cpp index d8879ca8..bea5a749 100644 --- a/mission/devices/SusHandler.cpp +++ b/mission/devices/SusHandler.cpp @@ -32,7 +32,10 @@ void SusHandler::doStartUp() { } } -void SusHandler::doShutDown() { setMode(_MODE_POWER_DOWN); } +void SusHandler::doShutDown() { + setMode(_MODE_POWER_DOWN); + comState = ComStates::IDLE; +} ReturnValue_t SusHandler::buildNormalDeviceCommand(DeviceCommandId_t *id) { switch (comState) { @@ -191,7 +194,7 @@ ReturnValue_t SusHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8 return HasReturnvaluesIF::RETURN_OK; } -uint32_t SusHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 2000; } +uint32_t SusHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 3000; } ReturnValue_t SusHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap, LocalDataPoolManager &poolManager) {