PDEC Config Persistent #398

Merged
muellerr merged 21 commits from meier/pdec-config-persistent into develop 2023-02-27 18:33:52 +01:00
6 changed files with 1 additions and 12 deletions
Showing only changes of commit 28f3b07c5c - Show all commits

View File

@ -29,7 +29,6 @@
#include <dummies/CoreControllerDummy.h>
#include "dummies/helpers.h"
#include "mission/utility/GlobalConfigHandler.h"
#ifdef PLATFORM_UNIX
#include <fsfw_hal/linux/serial/SerialComIF.h>

View File

@ -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);
}

View File

@ -49,8 +49,6 @@ void createTestComponents(LinuxLibgpioIF* gpioComIF);
void testAcsBrdAss(AcsBoardAssembly* assAss);
void createGlobalConfigHandler();
}; // namespace ObjectFactory
#endif /* BSP_Q7S_OBJECTFACTORY_H_ */

View File

@ -86,8 +86,6 @@ void ObjectFactory::produce(void* args) {
createTestComponents(gpioComIF);
#endif /* OBSW_ADD_TEST_CODE == 1 */
createGlobalConfigHandler();
createMiscComponents();
createThermalController(*heaterHandler);
createAcsController(true);

View File

@ -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;

View File

@ -30,7 +30,7 @@ ReturnValue_t PdecConfig::write() {
return result;
}
writeMapConfig();
return returnvalue::FAILED;
return returnvalue::OK;
}
ReturnValue_t PdecConfig::initializePersistentParameters() {