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/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-10-10 10:30:45 +02:00
parent 8e9a91f32a 7cf91a8ac3
commit 454c2f0ad1
20 changed files with 503 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bsp_hosted/ObjectFactory.cpp
View File

@ -44,6 +44,8 @@
#include <dummies/SyrlinksDummy.h>
#include <dummies/TemperatureSensorsDummy.h>
#include "mission/utility/GlobalConfigHandler.h"
void Factory::setStaticFrameworkObjectIds() {
PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_PACKET_DISTRIBUTOR;
PusServiceBase::PACKET_DESTINATION = objects::TM_FUNNEL;
@ -87,6 +89,5 @@ void ObjectFactory::produce(void* args) {
new TemperatureSensorsDummy();
new SusDummy();
new ThermalController(objects::THERMAL_CONTROLLER);
// new TestTask(objects::TEST_TASK);
new TestTask(objects::TEST_TASK);
}

3
bsp_hosted/main.cpp
View File

@ -31,6 +31,9 @@ int main(void) {
<< "v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
<< std::endl;
std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
std::cout << "-- "
<< " BSP HOSTED"
<< " --" << std::endl;
initmission::initMission();