updated object IDs

common/config/commonObjects.h

@@ -6,34 +6,34 @@
 namespace objects {
 enum commonObjects: uint32_t {
 	/* First Byte 0x50-0x52 reserved for PUS Services **/
-	CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
+    CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
-	PUS_PACKET_DISTRIBUTOR = 0x50000200,
+    PUS_PACKET_DISTRIBUTOR = 0x50000200,
-	UDP_BRIDGE = 0x50000300,
+    UDP_BRIDGE = 0x50000300,
-	UDP_POLLING_TASK = 0x50000400,
+    UDP_POLLING_TASK = 0x50000400,
 
     /* 0x43 ('C') for Controllers */
-    THERMAL_CONTROLLER = 0x43001000,
+    THERMAL_CONTROLLER = 0x43400001,
-    ATTITUDE_CONTROLLER = 0x43002000,
+    ACS_CONTROLLER = 0x43100002,
-    ACS_CONTROLLER = 0x43003000,
+    CORE_CONTROLLER = 0x43000003,
-    CORE_CONTROLLER = 0x43004000,
 
-	/* 0x44 ('D') for device handlers */
+    /* 0x44 ('D') for device handlers */
-	P60DOCK_HANDLER = 0x44000001,
+    P60DOCK_HANDLER = 0x44200001,
-	PDU1_HANDLER = 0x44000002,
+    PDU1_HANDLER = 0x44200002,
-	PDU2_HANDLER = 0x44000003,
+    PDU2_HANDLER = 0x44200003,
-	ACU_HANDLER = 0x44000004,
+    ACU_HANDLER = 0x44200004,
-	TMP1075_HANDLER_1 = 0x44000005,
+    TMP1075_HANDLER_1 = 0x44400005,
-	TMP1075_HANDLER_2 = 0x44000006,
+    TMP1075_HANDLER_2 = 0x44400006,
-    MGM_0_LIS3_HANDLER = 0x44000007,
+    MGM_0_LIS3_HANDLER = 0x44100007,
-	MGM_1_RM3100_HANDLER = 0x44000008,
+    MGM_1_RM3100_HANDLER = 0x44100008,
-	MGM_2_LIS3_HANDLER = 0x44000009,
+    MGM_2_LIS3_HANDLER = 0x44100009,
-	MGM_3_RM3100_HANDLER = 0x44000010,
+    MGM_3_RM3100_HANDLER = 0x44100010,
-	GYRO_0_ADIS_HANDLER = 0x44000011,
+    GYRO_0_ADIS_HANDLER = 0x44100011,
-	GYRO_1_L3G_HANDLER = 0x44000012,
+    GYRO_1_L3G_HANDLER = 0x44100012,
-	GYRO_2_L3G_HANDLER = 0x44000013,
+    GYRO_2_ADIS_HANDLER = 0x44100013,
+    GYRO_3_L3G_HANDLER = 0x44100014,
 
-	IMTQ_HANDLER = 0x44000014,
+    IMTQ_HANDLER = 0x44100014,
-	PLOC_HANDLER = 0x44000015,
+    PLOC_HANDLER = 0x44300015,
 
     SUS_1 = 0x44000016,
     SUS_2 = 0x44000017,

linux/fsfwconfig/objects/systemObjectList.h

@@ -6,67 +6,85 @@
 #include <cstdint>
 
 // The objects will be instantiated in the ID order
+// For naming scheme see flight manual
+/*
+https://egit.irs.uni-stuttgart.de/redmine/projects/eive-flight-manual/wiki/EIVE_Project_IDs
+
+Second byte first four bits is the subsystem:
+OBDH 0x0
+ACS  0x1
+EPS  0x2
+PL   0x3
+TCS  0x4
+COM  0x5
+
+Second byte last four bits is the bus:
+None 0x0
+GPIO 0x1
+SPI  0x2
+UART 0x3
+I2C  0x4
+CAN  0x5
+
+Third byte is an assembly counter if there are multiple redundant devices.
+Fourth byte is a unique counter.
+
+ */
 namespace objects {
-	enum sourceObjects: uint32_t {
+enum sourceObjects: uint32_t {
-	    /* 0x53 reserved for FSFW */
+    /* 0x53 reserved for FSFW */
-	    FW_ADDRESS_START = PUS_SERVICE_1_VERIFICATION,
+    FW_ADDRESS_START = PUS_SERVICE_1_VERIFICATION,
-	    FW_ADDRESS_END = TIME_STAMPER,
+    FW_ADDRESS_END = TIME_STAMPER,
+    PUS_SERVICE_6 = 0x51000500,
 
-		CCSDS_IP_CORE_BRIDGE = 0x50000500,
+    CCSDS_IP_CORE_BRIDGE = 0x73500000,
+    TM_FUNNEL = 0x73000100,
 
-		PUS_SERVICE_6 = 0x51000500,
+    /* 0x49 ('I') for Communication Interfaces **/
+    ARDUINO_COM_IF = 0x49000000,
+    CSP_COM_IF = 0x49050001,
+    I2C_COM_IF = 0x49040002,
+    UART_COM_IF = 0x49030003,
+    SPI_COM_IF = 0x49020004,
+    GPIO_IF = 0x49010005,
 
-		TM_FUNNEL = 0x52000002,
+    /* Custom device handler */
+    PCDU_HANDLER = 0x44200032,
+    SOLAR_ARRAY_DEPL_HANDLER = 0x44410033,
+    SYRLINKS_HK_HANDLER = 0x44530034,
+    HEATER_HANDLER = 0x44410035,
+    /**
+     * 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_IC3 = 0x44420036,
+    RTD_IC4 = 0x44420037,
+    RTD_IC5 = 0x44420038,
+    RTD_IC6 = 0x44420039,
+    RTD_IC7 = 0x44420040,
+    RTD_IC8 = 0x44420041,
+    RTD_IC9 = 0x44420042,
+    RTD_IC10 = 0x44420043,
+    RTD_IC11 = 0x44420044,
+    RTD_IC12 = 0x44420045,
+    RTD_IC13 = 0x44420046,
+    RTD_IC14 = 0x44420047,
+    RTD_IC15 = 0x44420048,
+    RTD_IC16 = 0x44420049,
+    RTD_IC17 = 0x44420050,
+    RTD_IC18 = 0x44420051,
 
-		/* 0x49 ('I') for Communication Interfaces **/
+    RAD_SENSOR = 0x44300052,
-		ARDUINO_COM_IF = 0x49000001,
-		CSP_COM_IF = 0x49000002,
-		I2C_COM_IF = 0x49000003,
-		UART_COM_IF = 0x49000004,
-		SPI_COM_IF = 0x49000005,
 
-		/* 0x47 ('G') for Gpio Interfaces */
+    /* 0x54 ('T') for test handlers */
-		GPIO_IF = 0x47000001,
+    TEST_TASK = 0x54694269,
-
+    LIBGPIOD_TEST = 0x54123456,
-		/* Custom device handler */
+    SPI_TEST = 0x54000010,
-		PCDU_HANDLER = 0x44001000,
+    UART_TEST = 0x54000020,
-		SOLAR_ARRAY_DEPL_HANDLER = 0x44001001,
+    DUMMY_INTERFACE = 0x5400CAFE,
-		SYRLINKS_HK_HANDLER = 0x44001002,
+    DUMMY_HANDLER = 0x5400AFFE,
-
+    P60DOCK_TEST_TASK = 0x00005060
-		/* 0x54 ('T') for thermal objects */
+};
-		HEATER_HANDLER = 0x54000003,
-		/**
-		 * 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_IC3 = 0x54000004,
-		RTD_IC4 = 0x54000005,
-		RTD_IC5 = 0x54000006,
-		RTD_IC6 = 0x54000007,
-		RTD_IC7 = 0x54000008,
-		RTD_IC8 = 0x54000009,
-		RTD_IC9 = 0x5400000A,
-		RTD_IC10 = 0x5400000B,
-		RTD_IC11 = 0x5400000C,
-		RTD_IC12 = 0x5400000D,
-		RTD_IC13 = 0x5400000E,
-		RTD_IC14 = 0x5400000F,
-		RTD_IC15 = 0x5400001F,
-		RTD_IC16 = 0x5400002F,
-		RTD_IC17 = 0x5400003F,
-		RTD_IC18 = 0x5400004F,
-
-		RAD_SENSOR = 0x54000050,
-
-		/* 0x54 ('T') for test handlers */
-        TEST_TASK = 0x54694269,
-        LIBGPIOD_TEST = 0x54123456,
-        SPI_TEST = 0x54000010,
-        UART_TEST = 0x54000020,
-        DUMMY_INTERFACE = 0x5400CAFE,
-        DUMMY_HANDLER = 0x5400AFFE,
-        P60DOCK_TEST_TASK = 0x00005060
-	};
 }
 
 #endif /* BSP_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ */