diff --git a/arch_build.cmake b/arch_build.cmake index 306476b..0c0ed47 100644 --- a/arch_build.cmake +++ b/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() diff --git a/config/default_to_lab_msgids.h b/config/default_to_lab_msgids.h index 1efc360..6459b20 100644 --- a/config/default_to_lab_msgids.h +++ b/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 diff --git a/config/default_to_lab_topicids.h b/config/default_to_lab_topicids.h new file mode 100644 index 0000000..17a9093 --- /dev/null +++ b/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://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 diff --git a/mission_build.cmake b/mission_build.cmake index 16344b3..6317f71 100644 --- a/mission_build.cmake +++ b/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)