fixed merge conflicts

2021-06-11 14:55:28 +02:00
parent b84a81556f d42a273336
commit 46d49e130b
59 changed files with 333 additions and 118 deletions
--- a/common/config/commonClassIds.h
+++ b/common/config/commonClassIds.h
@ -6,7 +6,7 @@

 namespace CLASS_ID {
 enum commonClassIds: uint8_t {
-	MISSION_CLASS_ID_START = FW_CLASS_ID_COUNT,
+	COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT,
 	MGM_LIS3MDL, //MGMLIS3
 	MGM_RM3100, //MGMRM3100
 	PCDU_HANDLER, //PCDU
--- a/common/config/commonConfig.h.in
+++ b/common/config/commonConfig.h.in
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -11,6 +11,12 @@ enum commonObjects: uint32_t {
 	UDP_BRIDGE = 0x50000300,
 	UDP_POLLING_TASK = 0x50000400,

+    /* 0x43 ('C') for Controllers */
+    THERMAL_CONTROLLER = 0x43001000,
+    ATTITUDE_CONTROLLER = 0x43002000,
+    ACS_CONTROLLER = 0x43003000,
+    CORE_CONTROLLER = 0x43004000,
+
 	/* 0x44 ('D') for device handlers */
 	P60DOCK_HANDLER = 0x44000001,
 	PDU1_HANDLER = 0x44000002,