Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good

This commit is contained in:
2022-10-21 15:37:25 +02:00
22 changed files with 296 additions and 204 deletions

View File

@ -129,8 +129,11 @@ enum commonObjects : uint32_t {
RW_ASS = 0x73000004,
ACS_SUBSYSTEM = 0x73010001,
EIVE_SYSTEM = 0x73010000,
CFDP_HANDLER = 0x7302000,
CFDP_DISTRIBUTOR = 0x73020001
CFDP_HANDLER = 0x73000005,
CFDP_DISTRIBUTOR = 0x73000006,
TM_FUNNEL = 0x73000100,
PUS_TM_FUNNEL = 0x73000101,
CFDP_TM_FUNNEL = 0x73000102,
};
}