Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init

2022-05-06 08:58:31 +02:00
parent 1508a1e147 a7b696884c
commit 355ca27d31
13 changed files with 561 additions and 386 deletions
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -48,35 +48,46 @@ enum commonObjects: uint32_t {
     * Not yet specified which pt1000 will measure which device/location in the satellite.
     * Therefore object ids are named according to the IC naming of the RTDs in the schematic.
     */
-    RTD_IC_3 = 0x44420016,
-    RTD_IC_4 = 0x44420017,
-    RTD_IC_5 = 0x44420018,
-    RTD_IC_6 = 0x44420019,
-    RTD_IC_7 = 0x44420020,
-    RTD_IC_8 = 0x44420021,
-    RTD_IC_9 = 0x44420022,
-    RTD_IC_10 = 0x44420023,
-    RTD_IC_11 = 0x44420024,
-    RTD_IC_12 = 0x44420025,
-    RTD_IC_13 = 0x44420026,
-    RTD_IC_14 = 0x44420027,
-    RTD_IC_15 = 0x44420028,
-    RTD_IC_16 = 0x44420029,
-    RTD_IC_17 = 0x44420030,
-    RTD_IC_18 = 0x44420031,
+    RTD_0_IC3_PLOC_HEATSPREADER = 0x44420016,
+    RTD_1_IC4_PLOC_MISSIONBOARD = 0x44420017,
+    RTD_2_IC5_4K_CAMERA = 0x44420018,
+    RTD_3_IC6_DAC_HEATSPREADER = 0x44420019,
+    RTD_4_IC7_STARTRACKER = 0x44420020,
+    RTD_5_IC8_RW1_MX_MY = 0x44420021,
+    RTD_6_IC9_DRO = 0x44420022,
+    RTD_7_IC10_SCEX = 0x44420023,
+    RTD_8_IC11_X8 = 0x44420024,
+    RTD_9_IC12_HPA = 0x44420025,
+    RTD_10_IC13_PL_TX = 0x44420026,
+    RTD_11_IC14_MPA = 0x44420027,
+    RTD_12_IC15_ACU = 0x44420028,
+    RTD_13_IC16_PLPCDU_HEATSPREADER = 0x44420029,
+    RTD_14_IC17_TCS_BOARD = 0x44420030,
+    RTD_15_IC18_IMTQ = 0x44420031,

-    SUS_0 = 0x44120032,
-    SUS_1 = 0x44120033,
-    SUS_2 = 0x44120034,
-    SUS_3 = 0x44120035,
-    SUS_4 = 0x44120036,
-    SUS_5 = 0x44120037,
-    SUS_6 = 0x44120038,
-    SUS_7 = 0x44120039,
-    SUS_8 = 0x44120040,
-    SUS_9 = 0x44120041,
-    SUS_10 = 0x44120042,
-    SUS_11 = 0x44120043,
+    // Name convention for SUS devices
+    // SUS_<IDX>_<N/R>_LOC_X<F/M/B>Y<F/M/B>Z<F/M/B>_PT_<DIR><F/B>
+    // LOC: Location
+    // PT: Pointing
+    // N/R: Nominal/Redundant
+    // F/M/B: Forward/Middle/Backwards
+    SUS_0_N_LOC_XFYFZM_PT_XF = 0x44120032,
+    SUS_6_R_LOC_XFYBZM_PT_XF = 0x44120038,
+
+    SUS_1_N_LOC_XBYFZM_PT_XB = 0x44120033,
+    SUS_7_R_LOC_XBYBZM_PT_XB = 0x44120039,
+
+    SUS_2_N_LOC_XFYBZB_PT_YB = 0x44120034,
+    SUS_8_R_LOC_XBYBZB_PT_YB = 0x44120040,
+
+    SUS_3_N_LOC_XFYBZF_PT_YF = 0x44120035,
+    SUS_9_R_LOC_XBYBZB_PT_YF = 0x44120041,
+
+    SUS_4_N_LOC_XMYFZF_PT_ZF = 0x44120036,
+    SUS_10_N_LOC_XMYBZF_PT_ZF = 0x44120042,
+
+    SUS_5_N_LOC_XFYMZB_PT_ZB = 0x44120037,
+    SUS_11_R_LOC_XBYMZB_PT_ZB = 0x44120043,

    GPS_CONTROLLER = 0x44130045,