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

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2022-10-10 10:15:55 +02:00
parent 2ad93f7735 7cf91a8ac3
commit 50d41215fa
24 changed files with 512 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bsp_hosted/ObjectFactory.cpp
View File

@ -44,7 +44,11 @@
#include <dummies/SyrlinksDummy.h>
#include <dummies/TemperatureSensorsDummy.h>
<<<<<<< HEAD
#include "dummies/helpers.h"
=======
#include "mission/utility/GlobalConfigHandler.h"
>>>>>>> origin/develop
void Factory::setStaticFrameworkObjectIds() {
PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_PACKET_DISTRIBUTOR;
@ -69,6 +73,5 @@ void ObjectFactory::produce(void* args) {
new TemperatureSensorsDummy();
new SusDummy();
new ThermalController(objects::THERMAL_CONTROLLER, objects::NO_OBJECT);
// new TestTask(objects::TEST_TASK);
new TestTask(objects::TEST_TASK);
}