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

reduced number of errors for hosted build
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2023-02-09 17:17:58 +01:00
parent ee51b5428d
commit d01308f0ba
9 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bsp_hosted/ObjectFactory.cpp
View File

@ -9,7 +9,6 @@
#include <objects/systemObjectList.h>
#include "OBSWConfig.h"
#include "devConf.h"
#include "fsfw/platform.h"
#include "fsfw_tests/integration/task/TestTask.h"
@ -22,30 +21,13 @@
#include "fsfw/osal/common/TcpTmTcServer.h"
#endif
#include <fsfw/tmtcpacket/pus/tm.h>
#if OBSW_ADD_TEST_CODE == 1
#include <test/testtasks/TestTask.h>
#endif
#include <dummies/AcuDummy.h>
#include <dummies/BpxDummy.h>
#include <dummies/ComCookieDummy.h>
#include <dummies/ComIFDummy.h>
#include <dummies/CoreControllerDummy.h>
#include <dummies/GyroAdisDummy.h>
#include <dummies/GyroL3GD20Dummy.h>
#include <dummies/ImtqDummy.h>
#include <dummies/MgmLIS3MDLDummy.h>
#include <dummies/P60DockDummy.h>
#include <dummies/PduDummy.h>
#include <dummies/PlPcduDummy.h>
#include <dummies/RwDummy.h>
#include <dummies/StarTrackerDummy.h>
#include <dummies/SusDummy.h>
#include <dummies/SyrlinksDummy.h>
#include "../dummies/TemperatureSensorInserter.h"
#include "dummies/helpers.h"
#include "mission/utility/GlobalConfigHandler.h"

2
bsp_hosted/fsfwconfig/returnvalues/classIds.h
View File

@ -13,7 +13,7 @@
namespace CLASS_ID {
enum {
CLASS_ID_START = COMMON_CLASS_ID_END,
CLASS_ID_END // [EXPORT] : [END]
CLASS_ID_END // [EXPORT] : [END]
};
}

8
bsp_hosted/scheduling.cpp
View File

@ -155,10 +155,10 @@ void scheduling::initTasks() {
}
// Disabled until more stable
//result = thermalTask->addComponent(objects::THERMAL_CONTROLLER);
//if (result != returnvalue::OK) {
// scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER);
//}
// result = thermalTask->addComponent(objects::THERMAL_CONTROLLER);
// if (result != returnvalue::OK) {
// scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER);
// }
FixedTimeslotTaskIF* pstTask = factory->createFixedTimeslotTask(
"DUMMY_PST", 75, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.5, missedDeadlineFunc);