diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index bdbd51cc..a979548b 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/bsp_q7s/core/CoreController.cpp @@ -1,3 +1,4 @@ +#include #include "CoreController.h" #include "OBSWConfig.h" @@ -99,6 +100,10 @@ ReturnValue_t CoreController::initializeAfterTaskCreation() { setenv("PATH", updatedEnvPath.c_str(), true); updateProtInfo(); initPrint(); + auto eventManager = ObjectManager::instance()->get(objects::EVENT_MANAGER); + if(eventManager != nullptr) { + eventManager->printListeners(); + } return result; } diff --git a/fsfw b/fsfw index bd05afbd..a12e98d9 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit bd05afbddd7e2da43b19b8ceafb6272e73d5464d +Subproject commit a12e98d9481e224a30a1150e9dfd0a48501f410f diff --git a/linux/devices/SusHandler.cpp b/linux/devices/SusHandler.cpp index 7303c356..fc2b92a1 100644 --- a/linux/devices/SusHandler.cpp +++ b/linux/devices/SusHandler.cpp @@ -229,7 +229,7 @@ void SusHandler::printDataset() { #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_SUS == 1 if (divider.checkAndIncrement()) { sif::info << "SUS " << std::setw(2) << std::dec << static_cast(susIdx) << " ID " << std::hex - << this->getObjectId() << " [" << std::hex << std::setw(3); + << "0x" << this->getObjectId() << " [" << std::hex << std::setw(3); sif::info << dataset.ain0 << ","; sif::info << dataset.ain1 << ","; sif::info << dataset.ain2 << ","; diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp index b17812e6..bc2eebad 100644 --- a/mission/core/GenericFactory.cpp +++ b/mission/core/GenericFactory.cpp @@ -79,7 +79,7 @@ void ObjectFactory::produceGenericObjects() { new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, apid::EIVE_OBSW, pus::PUS_SERVICE_3); new Service5EventReporting(objects::PUS_SERVICE_5_EVENT_REPORTING, apid::EIVE_OBSW, - pus::PUS_SERVICE_5, 50); + pus::PUS_SERVICE_5, 120); new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, apid::EIVE_OBSW, pus::PUS_SERVICE_8, 3, 60); new Service9TimeManagement(objects::PUS_SERVICE_9_TIME_MGMT, apid::EIVE_OBSW, pus::PUS_SERVICE_9);