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

Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-10-10 10:18:29 +02:00
parent 4d97a82206 7cf91a8ac3
commit fd1d53aa23
21 changed files with 507 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/config/eive/eventSubsystemIds.h
View File

@ -4,6 +4,7 @@
#include <fsfw/events/fwSubsystemIdRanges.h>
namespace SUBSYSTEM_ID {
enum : uint8_t {
COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
ACS_SUBSYSTEM = 112,
@ -33,7 +34,9 @@ enum : uint8_t {
PLOC_SUPV_HELPER = 136,
SYRLINKS = 137,
SCEX_HANDLER = 138,
CONFIGHANDLER = 139,
COMMON_SUBSYSTEM_ID_END
};
}

1
common/config/eive/objects.h
View File

@ -20,6 +20,7 @@ enum commonObjects : uint32_t {
THERMAL_CONTROLLER = 0x43400001,
ACS_CONTROLLER = 0x43000002,
CORE_CONTROLLER = 0x43000003,
GLOBAL_JSON_CFG = 0x43000006,
/* 0x44 ('D') for device handlers */
MGM_0_LIS3_HANDLER = 0x44120006,