Merge pull request #183 from jphickey/fix-182-prefix

Fix #182, add CFE_MISSION prefix to topicids
nasa · Dec 15, 2023 · 9b1d6d0 · 9b1d6d0
2 parents c2eaabb + d01c5e8
commit 9b1d6d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/config/default_to_lab_msgids.h b/config/default_to_lab_msgids.h
@@ -26,9 +26,9 @@
 #include "cfe_core_api_base_msgids.h"
 #include "to_lab_topicids.h"
 
-#define TO_LAB_CMD_MID        CFE_PLATFORM_CMD_TOPICID_TO_MIDV(TO_LAB_CMD_TOPICID)
-#define TO_LAB_SEND_HK_MID    CFE_PLATFORM_CMD_TOPICID_TO_MIDV(TO_LAB_SEND_HK_TOPICID)
-#define TO_LAB_HK_TLM_MID     CFE_PLATFORM_TLM_TOPICID_TO_MIDV(TO_LAB_HK_TLM_TOPICID)
-#define TO_LAB_DATA_TYPES_MID CFE_PLATFORM_TLM_TOPICID_TO_MIDV(TO_LAB_DATA_TYPES_TOPICID)
+#define TO_LAB_CMD_MID        CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_TO_LAB_CMD_TOPICID)
+#define TO_LAB_SEND_HK_MID    CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_TO_LAB_SEND_HK_TOPICID)
+#define TO_LAB_HK_TLM_MID     CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_TO_LAB_HK_TLM_TOPICID)
+#define TO_LAB_DATA_TYPES_MID CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_TO_LAB_DATA_TYPES_TOPICID)
 
 #endif
diff --git a/config/default_to_lab_topicids.h b/config/default_to_lab_topicids.h
@@ -23,9 +23,9 @@
 #ifndef TO_LAB_TOPICIDS_H
 #define TO_LAB_TOPICIDS_H
 
-#define TO_LAB_CMD_TOPICID        0x80
-#define TO_LAB_SEND_HK_TOPICID    0x81
-#define TO_LAB_HK_TLM_TOPICID     0x80
-#define TO_LAB_DATA_TYPES_TOPICID 0x81
+#define CFE_MISSION_TO_LAB_CMD_TOPICID        0x80
+#define CFE_MISSION_TO_LAB_SEND_HK_TOPICID    0x81
+#define CFE_MISSION_TO_LAB_HK_TLM_TOPICID     0x80
+#define CFE_MISSION_TO_LAB_DATA_TYPES_TOPICID 0x81
 
 #endif