Merge pull request 'bugfix EM and Host build' (#528) from bugfix_em_build into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

Reviewed-on: #528
This commit is contained in:
Robin Müller 2023-03-26 16:58:09 +02:00
commit dc92770c01
4 changed files with 8 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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