Merge remote-tracking branch 'origin/develop' into mueller/rename-sus

common/config/commonObjects.h

@@ -48,22 +48,22 @@ 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,
 
     // 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>