eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

PLOC SUPV update 2 #324

Merged
muellerr merged 10 commits from mueller/tas_ploc_supv_update_2 into develop 2022-11-24 14:48:23 +01:00
Conversation 0 Commits 10 Files Changed 8 +85 -100
7 changed files with 85 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b92aa03f3 - Show all commits

4
bsp_hosted/ObjectFactory.cpp
View File

@@ -1,5 +1,6 @@
#include "ObjectFactory.h" #include "ObjectFactory.h"
#include <fsfw/power/DummyPowerSwitcher.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h> #include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h> #include <fsfw/tmtcservices/PusServiceBase.h>
#include <mission/controller/ThermalController.h> #include <mission/controller/ThermalController.h>
@@ -79,6 +80,7 @@ void ObjectFactory::produce(void* args) {
ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel); ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel);
DummyGpioIF* dummyGpioIF = new DummyGpioIF(); DummyGpioIF* dummyGpioIF = new DummyGpioIF();
auto* dummySwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0);
static_cast<void>(dummyGpioIF); static_cast<void>(dummyGpioIF);
#ifdef PLATFORM_UNIX #ifdef PLATFORM_UNIX
new SerialComIF(objects::UART_COM_IF); new SerialComIF(objects::UART_COM_IF);
@@ -106,7 +108,7 @@ void ObjectFactory::produce(void* args) {
#endif #endif
dummy::DummyCfg cfg; dummy::DummyCfg cfg;
dummy::createDummies(cfg); dummy::createDummies(cfg, *dummySwitcher);
new ThermalController(objects::THERMAL_CONTROLLER); new ThermalController(objects::THERMAL_CONTROLLER);
new TestTask(objects::TEST_TASK); new TestTask(objects::TEST_TASK);
} }