From 7e3de3ca9573bb9a16d12b9c08ab5c6232ef7598 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 13 Feb 2023 09:56:57 +0100 Subject: [PATCH] timing problem does not fully disappear.. --- bsp_q7s/core/scheduling.cpp | 4 ++-- mission/controller/AcsController.cpp | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp index e4dcdb2d..cc3108e8 100644 --- a/bsp_q7s/core/scheduling.cpp +++ b/bsp_q7s/core/scheduling.cpp @@ -216,14 +216,14 @@ void scheduling::initTasks() { #if OBSW_ADD_RTD_DEVICES == 1 PeriodicTaskIF* tcsPollingTask = factory->createPeriodicTask( - "TCS_POLLING_TASK", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.5, missedDeadlineFunc); + "TCS_POLLING_TASK", 75, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.5, missedDeadlineFunc); result = tcsPollingTask->addComponent(objects::SPI_RTD_COM_IF); if (result != returnvalue::OK) { scheduling::printAddObjectError("SPI_RTD_POLLING", objects::SPI_RTD_COM_IF); } PeriodicTaskIF* tcsTask = factory->createPeriodicTask( - "TCS_TASK", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc); + "TCS_TASK", 55, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc); scheduling::scheduleRtdSensors(tcsTask); #endif diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index b4f015b2..f2a126dd 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -571,8 +571,17 @@ void AcsController::modeChanged(Mode_t mode, Submode_t submode) { } void AcsController::announceMode(bool recursive) { - const char *modeStr = acs::getModeStr(static_cast(mode)); - sif::info << "ACS controller is now in " << modeStr << " mode" << std::endl; + const char* modeStr = "UNKNOWN"; + if(mode == HasModesIF::MODE_OFF) { + modeStr = "OFF"; + } else if(mode == HasModesIF::MODE_ON) { + modeStr = "ON"; + } else if(mode == DeviceHandlerIF::MODE_NORMAL) { + modeStr = "NORMAL"; + } + const char *submodeStr = acs::getModeStr(static_cast(mode)); + sif::info << "ACS controller is now in " << modeStr << " mode with " << + submodeStr << " submode" << std::endl; return ExtendedControllerBase::announceMode(recursive); }