diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp index d2c3c3da..b0c4ad7f 100644 --- a/bsp_hosted/ObjectFactory.cpp +++ b/bsp_hosted/ObjectFactory.cpp @@ -29,7 +29,6 @@ #include #include "dummies/helpers.h" -#include "mission/utility/GlobalConfigHandler.h" #ifdef PLATFORM_UNIX #include diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 70ccd08c..b3378221 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -943,7 +943,3 @@ void ObjectFactory::testAcsBrdAss(AcsBoardAssembly* acsAss) { sif::warning << "Sending mode command failed" << std::endl; } } - -void ObjectFactory::createGlobalConfigHandler() { - new GlobalConfigHandler(objects::GLOBAL_JSON_CFG, configfile::sdrelative); -} diff --git a/bsp_q7s/core/ObjectFactory.h b/bsp_q7s/core/ObjectFactory.h index b835b032..2118e3d7 100644 --- a/bsp_q7s/core/ObjectFactory.h +++ b/bsp_q7s/core/ObjectFactory.h @@ -49,8 +49,6 @@ void createTestComponents(LinuxLibgpioIF* gpioComIF); void testAcsBrdAss(AcsBoardAssembly* assAss); -void createGlobalConfigHandler(); - }; // namespace ObjectFactory #endif /* BSP_Q7S_OBJECTFACTORY_H_ */ diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp index f24feb5d..d640ac35 100644 --- a/bsp_q7s/fmObjectFactory.cpp +++ b/bsp_q7s/fmObjectFactory.cpp @@ -86,8 +86,6 @@ void ObjectFactory::produce(void* args) { createTestComponents(gpioComIF); #endif /* OBSW_ADD_TEST_CODE == 1 */ - createGlobalConfigHandler(); - createMiscComponents(); createThermalController(*heaterHandler); createAcsController(true); diff --git a/bsp_q7s/memory/LocalParameterHandler.cpp b/bsp_q7s/memory/LocalParameterHandler.cpp index 9428837d..953d79a2 100644 --- a/bsp_q7s/memory/LocalParameterHandler.cpp +++ b/bsp_q7s/memory/LocalParameterHandler.cpp @@ -13,8 +13,6 @@ ReturnValue_t LocalParameterHandler::initialize() { setFullName(fullname); ReturnValue_t result = readJsonFile(); if (result != returnvalue::OK) { - sif::warning << "LocalParameterHandler::initialize: Failed to read json file" - << getFullName() << std::endl; return result; } return returnvalue::OK; diff --git a/linux/ipcore/PdecConfig.cpp b/linux/ipcore/PdecConfig.cpp index f468c410..f299b060 100644 --- a/linux/ipcore/PdecConfig.cpp +++ b/linux/ipcore/PdecConfig.cpp @@ -30,7 +30,7 @@ ReturnValue_t PdecConfig::write() { return result; } writeMapConfig(); - return returnvalue::FAILED; + return returnvalue::OK; } ReturnValue_t PdecConfig::initializePersistentParameters() {