From cd247517fca46414331b7f9492c2fff371d9c3de Mon Sep 17 00:00:00 2001
From: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date: Thu, 7 Dec 2023 10:34:02 -0500
Subject: [PATCH] Fix #219, define msgids via topicids

The MsgID value is a conversion from TopicID
---
 arch_build.cmake                     |  8 +++++++-
 config/default_sample_app_msgids.h   | 11 +++++-----
 config/default_sample_app_topicids.h | 30 ++++++++++++++++++++++++++++
 mission_build.cmake                  |  1 +
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 config/default_sample_app_topicids.h

diff --git a/arch_build.cmake b/arch_build.cmake
index d2d95e2..c526397 100644
--- a/arch_build.cmake
+++ b/arch_build.cmake
@@ -20,8 +20,14 @@ set(SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST
 # This makes them individually overridable by the missions, without modifying
 # the distribution default copies
 foreach(SAMPLE_APP_CFGFILE ${SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST})
+  get_filename_component(CFGKEY "${SAMPLE_APP_CFGFILE}" NAME_WE)
+  if (DEFINED SAMPLE_APP_CFGFILE_SRC_${CFGKEY})
+    set(DEFAULT_SOURCE GENERATED_FILE "${SAMPLE_APP_CFGFILE_SRC_${CFGKEY}}")
+  else()
+    set(DEFAULT_SOURCE FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${SAMPLE_APP_CFGFILE}")
+  endif()
   generate_config_includefile(
     FILE_NAME           "${SAMPLE_APP_CFGFILE}"
-    FALLBACK_FILE       "${CMAKE_CURRENT_LIST_DIR}/config/default_${SAMPLE_APP_CFGFILE}"
+    ${DEFAULT_SOURCE}
   )
 endforeach()
diff --git a/config/default_sample_app_msgids.h b/config/default_sample_app_msgids.h
index 6b11e55..652c544 100644
--- a/config/default_sample_app_msgids.h
+++ b/config/default_sample_app_msgids.h
@@ -23,10 +23,11 @@
 #ifndef SAMPLE_APP_MSGIDS_H
 #define SAMPLE_APP_MSGIDS_H
 
-/* V1 Command Message IDs must be 0x18xx */
-#define SAMPLE_APP_CMD_MID     0x1882
-#define SAMPLE_APP_SEND_HK_MID 0x1883
-/* V1 Telemetry Message IDs must be 0x08xx */
-#define SAMPLE_APP_HK_TLM_MID 0x0883
+#include "cfe_core_api_base_msgids.h"
+#include "sample_app_topicids.h"
+
+#define SAMPLE_APP_CMD_MID     CFE_PLATFORM_CMD_TOPICID_TO_MIDV(SAMPLE_APP_CMD_TOPICID)
+#define SAMPLE_APP_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(SAMPLE_APP_SEND_HK_TOPICID)
+#define SAMPLE_APP_HK_TLM_MID  CFE_PLATFORM_TLM_TOPICID_TO_MIDV(SAMPLE_APP_HK_TLM_TOPICID)
 
 #endif
diff --git a/config/default_sample_app_topicids.h b/config/default_sample_app_topicids.h
new file mode 100644
index 0000000..cfb25b0
--- /dev/null
+++ b/config/default_sample_app_topicids.h
@@ -0,0 +1,30 @@
+/************************************************************************
+ * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
+ *
+ * Copyright (c) 2020 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ************************************************************************/
+
+/**
+ * @file
+ *   SAMPLE_APP Application Topic IDs
+ */
+#ifndef SAMPLE_APP_TOPICIDS_H
+#define SAMPLE_APP_TOPICIDS_H
+
+#define SAMPLE_APP_CMD_TOPICID       0x82
+#define SAMPLE_APP_SEND_HK_TOPICID   0x83
+#define SAMPLE_APP_HK_TLM_TOPICID    0x83
+
+#endif
diff --git a/mission_build.cmake b/mission_build.cmake
index 1cbd57f..7c156c6 100644
--- a/mission_build.cmake
+++ b/mission_build.cmake
@@ -20,6 +20,7 @@ set(SAMPLE_APP_MISSION_CONFIG_FILE_LIST
   sample_app_tbl.h
   sample_app_tbldefs.h
   sample_app_tblstruct.h
+  sample_app_topicids.h
 )
 
 if (CFE_EDS_ENABLED_BUILD)