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

solved all merge conflicts

Browse Source
This commit is contained in:
Martin Zietz
2021-03-22 13:09:06 +01:00
parent 862a546637
commit e44773fee3
8 changed files with 158 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fsfwconfig/objects/systemObjectList.h
View File

@ -43,14 +43,6 @@ namespace objects {
ACU_HANDLER = 0x44000004,
TMP1075_HANDLER_1 = 0x44000005,
TMP1075_HANDLER_2 = 0x44000006,
MGM_0_LIS3_HANDLER = 0x4400007,
MGM_1_RM3100_HANDLER = 0x44000008,
MGM_2_LIS3_HANDLER = 0x44000009,
MGM_3_RM3100_HANDLER = 0x44000010,
GYRO_0_ADIS_HANDLER = 0x44000011,
GYRO_1_L3G_HANDLER = 0x44000012,
GYRO_2_L3G_HANDLER = 0x44000013,
MGM_0_LIS3_HANDLER = 0x4400007,
MGM_1_RM3100_HANDLER = 0x44000008,
MGM_2_LIS3_HANDLER = 0x44000009,
@ -62,10 +54,7 @@ namespace objects {
/* Custom device handler */
PCDU_HANDLER = 0x44001000,
SOLAR_ARRAY_DEPL_HANDLER = 0x44001001,
<<<<<<< HEAD
SYRLINKS_HK_HANDLER = 0x44000009,
=======
>>>>>>> develop
/* 0x54 ('T') for thermal objects */
HEATER_HANDLER = 0x54000003,