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

Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
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-05-08 13:06:47 +02:00
parent 37e81d34c9 9f9fa9b41b
commit d9085e81a1
52 changed files with 3923 additions and 2601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/config/commonClassIds.h
View File

@ -16,6 +16,7 @@ enum commonClassIds: uint8_t {
DWLPWRON_CMD, //DWLPWRON
MPSOC_TM, //MPTM
PLOC_SUPERVISOR_HANDLER, //PLSV
PLOC_SUPV_HELPER, //PLSPVhLP
SUS_HANDLER, //SUSS
CCSDS_IP_CORE_BRIDGE, //IPCI
PTME, //PTME
@ -32,6 +33,7 @@ enum commonClassIds: uint8_t {
PLOC_MPSOC_HELPER, // PLMPHLP
SA_DEPL_HANDLER, //SADPL
MPSOC_RETURN_VALUES_IF, //MPSOCRTVIF
SUPV_RETURN_VALUES_IF, //SPVRTVIF
COMMON_CLASS_ID_END // [EXPORT] : [END]
};

4
common/config/commonObjects.h
View File

@ -64,6 +64,8 @@ enum commonObjects: uint32_t {
PLOC_MEMORY_DUMPER = 0x44330001,
STR_HELPER = 0x44330002,
PLOC_MPSOC_HELPER = 0x44330003,
AXI_PTME_CONFIG = 0x44330004,
PTME_CONFIG = 0x44330005,
PLOC_MPSOC_HANDLER = 0x44330015,
PLOC_SUPERVISOR_HANDLER = 0x44330016,
PLOC_SUPERVISOR_HELPER = 0x44330017,
@ -116,8 +118,6 @@ enum commonObjects: uint32_t {
SUS_11_R_LOC_XBYMZB_PT_ZB = 0x44120043,
SYRLINKS_HK_HANDLER = 0x445300A3,
AXI_PTME_CONFIG = 44330004,
PTME_CONFIG = 44330005,
// 0x60 for other stuff
HEATER_0_OBC_BRD = 0x60000000,

3
common/config/commonSubsystemIds.h
View File

@ -30,7 +30,8 @@ enum: uint8_t {
PDU1_HANDLER = 133,
PDU2_HANDLER = 134,
ACU_HANDLER = 135,
SYRLINKS = 136,
PLOC_SUPV_HELPER = 136,
SYRLINKS = 137,
COMMON_SUBSYSTEM_ID_END
};
}

2
common/config/devConf.h
View File

@ -53,7 +53,7 @@ static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
static constexpr UartBaudRate PLOC_SUPERVISOR_BAUD = UartBaudRate::RATE_115200;
static constexpr UartBaudRate PLOC_SUPV_BAUD = UartBaudRate::RATE_115200;
static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
}