Merge remote-tracking branch 'origin/development' into mueller/fsfw-default-value-pus-c-cfg

2021-09-29 12:07:06 +02:00
parent febe3cc4d4 6e88f8f400
commit 65f4433fad
16 changed files with 1723 additions and 85 deletions
--- a/src/fsfw/events/fwSubsystemIdRanges.h
+++ b/src/fsfw/events/fwSubsystemIdRanges.h
@ -29,6 +29,8 @@ enum: uint8_t {
    PUS_SERVICE_9 = 89,
    PUS_SERVICE_17 = 97,
    PUS_SERVICE_23 = 103,
+    MGM_LIS3MDL = 106,
+    MGM_RM3100 = 107,

    FW_SUBSYSTEM_ID_RANGE
 };
--- a/src/fsfw/returnvalues/FwClassIds.h
+++ b/src/fsfw/returnvalues/FwClassIds.h
@ -76,6 +76,8 @@ enum: uint8_t {
    HAL_UART, //HURT
    HAL_I2C, //HI2C
    HAL_GPIO, //HGIO
+    MGM_LIS3MDL, //MGMLIS3
+    MGM_RM3100, //MGMRM3100
    FW_CLASS_ID_COUNT // [EXPORT] : [END]

 };