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

Merge branch 'develop' into feature_set_up_periodic_hk
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 2023-03-26 16:58:18 +02:00
commit bb8d4fbc57
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bsp_hosted/ObjectFactory.cpp
View File

@ -4,7 +4,7 @@
#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>
#include <mission/core/GenericFactory.h> #include <mission/genericFactory.h>
#include <mission/tmtc/TmFunnelHandler.h> #include <mission/tmtc/TmFunnelHandler.h>
#include <objects/systemObjectList.h> #include <objects/systemObjectList.h>
@ -37,10 +37,10 @@
#include "devices/gpioIds.h" #include "devices/gpioIds.h"
#include "fsfw_hal/linux/gpio/Gpio.h" #include "fsfw_hal/linux/gpio/Gpio.h"
#include "linux/devices/ploc/PlocMPSoCHandler.h" #include "linux/payload/PlocMpsocHandler.h"
#include "linux/devices/ploc/PlocMPSoCHelper.h" #include "linux/payload/PlocMpsocHelper.h"
#include "linux/devices/ploc/PlocSupervisorHandler.h" #include "linux/payload/PlocSupervisorHandler.h"
#include "linux/devices/ploc/PlocSupvUartMan.h" #include "linux/payload/PlocSupvUartMan.h"
#include "test/gpio/DummyGpioIF.h" #include "test/gpio/DummyGpioIF.h"
#endif #endif

2
bsp_hosted/scheduling.cpp
View File

@ -14,7 +14,7 @@
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "ObjectFactory.h" #include "ObjectFactory.h"
#include "mission/core/scheduling.h" #include "mission/scheduling.h"
#include "scheduling.h" #include "scheduling.h"
#ifdef LINUX #ifdef LINUX

2
bsp_q7s/em/emObjectFactory.cpp
View File

@ -18,7 +18,7 @@
#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
#include "linux/ObjectFactory.h" #include "linux/ObjectFactory.h"
#include "linux/callbacks/gpioCallbacks.h" #include "linux/callbacks/gpioCallbacks.h"
#include "mission/core/GenericFactory.h" #include "mission/genericFactory.h"
#include "mission/system/com/comModeTree.h" #include "mission/system/com/comModeTree.h"
void ObjectFactory::produce(void* args) { void ObjectFactory::produce(void* args) {

2
unittest/controller/testThermalController.cpp
View File

@ -9,7 +9,7 @@
#include "../testEnvironment.h" #include "../testEnvironment.h"
#include "dummies/TemperatureSensorInserter.h" #include "dummies/TemperatureSensorInserter.h"
#include "mission/core/GenericFactory.h" #include "mission/genericFactory.h"
#include "test/gpio/DummyGpioIF.h" #include "test/gpio/DummyGpioIF.h"
TEST_CASE("Thermal Controller", "[ThermalController]") { TEST_CASE("Thermal Controller", "[ThermalController]") {