From cd247517fca46414331b7f9492c2fff371d9c3de Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 7 Dec 2023 10:34:02 -0500 Subject: [PATCH 1/2] 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) From fb8894048d291deb5cd054b0ba8ed0465b4ae0ec Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 12 Dec 2023 08:51:19 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for v1.3.0-rc4+dev69 --- CHANGELOG.md | 6 +++++- fsw/src/sample_app_version.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b16d91..f444e2a 100644 --- a/CHANGELOG.md +++ b/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 + +## 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 diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index 4498804..be86775 100644 --- a/fsw/src/sample_app_version.h +++ b/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 */