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

Merge branch 'mohr/buildfix' into mohr/catch2

Browse Source
This commit is contained in:
Ulrich Mohr 2022-03-02 17:52:41 +01:00
commit f413ed6f7d
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp_hosted/fsfwconfig/devices/gpioIds.h
View File

@ -47,7 +47,10 @@ enum gpioId_t {
SPI_MUX_BIT_3, SPI_MUX_BIT_3,
SPI_MUX_BIT_4, SPI_MUX_BIT_4,
SPI_MUX_BIT_5, SPI_MUX_BIT_5,
SPI_MUX_BIT_6 SPI_MUX_BIT_6,
CS_RAD_SENSOR,
ENABLE_RADFET
}; };
} }

1
common/config/commonClassIds.h
View File

@ -27,6 +27,7 @@ enum commonClassIds: uint8_t {
RATE_SETTER, //RS RATE_SETTER, //RS
ARCSEC_JSON_BASE, //JSONBASE ARCSEC_JSON_BASE, //JSONBASE
NVM_PARAM_BASE, //NVMB NVM_PARAM_BASE, //NVMB
SA_DEPL_HANDLER, //SADPL
COMMON_CLASS_ID_END // [EXPORT] : [END] COMMON_CLASS_ID_END // [EXPORT] : [END]
}; };

1
linux/fsfwconfig/returnvalues/classIds.h
View File

@ -12,7 +12,6 @@
namespace CLASS_ID { namespace CLASS_ID {
enum { enum {
CLASS_ID_START = COMMON_CLASS_ID_END, CLASS_ID_START = COMMON_CLASS_ID_END,
SA_DEPL_HANDLER, // SADPL
SD_CARD_MANAGER, // SDMA SD_CARD_MANAGER, // SDMA
SCRATCH_BUFFER, // SCBU SCRATCH_BUFFER, // SCBU
CLASS_ID_END // [EXPORT] : [END] CLASS_ID_END // [EXPORT] : [END]

2
mission/devices/RadiationSensorHandler.h
View File

@ -3,8 +3,8 @@
#include <fsfw/devicehandlers/DeviceHandlerBase.h> #include <fsfw/devicehandlers/DeviceHandlerBase.h>
#include <mission/devices/devicedefinitions/RadSensorDefinitions.h> #include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
#include <fsfw_hal/common/gpio/GpioIF.h>
class GpioIF;
/** /**
* @brief This is the device handler class for radiation sensor on the OBC IF Board. The * @brief This is the device handler class for radiation sensor on the OBC IF Board. The