Merge pull request 'updated to new fsfw' (#299) from mohr/updated_fsfw into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

Reviewed-on: #299
This commit is contained in:
Robin Müller 2022-09-14 19:03:41 +02:00
commit 3fc97f9ee9
13 changed files with 28 additions and 1 deletions

2
fsfw

@ -1 +1 @@
Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e Subproject commit bd594123a2a1579f505071f9c76d1249433c070e

View File

@ -4,6 +4,10 @@
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
// It is assumed the user has a subsystem and class ID list in some user header files.
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
//! Used to determine whether C++ ostreams are used which can increase //! Used to determine whether C++ ostreams are used which can increase
//! the binary size significantly. If this is disabled, //! the binary size significantly. If this is disabled,
//! the C stdio functions can be used alternatively //! the C stdio functions can be used alternatively

View File

@ -4,6 +4,7 @@
#include "AxiPtmeConfig.h" #include "AxiPtmeConfig.h"
#include "fsfw/objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "fsfw/returnvalues/returnvalue.h" #include "fsfw/returnvalues/returnvalue.h"
#include "returnvalues/classIds.h"
#include "linux/obc/PtmeConfig.h" #include "linux/obc/PtmeConfig.h"
/** /**

View File

@ -18,6 +18,8 @@
#include <vector> #include <vector>
#include "devices/heaterSwitcherList.h" #include "devices/heaterSwitcherList.h"
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
class PowerSwitchIF; class PowerSwitchIF;
class HealthTableIF; class HealthTableIF;

View File

@ -5,6 +5,9 @@
#include <mission/devices/devicedefinitions/IMTQHandlerDefinitions.h> #include <mission/devices/devicedefinitions/IMTQHandlerDefinitions.h>
#include <string.h> #include <string.h>
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
/** /**
* @brief This is the device handler for the ISIS Magnetorquer iMTQ. * @brief This is the device handler for the ISIS Magnetorquer iMTQ.
* *

View File

@ -6,6 +6,9 @@
#include <mission/devices/devicedefinitions/RwDefinitions.h> #include <mission/devices/devicedefinitions/RwDefinitions.h>
#include <string.h> #include <string.h>
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
class GpioIF; class GpioIF;
/** /**

View File

@ -14,6 +14,9 @@
#include <unordered_map> #include <unordered_map>
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
/** /**
* @brief This class is used to control the solar array deployment. * @brief This class is used to control the solar array deployment.
* *

View File

@ -7,6 +7,9 @@
#include "fsfw/globalfunctions/PeriodicOperationDivider.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
#include "mission/devices/max1227.h" #include "mission/devices/max1227.h"
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
/** /**
* @brief This is the device handler class for the SUS sensor based on the MAX1227 ADC. * @brief This is the device handler class for the SUS sensor based on the MAX1227 ADC.
* *

View File

@ -8,6 +8,7 @@
#include "fsfw/timemanager/Countdown.h" #include "fsfw/timemanager/Countdown.h"
#include "fsfw_hal/linux/gpio/Gpio.h" #include "fsfw_hal/linux/gpio/Gpio.h"
#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h" #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
#include "returnvalues/classIds.h"
/** /**
* @brief This is the device handler for the syrlinks transceiver. It handles the command * @brief This is the device handler for the syrlinks transceiver. It handles the command

View File

@ -5,6 +5,7 @@
#include <fsfw/datapoollocal/StaticLocalDataSet.h> #include <fsfw/datapoollocal/StaticLocalDataSet.h>
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include "events/subsystemIdRanges.h"
#include "objects/systemObjectList.h" #include "objects/systemObjectList.h"
namespace RwDefinitions { namespace RwDefinitions {

View File

@ -6,6 +6,7 @@
#include <string> #include <string>
#include "fsfw/returnvalues/returnvalue.h" #include "fsfw/returnvalues/returnvalue.h"
#include "returnvalues/classIds.h"
class NVMParameterBase { class NVMParameterBase {
public: public:

View File

@ -5,6 +5,8 @@
#include <fsfw/devicehandlers/AssemblyBase.h> #include <fsfw/devicehandlers/AssemblyBase.h>
#include "DualLaneAssemblyBase.h" #include "DualLaneAssemblyBase.h"
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
struct SusAssHelper { struct SusAssHelper {
public: public:

View File

@ -5,6 +5,9 @@
#include <fsfw/devicehandlers/AssemblyBase.h> #include <fsfw/devicehandlers/AssemblyBase.h>
#include <fsfw/power/PowerSwitcher.h> #include <fsfw/power/PowerSwitcher.h>
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
struct TcsBoardHelper { struct TcsBoardHelper {
TcsBoardHelper(std::array<std::pair<object_id_t, std::string>, 16> rtdInfos) TcsBoardHelper(std::array<std::pair<object_id_t, std::string>, 16> rtdInfos)
: rtdInfos(std::move(rtdInfos)) {} : rtdInfos(std::move(rtdInfos)) {}