Merge pull request #221 from nasa/integration-candidate

sample_app Integration candidate: Caelum-rc4+dev66

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## Development Build: 1.3.0-rc4+dev65
+## Development Build: v1.3.0-rc4+dev69
+- define msgids via topicids
+- See <https://github.com/nasa/sample_app/pull/220>
+
+## Development Build: v1.3.0-rc4+dev65
 - bring sample_app fully into compliance
 - Rename CommandCode variable to FcnCode
 - Add check for success of CFE_TBL_Load() during Initialization

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()

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

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

fsw/src/sample_app_version.h

@@ -27,7 +27,7 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_APP_BUILD_NUMBER 65 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_APP_BUILD_NUMBER 69 /*!< Development Build: Number of commits since baseline */
 #define SAMPLE_APP_BUILD_BASELINE \
     "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */
 

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)