Merge pull request nasa#181 from nasa/integration-candidate

to_lab Integration candidate: Caelum-rc4+dev66

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## Development Build: v2.5.0-rc4:dev71
+## Development Build: v2.5.0-rc4+dev75
+- define msgids via topicids
+- See <https://github.com/nasa/to_lab/pull/176>
+
+## Development Build: v2.5.0-rc4+dev71
 - Add timeout and packet limit on sending telemetry
 - See <https://github.com/nasa/to_lab/pull/173>
 

arch_build.cmake

@@ -20,8 +20,14 @@ set(TO_LAB_PLATFORM_CONFIG_FILE_LIST
 # This makes them individually overridable by the missions, without modifying
 # the distribution default copies
 foreach(TO_LAB_CFGFILE ${TO_LAB_PLATFORM_CONFIG_FILE_LIST})
+ get_filename_component(CFGKEY "${TO_LAB_CFGFILE}" NAME_WE)
+ if (DEFINED TO_LAB_CFGFILE_SRC_${CFGKEY})
+ set(DEFAULT_SOURCE GENERATED_FILE "${TO_LAB_CFGFILE_SRC_${CFGKEY}}")
+ else()
+ set(DEFAULT_SOURCE FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${TO_LAB_CFGFILE}")
+ endif()
  generate_config_includefile(
  FILE_NAME "${TO_LAB_CFGFILE}"
- FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${TO_LAB_CFGFILE}"
+ ${DEFAULT_SOURCE}
  )
 endforeach()

config/default_to_lab_msgids.h

@@ -23,10 +23,12 @@
 #ifndef TO_LAB_MSGIDS_H
 #define TO_LAB_MSGIDS_H
 
-#define TO_LAB_CMD_MID 0x1880
-#define TO_LAB_SEND_HK_MID 0x1881
+#include "cfe_core_api_base_msgids.h"
+#include "to_lab_topicids.h"
 
-#define TO_LAB_HK_TLM_MID 0x0880
-#define TO_LAB_DATA_TYPES_MID 0x0881
+#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)
 
 #endif

config/default_to_lab_topicids.h

@@ -0,0 +1,31 @@
+/************************************************************************
+ * 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:https://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
+ * TO_LAB Application Topic IDs
+ */
+#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
+
+#endif

fsw/src/to_lab_version.h

@@ -24,7 +24,7 @@
 #define TO_LAB_VERSION_H
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER 71 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER 75 /*!< Development Build: Number of commits since baseline */
 #define TO_LAB_BUILD_BASELINE \
  "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */
 

mission_build.cmake

@@ -20,6 +20,7 @@ set(TO_LAB_MISSION_CONFIG_FILE_LIST
  to_lab_tbl.h
  to_lab_tbldefs.h
  to_lab_tblstruct.h
+ to_lab_topicids.h
 )
 
 if (CFE_EDS_ENABLED_BUILD)