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

run generator scripts

Browse Source
This commit is contained in:
Jakob Meier
2022-03-14 18:43:16 +01:00
parent 9fc1e57943
commit f8f7848200
12 changed files with 1590 additions and 1437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/core/ObjectFactory.cpp
View File

@ -17,6 +17,7 @@
#include "bsp_q7s/devices/ploc/PlocSupervisorHandler.h"
#include "bsp_q7s/devices/ploc/PlocUpdater.h"
#include "bsp_q7s/devices/ploc/PlocMPSoCHandler.h"
#include "bsp_q7s/devices/devicedefinitions/PlocMPSoCDefinitions.h"
#include "bsp_q7s/memory/FileSystemHandler.h"
#include "busConf.h"
#include "ccsdsConfig.h"
@ -77,7 +78,6 @@
#include "mission/devices/Tmp1075Handler.h"
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
#include "mission/devices/devicedefinitions/Max31865Definitions.h"
#include "mission/devices/devicedefinitions/PlocMPSoCDefinitions.h"
#include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
#include "mission/devices/devicedefinitions/RwDefinitions.h"
#include "mission/devices/devicedefinitions/SusDefinitions.h"

2
bsp_q7s/devices/ploc/CMakeLists.txt
View File

@ -1,4 +1,4 @@
target_sources(${TARGET_NAME} PRIVATE
target_sources(${OBSW_NAME} PRIVATE
PlocSupervisorHandler.cpp
PlocUpdater.cpp
PlocMemoryDumper.cpp

1
bsp_q7s/devices/ploc/PlocSupervisorHandler.h
View File

@ -1,6 +1,7 @@
#ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
#define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
#include "OBSWconfig.h"
#include <bsp_q7s/devices/devicedefinitions/PlocSupervisorDefinitions.h>
#include <bsp_q7s/memory/SdCardManager.h>
#include <fsfw/devicehandlers/DeviceHandlerBase.h>

5
bsp_q7s/devices/ploc/PlocUpdater.h
View File

@ -2,14 +2,9 @@
#define MISSION_DEVICES_PLOCUPDATER_H_
#include "OBSWConfig.h"
<<<<<<< HEAD:bsp_q7s/devices/ploc/PlocUpdater.h
#include <bsp_q7s/devices/devicedefinitions/PlocSupervisorDefinitions.h>
#include "fsfw/action/CommandActionHelper.h"
=======
#include "bsp_q7s/memory/SdCardManager.h"
#include "devicedefinitions/PlocSupervisorDefinitions.h"
>>>>>>> develop:bsp_q7s/devices/PlocUpdater.h
#include "fsfw/action/ActionHelper.h"
#include "fsfw/action/CommandActionHelper.h"
#include "fsfw/action/CommandsActionsIF.h"