removed global config handler
This commit is contained in:
parent
5f275778de
commit
28f3b07c5c
@ -29,7 +29,6 @@
|
|||||||
#include <dummies/CoreControllerDummy.h>
|
#include <dummies/CoreControllerDummy.h>
|
||||||
|
|
||||||
#include "dummies/helpers.h"
|
#include "dummies/helpers.h"
|
||||||
#include "mission/utility/GlobalConfigHandler.h"
|
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
#ifdef PLATFORM_UNIX
|
||||||
#include <fsfw_hal/linux/serial/SerialComIF.h>
|
#include <fsfw_hal/linux/serial/SerialComIF.h>
|
||||||
|
@ -943,7 +943,3 @@ void ObjectFactory::testAcsBrdAss(AcsBoardAssembly* acsAss) {
|
|||||||
sif::warning << "Sending mode command failed" << std::endl;
|
sif::warning << "Sending mode command failed" << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObjectFactory::createGlobalConfigHandler() {
|
|
||||||
new GlobalConfigHandler(objects::GLOBAL_JSON_CFG, configfile::sdrelative);
|
|
||||||
}
|
|
||||||
|
@ -49,8 +49,6 @@ void createTestComponents(LinuxLibgpioIF* gpioComIF);
|
|||||||
|
|
||||||
void testAcsBrdAss(AcsBoardAssembly* assAss);
|
void testAcsBrdAss(AcsBoardAssembly* assAss);
|
||||||
|
|
||||||
void createGlobalConfigHandler();
|
|
||||||
|
|
||||||
}; // namespace ObjectFactory
|
}; // namespace ObjectFactory
|
||||||
|
|
||||||
#endif /* BSP_Q7S_OBJECTFACTORY_H_ */
|
#endif /* BSP_Q7S_OBJECTFACTORY_H_ */
|
||||||
|
@ -86,8 +86,6 @@ void ObjectFactory::produce(void* args) {
|
|||||||
createTestComponents(gpioComIF);
|
createTestComponents(gpioComIF);
|
||||||
#endif /* OBSW_ADD_TEST_CODE == 1 */
|
#endif /* OBSW_ADD_TEST_CODE == 1 */
|
||||||
|
|
||||||
createGlobalConfigHandler();
|
|
||||||
|
|
||||||
createMiscComponents();
|
createMiscComponents();
|
||||||
createThermalController(*heaterHandler);
|
createThermalController(*heaterHandler);
|
||||||
createAcsController(true);
|
createAcsController(true);
|
||||||
|
@ -13,8 +13,6 @@ ReturnValue_t LocalParameterHandler::initialize() {
|
|||||||
setFullName(fullname);
|
setFullName(fullname);
|
||||||
ReturnValue_t result = readJsonFile();
|
ReturnValue_t result = readJsonFile();
|
||||||
if (result != returnvalue::OK) {
|
if (result != returnvalue::OK) {
|
||||||
sif::warning << "LocalParameterHandler::initialize: Failed to read json file"
|
|
||||||
<< getFullName() << std::endl;
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
return returnvalue::OK;
|
return returnvalue::OK;
|
||||||
|
@ -30,7 +30,7 @@ ReturnValue_t PdecConfig::write() {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
writeMapConfig();
|
writeMapConfig();
|
||||||
return returnvalue::FAILED;
|
return returnvalue::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
ReturnValue_t PdecConfig::initializePersistentParameters() {
|
ReturnValue_t PdecConfig::initializePersistentParameters() {
|
||||||
|
Loading…
Reference in New Issue
Block a user