From c37cedad019f1344d314b02c6c883d089a6a0994 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 22 Jan 2026 17:03:36 -0500 Subject: [PATCH] NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" Batch update of latest cFS software release Reflects commit 71681c4ed98d9a0cb32284bcce4cb97105c60988 from NASA internal development repo --- .github/workflows/codeql-build.yml | 11 +++- .github/workflows/format-check.yml | 6 +- .github/workflows/static-analysis.yml | 8 +++ CMakeLists.txt | 2 +- arch_build.cmake | 20 ++----- config/default_sample_app_fcncode_values.h | 45 ++++++++++++++ ...default_sample_app_interface_cfg_values.h} | 20 +++---- ... default_sample_app_internal_cfg_values.h} | 21 +++---- config/default_sample_app_mission_cfg.h | 10 ++-- config/default_sample_app_msg.h | 10 ++-- config/default_sample_app_msgdefs.h | 20 +++---- config/default_sample_app_msgid_values.h | 32 ++++++++++ config/default_sample_app_msgids.h | 16 ++--- config/default_sample_app_msgstruct.h | 8 +-- config/default_sample_app_perfids.h | 4 +- config/default_sample_app_platform_cfg.h | 10 ++-- config/default_sample_app_tbl.h | 11 ++-- config/default_sample_app_tbldefs.h | 10 +--- config/default_sample_app_tblstruct.h | 6 +- ....h => default_sample_app_topicid_values.h} | 14 ++--- config/eds_sample_app_fcncode_values.h | 39 ++++++++++++ config/eds_sample_app_interface_cfg_values.h | 39 ++++++++++++ config/eds_sample_app_msgdefs.h | 30 ++++++++++ config/eds_sample_app_msgstruct.h | 32 ++++++++++ config/eds_sample_app_tbldefs.h | 29 +++++++++ config/eds_sample_app_topicid_values.h | 30 ++++++++++ eds/sample_app.xml | 5 ++ fsw/inc/sample_app_eventids.h | 4 +- .../inc/sample_app_fcncodes.h | 14 +++-- fsw/inc/sample_app_interface_cfg.h | 46 +++++++++++++++ fsw/inc/sample_app_internal_cfg.h | 59 +++++++++++++++++++ fsw/inc/sample_app_topicids.h | 35 +++++++++++ fsw/src/sample_app.c | 9 +-- fsw/src/sample_app.h | 6 +- fsw/src/sample_app_cmds.c | 6 +- fsw/src/sample_app_cmds.h | 4 +- fsw/src/sample_app_dispatch.c | 42 ++++++++----- fsw/src/sample_app_dispatch.h | 4 +- fsw/src/sample_app_eds_dispatch.c | 28 ++++++--- fsw/src/sample_app_utils.c | 8 +-- fsw/src/sample_app_utils.h | 4 +- fsw/src/sample_app_version.h | 20 +++---- fsw/tables/sample_app_tbl.c | 4 +- mission_build.cmake | 33 ++--------- unit-test/common/eventcheck.c | 4 +- unit-test/common/eventcheck.h | 4 +- unit-test/common/setup.c | 4 +- unit-test/common/setup.h | 4 +- .../coveragetest/coveragetest_sample_app.c | 4 +- .../coveragetest_sample_app_cmds.c | 4 +- .../coveragetest_sample_app_dispatch.c | 4 +- .../coveragetest_sample_app_eds_dispatch.c | 4 +- .../coveragetest_sample_app_utils.c | 10 ++-- .../sample_app_coveragetest_common.h | 4 +- unit-test/stubs/sample_app_cmds_stubs.c | 4 +- unit-test/stubs/sample_app_dispatch_stubs.c | 4 +- unit-test/stubs/sample_app_global_stubs.c | 5 +- unit-test/stubs/sample_app_stubs.c | 4 +- unit-test/stubs/sample_app_utils_stubs.c | 4 +- 59 files changed, 640 insertions(+), 241 deletions(-) create mode 100644 config/default_sample_app_fcncode_values.h rename config/{default_sample_app_interface_cfg.h => default_sample_app_interface_cfg_values.h} (72%) rename config/{default_sample_app_internal_cfg.h => default_sample_app_internal_cfg_values.h} (69%) create mode 100644 config/default_sample_app_msgid_values.h rename config/{default_sample_app_topicids.h => default_sample_app_topicid_values.h} (66%) create mode 100644 config/eds_sample_app_fcncode_values.h create mode 100644 config/eds_sample_app_interface_cfg_values.h create mode 100644 config/eds_sample_app_msgdefs.h create mode 100644 config/eds_sample_app_msgstruct.h create mode 100644 config/eds_sample_app_tbldefs.h create mode 100644 config/eds_sample_app_topicid_values.h rename config/default_sample_app_fcncodes.h => fsw/inc/sample_app_fcncodes.h (76%) create mode 100644 fsw/inc/sample_app_interface_cfg.h create mode 100644 fsw/inc/sample_app_internal_cfg.h create mode 100644 fsw/inc/sample_app_topicids.h diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index 2753b54..78741ba 100644 --- a/.github/workflows/codeql-build.yml +++ b/.github/workflows/codeql-build.yml @@ -2,14 +2,21 @@ name: CodeQl Analysis on: push: + branches: + - dev + - main pull_request: - + types: + - opened + - reopened + - synchronize + workflow_dispatch: jobs: codeql: name: Codeql Analysis uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main - with: + with: component-path: apps/sample_app prep: 'make prep; make -C build/tools/elf2cfetbl' make: 'make -C build/native/default_cpu1/apps/sample_app' diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 2d73eeb..441199a 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -2,11 +2,13 @@ name: Format Check # Run on all push and pull requests on: - push: pull_request: + types: + - opened + - reopened + - synchronize jobs: format-check: name: Run format check uses: nasa/cFS/.github/workflows/format-check.yml@main - \ No newline at end of file diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 7a210aa..ffe1ea2 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -3,7 +3,15 @@ name: Static Analysis # Run on all push and pull requests on: push: + branches: + - dev + - main pull_request: + types: + - opened + - reopened + - synchronize + workflow_dispatch: jobs: static-analysis: diff --git a/CMakeLists.txt b/CMakeLists.txt index de20ccd..3a30b60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(APP_SRC_FILES fsw/src/sample_app_utils.c ) -if (CFE_EDS_ENABLED_BUILD) +if (CFE_EDS_ENABLED) list(APPEND APP_SRC_FILES fsw/src/sample_app_eds_dispatch.c ) diff --git a/arch_build.cmake b/arch_build.cmake index c526397..66346e6 100644 --- a/arch_build.cmake +++ b/arch_build.cmake @@ -10,24 +10,12 @@ # The list of header files that control the SAMPLE_APP configuration set(SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST - sample_app_internal_cfg.h + sample_app_internal_cfg_values.h sample_app_platform_cfg.h sample_app_perfids.h sample_app_msgids.h + sample_app_msgid_values.h ) -# Create wrappers around the all the config header files -# 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}" - ${DEFAULT_SOURCE} - ) -endforeach() +generate_configfile_set(${SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST}) + diff --git a/config/default_sample_app_fcncode_values.h b/config/default_sample_app_fcncode_values.h new file mode 100644 index 0000000..01e304d --- /dev/null +++ b/config/default_sample_app_fcncode_values.h @@ -0,0 +1,45 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + * Specification for the CFE Executive Services (CFE_ES) command function codes + * + * @note + * This file should be strictly limited to the command/function code (CC) + * macro definitions. Other definitions such as enums, typedefs, or other + * macros should be placed in the msgdefs.h or msg.h files. + */ +#ifndef DEFAULT_SAMPLE_APP_FCNCODE_VALUES_H +#define DEFAULT_SAMPLE_APP_FCNCODE_VALUES_H + +/************************************************************************ + * Macro Definitions + ************************************************************************/ + +#define SAMPLE_APP_CCVAL(x) SAMPLE_APP_FunctionCode_##x + +enum SAMPLE_APP_FunctionCode_ +{ + SAMPLE_APP_FunctionCode_NOOP = 0, + SAMPLE_APP_FunctionCode_RESET_COUNTERS = 1, + SAMPLE_APP_FunctionCode_PROCESS = 2, + SAMPLE_APP_FunctionCode_DISPLAY_PARAM = 3, +}; + +#endif diff --git a/config/default_sample_app_interface_cfg.h b/config/default_sample_app_interface_cfg_values.h similarity index 72% rename from config/default_sample_app_interface_cfg.h rename to config/default_sample_app_interface_cfg_values.h index aac83dd..cd0f1fd 100644 --- a/config/default_sample_app_interface_cfg.h +++ b/config/default_sample_app_interface_cfg_values.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -25,20 +25,14 @@ * interface, tables definitions, and any other data products that * serve to exchange information with other entities. * - * @note This file may be overridden/superceded by mission-provided defintions + * @note This file may be overridden/superceded by mission-provided definitionsm * either by overriding this header or by generating definitions from a command/data * dictionary tool. */ -#ifndef SAMPLE_APP_INTERFACE_CFG_H -#define SAMPLE_APP_INTERFACE_CFG_H +#ifndef DEFAULT_SAMPLE_APP_INTERFACE_CFG_H +#define DEFAULT_SAMPLE_APP_INTERFACE_CFG_H -/** - * \brief Length of string buffer in the Display Value command - * - * The Display Value command offers an example of how to use command - * parameters of different types. This macro controls the length - * of the string parameter. - */ -#define SAMPLE_APP_STRING_VAL_LEN 10 +/* Use the default configuration value for all */ +#define SAMPLE_APP_MISSION_CFGVAL(x) DEFAULT_SAMPLE_APP_MISSION_##x #endif diff --git a/config/default_sample_app_internal_cfg.h b/config/default_sample_app_internal_cfg_values.h similarity index 69% rename from config/default_sample_app_internal_cfg.h rename to config/default_sample_app_internal_cfg_values.h index 145f040..9324062 100644 --- a/config/default_sample_app_internal_cfg.h +++ b/config/default_sample_app_internal_cfg_values.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -25,21 +25,14 @@ * to items in this file only affect the local module and will be transparent * to external entities that are using the public interface(s). * - * @note This file may be overridden/superceded by mission-provided defintions + * @note This file may be overridden/superceded by mission-provided definitions * either by overriding this header or by generating definitions from a command/data * dictionary tool. */ -#ifndef SAMPLE_APP_INTERNAL_CFG_H -#define SAMPLE_APP_INTERNAL_CFG_H +#ifndef DEFAULT_SAMPLE_APP_INTERNAL_CFG_H +#define DEFAULT_SAMPLE_APP_INTERNAL_CFG_H -/***********************************************************************/ -#define SAMPLE_APP_PIPE_DEPTH 32 /* Depth of the Command Pipe for Application */ -#define SAMPLE_APP_PIPE_NAME "SAMPLE_APP_CMD_PIPE" - -#define SAMPLE_APP_NUMBER_OF_TABLES 1 /* Number of Example Table(s) */ - -#define SAMPLE_APP_TABLE_OUT_OF_RANGE_ERR_CODE -1 - -#define SAMPLE_APP_TBL_ELEMENT_1_MAX 10 +/* Use the default configuration value for all */ +#define SAMPLE_APP_PLATFORM_CFGVAL(x) DEFAULT_SAMPLE_APP_PLATFORM_##x #endif diff --git a/config/default_sample_app_mission_cfg.h b/config/default_sample_app_mission_cfg.h index 9c5d166..c521424 100644 --- a/config/default_sample_app_mission_cfg.h +++ b/config/default_sample_app_mission_cfg.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -24,12 +24,12 @@ * This is a compatibility header for the "mission_cfg.h" file that has * traditionally provided public config definitions for each CFS app. * - * @note This file may be overridden/superceded by mission-provided defintions + * @note This file may be overridden/superceded by mission-provided definitions * either by overriding this header or by generating definitions from a command/data * dictionary tool. */ -#ifndef SAMPLE_APP_MISSION_CFG_H -#define SAMPLE_APP_MISSION_CFG_H +#ifndef DEFAULT_SAMPLE_APP_MISSION_CFG_H +#define DEFAULT_SAMPLE_APP_MISSION_CFG_H #include "sample_app_interface_cfg.h" diff --git a/config/default_sample_app_msg.h b/config/default_sample_app_msg.h index 1d94e43..10d789c 100644 --- a/config/default_sample_app_msg.h +++ b/config/default_sample_app_msg.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -24,12 +24,12 @@ * This is a compatibility header for the "sample_app_msg.h" file that has * traditionally provided the message definitions for cFS apps. * - * @note This file may be overridden/superceded by mission-provided defintions + * @note This file may be overridden/superceded by mission-provided definitions * either by overriding this header or by generating definitions from a command/data * dictionary tool. */ -#ifndef SAMPLE_APP_MSG_H -#define SAMPLE_APP_MSG_H +#ifndef DEFAULT_SAMPLE_APP_MSG_H +#define DEFAULT_SAMPLE_APP_MSG_H #include "sample_app_mission_cfg.h" #include "sample_app_msgdefs.h" diff --git a/config/default_sample_app_msgdefs.h b/config/default_sample_app_msgdefs.h index 1e4d10e..3cf27e4 100644 --- a/config/default_sample_app_msgdefs.h +++ b/config/default_sample_app_msgdefs.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -19,21 +19,19 @@ /** * @file * Specification for the SAMPLE_APP command and telemetry - * message constant definitions. - * - * For SAMPLE_APP this is only the function/command code definitions + * message payload and constant definitions. */ -#ifndef SAMPLE_APP_MSGDEFS_H -#define SAMPLE_APP_MSGDEFS_H +#ifndef DEFAULT_SAMPLE_APP_MSGDEFS_H +#define DEFAULT_SAMPLE_APP_MSGDEFS_H #include "common_types.h" #include "sample_app_fcncodes.h" typedef struct SAMPLE_APP_DisplayParam_Payload { - uint32 ValU32; /**< 32 bit unsigned integer value */ - int16 ValI16; /**< 16 bit signed integer value */ - char ValStr[SAMPLE_APP_STRING_VAL_LEN]; /**< An example string */ + uint32 ValU32; /**< 32 bit unsigned integer value */ + int16 ValI16; /**< 16 bit signed integer value */ + char ValStr[SAMPLE_APP_MISSION_STRING_VAL_LEN]; /**< An example string */ } SAMPLE_APP_DisplayParam_Payload_t; /*************************************************************************/ @@ -43,8 +41,8 @@ typedef struct SAMPLE_APP_DisplayParam_Payload typedef struct SAMPLE_APP_HkTlm_Payload { - uint8 CommandErrorCounter; uint8 CommandCounter; + uint8 CommandErrorCounter; uint8 spare[2]; } SAMPLE_APP_HkTlm_Payload_t; diff --git a/config/default_sample_app_msgid_values.h b/config/default_sample_app_msgid_values.h new file mode 100644 index 0000000..154355b --- /dev/null +++ b/config/default_sample_app_msgid_values.h @@ -0,0 +1,32 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 DEFAULT_SAMPLE_APP_MSGID_VALUES_H +#define DEFAULT_SAMPLE_APP_MSGID_VALUES_H + +#include "cfe_core_api_base_msgids.h" +#include "sample_app_topicids.h" + +#define SAMPLE_APP_CMD_PLATFORM_MIDVAL(x) CFE_PLATFORM_CMD_TOPICID_TO_MIDV(SAMPLE_APP_MISSION_##x##_TOPICID) +#define SAMPLE_APP_TLM_PLATFORM_MIDVAL(x) CFE_PLATFORM_TLM_TOPICID_TO_MIDV(SAMPLE_APP_MISSION_##x##_TOPICID) + +#endif diff --git a/config/default_sample_app_msgids.h b/config/default_sample_app_msgids.h index d3c0c16..f9e70a4 100644 --- a/config/default_sample_app_msgids.h +++ b/config/default_sample_app_msgids.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -20,14 +20,14 @@ * @file * SAMPLE_APP Application Message IDs */ -#ifndef SAMPLE_APP_MSGIDS_H -#define SAMPLE_APP_MSGIDS_H +#ifndef DEFAULT_SAMPLE_APP_MSGIDS_H +#define DEFAULT_SAMPLE_APP_MSGIDS_H #include "cfe_core_api_base_msgids.h" -#include "sample_app_topicids.h" +#include "sample_app_msgid_values.h" -#define SAMPLE_APP_CMD_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_SAMPLE_APP_CMD_TOPICID) -#define SAMPLE_APP_SEND_HK_MID CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_SAMPLE_APP_SEND_HK_TOPICID) -#define SAMPLE_APP_HK_TLM_MID CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_SAMPLE_APP_HK_TLM_TOPICID) +#define SAMPLE_APP_CMD_MID SAMPLE_APP_CMD_PLATFORM_MIDVAL(CMD) +#define SAMPLE_APP_SEND_HK_MID SAMPLE_APP_CMD_PLATFORM_MIDVAL(SEND_HK) +#define SAMPLE_APP_HK_TLM_MID SAMPLE_APP_TLM_PLATFORM_MIDVAL(HK_TLM) #endif diff --git a/config/default_sample_app_msgstruct.h b/config/default_sample_app_msgstruct.h index 03327c9..74bf193 100644 --- a/config/default_sample_app_msgstruct.h +++ b/config/default_sample_app_msgstruct.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -25,8 +25,8 @@ * Constants and enumerated types related to these message structures * are defined in sample_app_msgdefs.h. */ -#ifndef SAMPLE_APP_MSGSTRUCT_H -#define SAMPLE_APP_MSGSTRUCT_H +#ifndef DEFAULT_SAMPLE_APP_MSGSTRUCT_H +#define DEFAULT_SAMPLE_APP_MSGSTRUCT_H /************************************************************************ * Includes diff --git a/config/default_sample_app_perfids.h b/config/default_sample_app_perfids.h index 5c83334..c948bed 100644 --- a/config/default_sample_app_perfids.h +++ b/config/default_sample_app_perfids.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/config/default_sample_app_platform_cfg.h b/config/default_sample_app_platform_cfg.h index d62a136..7429619 100644 --- a/config/default_sample_app_platform_cfg.h +++ b/config/default_sample_app_platform_cfg.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -28,12 +28,12 @@ * These definitions are now provided in two separate files, one for * the public/mission scope and one for internal scope. * - * @note This file may be overridden/superceded by mission-provided defintions + * @note This file may be overridden/superceded by mission-provided definitions * either by overriding this header or by generating definitions from a command/data * dictionary tool. */ -#ifndef SAMPLE_APP_PLATFORM_CFG_H -#define SAMPLE_APP_PLATFORM_CFG_H +#ifndef DEFAULT_SAMPLE_APP_PLATFORM_CFG_H +#define DEFAULT_SAMPLE_APP_PLATFORM_CFG_H #include "sample_app_mission_cfg.h" #include "sample_app_internal_cfg.h" diff --git a/config/default_sample_app_tbl.h b/config/default_sample_app_tbl.h index f62b974..ee19b54 100644 --- a/config/default_sample_app_tbl.h +++ b/config/default_sample_app_tbl.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -24,13 +24,10 @@ * Constants and enumerated types related to these table structures * are defined in sample_app_tbldefs.h. */ -#ifndef SAMPLE_APP_TBL_H -#define SAMPLE_APP_TBL_H +#ifndef DEFAULT_SAMPLE_APP_TBL_H +#define DEFAULT_SAMPLE_APP_TBL_H #include "sample_app_tbldefs.h" #include "sample_app_tblstruct.h" -/* Define filenames of default data images for tables */ -#define SAMPLE_APP_TABLE_FILE "/cf/sample_app_tbl.tbl" - #endif diff --git a/config/default_sample_app_tbldefs.h b/config/default_sample_app_tbldefs.h index d478f00..2f500e6 100644 --- a/config/default_sample_app_tbldefs.h +++ b/config/default_sample_app_tbldefs.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -20,12 +20,6 @@ * @file * Specification for the SAMPLE_APP table related * constant definitions. - * - * @note - * These Macro definitions have been put in this file (instead of - * sample_app_tbl.h). DO NOT PUT ANY TYPEDEFS OR - * STRUCTURE DEFINITIONS IN THIS FILE! - * ADD THEM TO sample_app_tbl.h IF NEEDED! */ #ifndef SAMPLE_APP_TBLDEFS_H #define SAMPLE_APP_TBLDEFS_H diff --git a/config/default_sample_app_tblstruct.h b/config/default_sample_app_tblstruct.h index 3cd7882..6530d53 100644 --- a/config/default_sample_app_tblstruct.h +++ b/config/default_sample_app_tblstruct.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -22,7 +22,7 @@ * * Provides default definitions for SAMPLE_APP table structures * - * @note This file may be overridden/superceded by mission-provided defintions + * @note This file may be overridden/superceded by mission-provided definitions * either by overriding this header or by generating definitions from a command/data * dictionary tool. */ diff --git a/config/default_sample_app_topicids.h b/config/default_sample_app_topicid_values.h similarity index 66% rename from config/default_sample_app_topicids.h rename to config/default_sample_app_topicid_values.h index c78676e..56b2a19 100644 --- a/config/default_sample_app_topicids.h +++ b/config/default_sample_app_topicid_values.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -18,13 +18,11 @@ /** * @file - * SAMPLE_APP Application Topic IDs + * Specification for the SAMPLE_APP topic ID values */ -#ifndef SAMPLE_APP_TOPICIDS_H -#define SAMPLE_APP_TOPICIDS_H +#ifndef DEFAULT_SAMPLE_APP_TOPICID_VALUES_H +#define DEFAULT_SAMPLE_APP_TOPICID_VALUES_H -#define CFE_MISSION_SAMPLE_APP_CMD_TOPICID 0x82 -#define CFE_MISSION_SAMPLE_APP_SEND_HK_TOPICID 0x83 -#define CFE_MISSION_SAMPLE_APP_HK_TLM_TOPICID 0x83 +#define SAMPLE_APP_MISSION_TIDVAL(x) DEFAULT_SAMPLE_APP_MISSION_##x##_TOPICID #endif diff --git a/config/eds_sample_app_fcncode_values.h b/config/eds_sample_app_fcncode_values.h new file mode 100644 index 0000000..3b9aea0 --- /dev/null +++ b/config/eds_sample_app_fcncode_values.h @@ -0,0 +1,39 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + * Specification for the CFE Executive Services (SAMPLE_APP) command function codes + * + * @note + * This file should be strictly limited to the command/function code (CC) + * macro definitions. Other definitions such as enums, typedefs, or other + * macros should be placed in the msgdefs.h or msg.h files. + */ +#ifndef EDS_SAMPLE_APP_FCNCODES_H +#define EDS_SAMPLE_APP_FCNCODES_H + +#include "sample_app_eds_cc.h" + +/************************************************************************ + * Macro Definitions + ************************************************************************/ + +#define SAMPLE_APP_CCVAL(x) EDS_CONTAINER_SAMPLE_APP_##x##_CC + +#endif diff --git a/config/eds_sample_app_interface_cfg_values.h b/config/eds_sample_app_interface_cfg_values.h new file mode 100644 index 0000000..e8e7a72 --- /dev/null +++ b/config/eds_sample_app_interface_cfg_values.h @@ -0,0 +1,39 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 Public Definitions + * + * This provides default values for configurable items that affect + * the interface(s) of this module. This includes the CMD/TLM message + * interface, tables definitions, and any other data products that + * serve to exchange information with other entities. + * + * @note This file may be overridden/superceded by mission-provided definitions + * either by overriding this header or by generating definitions from a command/data + * dictionary tool. + */ +#ifndef EDS_SAMPLE_APP_INTERFACE_CFG_H +#define EDS_SAMPLE_APP_INTERFACE_CFG_H + +#include "cfe_mission_eds_designparameters.h" + +#define CFE_MISSION_ES_CFGVAL(x) EdsParam_CFE_MISSION_ES_##x + +#endif diff --git a/config/eds_sample_app_msgdefs.h b/config/eds_sample_app_msgdefs.h new file mode 100644 index 0000000..3070b77 --- /dev/null +++ b/config/eds_sample_app_msgdefs.h @@ -0,0 +1,30 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + * Specification for the SAMPLE_APP command and telemetry + * message payload and constant definitions. + */ +#ifndef EDS_SAMPLE_APP_MSGDEFS_H +#define EDS_SAMPLE_APP_MSGDEFS_H + +#include "sample_app_eds_typedefs.h" +#include "sample_app_fcncodes.h" + +#endif diff --git a/config/eds_sample_app_msgstruct.h b/config/eds_sample_app_msgstruct.h new file mode 100644 index 0000000..dbb62a2 --- /dev/null +++ b/config/eds_sample_app_msgstruct.h @@ -0,0 +1,32 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + * Specification for the SAMPLE_APP command and telemetry + * message data types. + */ +#ifndef EDS_SAMPLE_APP_MSGSTRUCT_H +#define EDS_SAMPLE_APP_MSGSTRUCT_H + +/************************************************************************ + * Includes + ************************************************************************/ +#include "sample_app_eds_typedefs.h" + +#endif diff --git a/config/eds_sample_app_tbldefs.h b/config/eds_sample_app_tbldefs.h new file mode 100644 index 0000000..6ad4556 --- /dev/null +++ b/config/eds_sample_app_tbldefs.h @@ -0,0 +1,29 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + * Specification for the SAMPLE_APP table related + * constant definitions. + */ +#ifndef EDS_SAMPLE_APP_TBLDEFS_H +#define EDS_SAMPLE_APP_TBLDEFS_H + +#include "sample_app_eds_typedefs.h" + +#endif diff --git a/config/eds_sample_app_topicid_values.h b/config/eds_sample_app_topicid_values.h new file mode 100644 index 0000000..ca91bd4 --- /dev/null +++ b/config/eds_sample_app_topicid_values.h @@ -0,0 +1,30 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + * Specification for the SAMPLE_APP topic ID values + */ +#ifndef EDS_SAMPLE_APP_TOPICIDS_H +#define EDS_SAMPLE_APP_TOPICIDS_H + +#include "cfe_mission_eds_designparameters.h" + +#define SAMPLE_APP_MISSION_TIDVAL(x) EdsParam_CFE_MISSION_SAMPLE_APP_##x##_TOPICID + +#endif diff --git a/eds/sample_app.xml b/eds/sample_app.xml index a34a4cf..f5519b3 100644 --- a/eds/sample_app.xml +++ b/eds/sample_app.xml @@ -103,6 +103,11 @@ + + + + + diff --git a/fsw/inc/sample_app_eventids.h b/fsw/inc/sample_app_eventids.h index 7a7d178..3d3b29f 100644 --- a/fsw/inc/sample_app_eventids.h +++ b/fsw/inc/sample_app_eventids.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/config/default_sample_app_fcncodes.h b/fsw/inc/sample_app_fcncodes.h similarity index 76% rename from config/default_sample_app_fcncodes.h rename to fsw/inc/sample_app_fcncodes.h index b701c1c..57e1b4a 100644 --- a/config/default_sample_app_fcncodes.h +++ b/fsw/inc/sample_app_fcncodes.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -28,6 +28,8 @@ #ifndef SAMPLE_APP_FCNCODES_H #define SAMPLE_APP_FCNCODES_H +#include "sample_app_fcncode_values.h" + /************************************************************************ * Macro Definitions ************************************************************************/ @@ -35,9 +37,9 @@ /* ** Sample App command codes */ -#define SAMPLE_APP_NOOP_CC 0 -#define SAMPLE_APP_RESET_COUNTERS_CC 1 -#define SAMPLE_APP_PROCESS_CC 2 -#define SAMPLE_APP_DISPLAY_PARAM_CC 3 +#define SAMPLE_APP_NOOP_CC SAMPLE_APP_CCVAL(NOOP) +#define SAMPLE_APP_RESET_COUNTERS_CC SAMPLE_APP_CCVAL(RESET_COUNTERS) +#define SAMPLE_APP_PROCESS_CC SAMPLE_APP_CCVAL(PROCESS) +#define SAMPLE_APP_DISPLAY_PARAM_CC SAMPLE_APP_CCVAL(DISPLAY_PARAM) #endif diff --git a/fsw/inc/sample_app_interface_cfg.h b/fsw/inc/sample_app_interface_cfg.h new file mode 100644 index 0000000..9e204b1 --- /dev/null +++ b/fsw/inc/sample_app_interface_cfg.h @@ -0,0 +1,46 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 Mission Configuration Header File + * + * This is a compatibility header for the "mission_cfg.h" file that has + * traditionally provided public config definitions for each CFS app. + * + * @note This file may be overridden/superceded by mission-provided definitions + * either by overriding this header or by generating definitions from a command/data + * dictionary tool. + */ +#ifndef SAMPLE_APP_INTERFACE_CFG_H +#define SAMPLE_APP_INTERFACE_CFG_H + +#include "sample_app_interface_cfg_values.h" + +/** + * \brief Length of string buffer in the Display Value command + * + * The Display Value command offers an example of how to use command + * parameters of different types. This macro controls the length + * of the string parameter. + */ +#define SAMPLE_APP_MISSION_STRING_VAL_LEN SAMPLE_APP_MISSION_CFGVAL(STRING_VAL_LEN) +#define DEFAULT_SAMPLE_APP_MISSION_STRING_VAL_LEN 10 + +#endif diff --git a/fsw/inc/sample_app_internal_cfg.h b/fsw/inc/sample_app_internal_cfg.h new file mode 100644 index 0000000..90305d8 --- /dev/null +++ b/fsw/inc/sample_app_internal_cfg.h @@ -0,0 +1,59 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 Platform Configuration Header File + * + * This is a compatibility header for the "platform_cfg.h" file that has + * traditionally provided both public and private config definitions + * for each CFS app. + * + * These definitions are now provided in two separate files, one for + * the public/mission scope and one for internal scope. + * + * @note This file may be overridden/superceded by mission-provided definitions + * either by overriding this header or by generating definitions from a command/data + * dictionary tool. + */ +#ifndef SAMPLE_APP_INTERNAL_CFG_H +#define SAMPLE_APP_INTERNAL_CFG_H + +#include "sample_app_internal_cfg_values.h" + +/***********************************************************************/ +#define SAMPLE_APP_PLATFORM_PIPE_DEPTH SAMPLE_APP_PLATFORM_CFGVAL(PIPE_DEPTH) +#define DEFAULT_SAMPLE_APP_PLATFORM_PIPE_DEPTH 32 /* Depth of the Command Pipe for Application */ + +#define SAMPLE_APP_PLATFORM_PIPE_NAME SAMPLE_APP_PLATFORM_CFGVAL(PIPE_NAME) +#define DEFAULT_SAMPLE_APP_PLATFORM_PIPE_NAME "SAMPLE_APP_CMD_PIPE" + +#define SAMPLE_APP_PLATFORM_NUMBER_OF_TABLES SAMPLE_APP_PLATFORM_CFGVAL(NUMBER_OF_TABLES) +#define DEFAULT_SAMPLE_APP_PLATFORM_NUMBER_OF_TABLES 1 /* Number of Example Table(s) */ + +#define SAMPLE_APP_PLATFORM_TABLE_OUT_OF_RANGE_ERR_CODE SAMPLE_APP_PLATFORM_CFGVAL(TABLE_OUT_OF_RANGE_ERR_CODE) +#define DEFAULT_SAMPLE_APP_PLATFORM_TABLE_OUT_OF_RANGE_ERR_CODE -1 + +#define SAMPLE_APP_PLATFORM_TBL_ELEMENT_1_MAX SAMPLE_APP_PLATFORM_CFGVAL(TBL_ELEMENT_1_MAX) +#define DEFAULT_SAMPLE_APP_PLATFORM_TBL_ELEMENT_1_MAX 10 + +#define SAMPLE_APP_PLATFORM_TABLE_FILE SAMPLE_APP_PLATFORM_CFGVAL(TABLE_FILE) +#define DEFAULT_SAMPLE_APP_PLATFORM_TABLE_FILE "/cf/sample_app_tbl.tbl" + +#endif diff --git a/fsw/inc/sample_app_topicids.h b/fsw/inc/sample_app_topicids.h new file mode 100644 index 0000000..643a39d --- /dev/null +++ b/fsw/inc/sample_app_topicids.h @@ -0,0 +1,35 @@ +/************************************************************************ + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" + * + * Copyright (c) 2023 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 + +#include "sample_app_topicid_values.h" + +#define SAMPLE_APP_MISSION_CMD_TOPICID SAMPLE_APP_MISSION_TIDVAL(CMD) +#define DEFAULT_SAMPLE_APP_MISSION_CMD_TOPICID 0x82 +#define SAMPLE_APP_MISSION_SEND_HK_TOPICID SAMPLE_APP_MISSION_TIDVAL(SEND_HK) +#define DEFAULT_SAMPLE_APP_MISSION_SEND_HK_TOPICID 0x83 +#define SAMPLE_APP_MISSION_HK_TLM_TOPICID SAMPLE_APP_MISSION_TIDVAL(HK_TLM) +#define DEFAULT_SAMPLE_APP_MISSION_HK_TLM_TOPICID 0x83 + +#endif diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index fd32277..01c3b85 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -136,7 +136,8 @@ CFE_Status_t SAMPLE_APP_Init(void) /* ** Create Software Bus message pipe. */ - status = CFE_SB_CreatePipe(&SAMPLE_APP_Data.CommandPipe, SAMPLE_APP_PIPE_DEPTH, SAMPLE_APP_PIPE_NAME); + status = CFE_SB_CreatePipe(&SAMPLE_APP_Data.CommandPipe, SAMPLE_APP_PLATFORM_PIPE_DEPTH, + SAMPLE_APP_PLATFORM_PIPE_NAME); if (status != CFE_SUCCESS) { CFE_EVS_SendEvent(SAMPLE_APP_CR_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, @@ -184,7 +185,7 @@ CFE_Status_t SAMPLE_APP_Init(void) } else { - status = CFE_TBL_Load(SAMPLE_APP_Data.TblHandles[0], CFE_TBL_SRC_FILE, SAMPLE_APP_TABLE_FILE); + status = CFE_TBL_Load(SAMPLE_APP_Data.TblHandles[0], CFE_TBL_SRC_FILE, SAMPLE_APP_PLATFORM_TABLE_FILE); } CFE_Config_GetVersionString(VersionString, SAMPLE_APP_CFG_MAX_VERSION_STR_LEN, "Sample App", SAMPLE_APP_VERSION, diff --git a/fsw/src/sample_app.h b/fsw/src/sample_app.h index 27d174c..07a4b5b 100644 --- a/fsw/src/sample_app.h +++ b/fsw/src/sample_app.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -68,7 +68,7 @@ typedef struct */ CFE_SB_PipeId_t CommandPipe; - CFE_TBL_Handle_t TblHandles[SAMPLE_APP_NUMBER_OF_TABLES]; + CFE_TBL_Handle_t TblHandles[SAMPLE_APP_PLATFORM_NUMBER_OF_TABLES]; } SAMPLE_APP_Data_t; /* diff --git a/fsw/src/sample_app_cmds.c b/fsw/src/sample_app_cmds.c index 3d22caf..b9d8da3 100644 --- a/fsw/src/sample_app_cmds.c +++ b/fsw/src/sample_app_cmds.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -63,7 +63,7 @@ CFE_Status_t SAMPLE_APP_SendHkCmd(const SAMPLE_APP_SendHkCmd_t *Msg) /* ** Manage any pending table loads, validations, etc. */ - for (i = 0; i < SAMPLE_APP_NUMBER_OF_TABLES; i++) + for (i = 0; i < SAMPLE_APP_PLATFORM_NUMBER_OF_TABLES; i++) { CFE_TBL_Manage(SAMPLE_APP_Data.TblHandles[i]); } diff --git a/fsw/src/sample_app_cmds.h b/fsw/src/sample_app_cmds.h index 8b99259..44f74ae 100644 --- a/fsw/src/sample_app_cmds.h +++ b/fsw/src/sample_app_cmds.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/fsw/src/sample_app_dispatch.c b/fsw/src/sample_app_dispatch.c index 4928cb7..0e4de94 100644 --- a/fsw/src/sample_app_dispatch.c +++ b/fsw/src/sample_app_dispatch.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -127,23 +127,35 @@ void SAMPLE_APP_ProcessGroundCommand(const CFE_SB_Buffer_t *SBBufPtr) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void SAMPLE_APP_TaskPipe(const CFE_SB_Buffer_t *SBBufPtr) { - CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; + static CFE_SB_MsgId_t CMD_MID = CFE_SB_MSGID_RESERVED; + static CFE_SB_MsgId_t SEND_HK_MID = CFE_SB_MSGID_RESERVED; - CFE_MSG_GetMsgId(&SBBufPtr->Msg, &MsgId); + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; - switch (CFE_SB_MsgIdToValue(MsgId)) + /* cache the local MID Values here, this avoids repeat lookups */ + if (!CFE_SB_IsValidMsgId(CMD_MID)) { - case SAMPLE_APP_CMD_MID: - SAMPLE_APP_ProcessGroundCommand(SBBufPtr); - break; + CMD_MID = CFE_SB_ValueToMsgId(SAMPLE_APP_CMD_MID); + SEND_HK_MID = CFE_SB_ValueToMsgId(SAMPLE_APP_SEND_HK_MID); + } - case SAMPLE_APP_SEND_HK_MID: - SAMPLE_APP_SendHkCmd((const SAMPLE_APP_SendHkCmd_t *)SBBufPtr); - break; + CFE_MSG_GetMsgId(&SBBufPtr->Msg, &MsgId); - default: - CFE_EVS_SendEvent(SAMPLE_APP_MID_ERR_EID, CFE_EVS_EventType_ERROR, - "SAMPLE: invalid command packet,MID = 0x%x", (unsigned int)CFE_SB_MsgIdToValue(MsgId)); - break; + /* Process all SB messages */ + if (CFE_SB_MsgId_Equal(MsgId, SEND_HK_MID)) + { + /* Housekeeping request */ + SAMPLE_APP_SendHkCmd((const SAMPLE_APP_SendHkCmd_t *)SBBufPtr); + } + else if (CFE_SB_MsgId_Equal(MsgId, CMD_MID)) + { + /* Ground command */ + SAMPLE_APP_ProcessGroundCommand(SBBufPtr); + } + else + { + /* Unknown command */ + CFE_EVS_SendEvent(SAMPLE_APP_MID_ERR_EID, CFE_EVS_EventType_ERROR, "SAMPLE: invalid command packet,MID = 0x%x", + (unsigned int)CFE_SB_MsgIdToValue(MsgId)); } } diff --git a/fsw/src/sample_app_dispatch.h b/fsw/src/sample_app_dispatch.h index b3289e8..41a7fa3 100644 --- a/fsw/src/sample_app_dispatch.h +++ b/fsw/src/sample_app_dispatch.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/fsw/src/sample_app_eds_dispatch.c b/fsw/src/sample_app_eds_dispatch.c index 6751e43..73a0767 100644 --- a/fsw/src/sample_app_eds_dispatch.c +++ b/fsw/src/sample_app_eds_dispatch.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -37,12 +37,22 @@ /* * Define a lookup table for SAMPLE app command codes */ -static const EdsDispatchTable_SAMPLE_APP_Application_CFE_SB_Telecommand_t SAMPLE_TC_DISPATCH_TABLE = { - .CMD = {.NoopCmd_indication = SAMPLE_APP_NoopCmd, - .ResetCountersCmd_indication = SAMPLE_APP_ResetCountersCmd, - .ProcessCmd_indication = SAMPLE_APP_ProcessCmd, - .DisplayParamCmd_indication = SAMPLE_APP_DisplayParamCmd}, - .SEND_HK = {.indication = SAMPLE_APP_SendHkCmd}}; +/* clang-format off */ +static const EdsDispatchTable_EdsComponent_SAMPLE_APP_Application_CFE_SB_Telecommand_t SAMPLE_TC_DISPATCH_TABLE = +{ + .CMD = + { + .NoopCmd_indication = SAMPLE_APP_NoopCmd, + .ResetCountersCmd_indication = SAMPLE_APP_ResetCountersCmd, + .ProcessCmd_indication = SAMPLE_APP_ProcessCmd, + .DisplayParamCmd_indication = SAMPLE_APP_DisplayParamCmd + }, + .SEND_HK = + { + .indication = SAMPLE_APP_SendHkCmd + } +}; +/* clang-format on */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ /* */ @@ -58,7 +68,7 @@ void SAMPLE_APP_TaskPipe(const CFE_SB_Buffer_t *SBBufPtr) CFE_MSG_Size_t MsgSize; CFE_MSG_FcnCode_t MsgFc; - Status = EdsDispatch_SAMPLE_APP_Application_Telecommand(SBBufPtr, &SAMPLE_TC_DISPATCH_TABLE); + Status = EdsDispatch_EdsComponent_SAMPLE_APP_Application_Telecommand(SBBufPtr, &SAMPLE_TC_DISPATCH_TABLE); if (Status != CFE_SUCCESS) { diff --git a/fsw/src/sample_app_utils.c b/fsw/src/sample_app_utils.c index 4bae292..7ab8e30 100644 --- a/fsw/src/sample_app_utils.c +++ b/fsw/src/sample_app_utils.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -42,10 +42,10 @@ CFE_Status_t SAMPLE_APP_TblValidationFunc(void *TblData) /* ** Sample Example Table Validation */ - if (TblDataPtr->Int1 > SAMPLE_APP_TBL_ELEMENT_1_MAX) + if (TblDataPtr->Int1 > SAMPLE_APP_PLATFORM_TBL_ELEMENT_1_MAX) { /* First element is out of range, return an appropriate error code */ - ReturnCode = SAMPLE_APP_TABLE_OUT_OF_RANGE_ERR_CODE; + ReturnCode = SAMPLE_APP_PLATFORM_TABLE_OUT_OF_RANGE_ERR_CODE; } return ReturnCode; diff --git a/fsw/src/sample_app_utils.h b/fsw/src/sample_app_utils.h index cc6f133..871f485 100644 --- a/fsw/src/sample_app_utils.h +++ b/fsw/src/sample_app_utils.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index c2e97f8..4b45567 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -27,22 +27,22 @@ /* Development Build Macro Definitions */ -#define SAMPLE_APP_BUILD_NUMBER 54 -#define SAMPLE_APP_BUILD_BASELINE "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */ -#define SAMPLE_APP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ -#define SAMPLE_APP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */ +#define SAMPLE_APP_BUILD_NUMBER 0 +#define SAMPLE_APP_BUILD_BASELINE "v7.0.0" /*!< Development Build: git tag that is the base for the current development */ +#define SAMPLE_APP_BUILD_DEV_CYCLE "v7.0.0" /**< @brief Development: Release name for current development cycle */ +#define SAMPLE_APP_BUILD_CODENAME "Draco" /**< @brief: Development: Code name for the current build */ /* * Version Macros, see \ref cfsversions for definitions. */ -#define SAMPLE_APP_MAJOR_VERSION 1 /*!< @brief Major version number. */ -#define SAMPLE_APP_MINOR_VERSION 1 /*!< @brief Minor version number. */ +#define SAMPLE_APP_MAJOR_VERSION 7 /*!< @brief Major version number. */ +#define SAMPLE_APP_MINOR_VERSION 0 /*!< @brief Minor version number. */ #define SAMPLE_APP_REVISION 0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/ /** * @brief Last official release. */ -#define SAMPLE_APP_LAST_OFFICIAL "v1.1.0" +#define SAMPLE_APP_LAST_OFFICIAL "v7.0.0" /*! * @brief Mission revision. @@ -51,7 +51,7 @@ * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for * cFS open-source development use (pending resolution of nasa/cFS#440) */ -#define SAMPLE_APP_MISSION_REV 0xFF +#define SAMPLE_APP_MISSION_REV 0x0 #define SAMPLE_APP_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */ #define SAMPLE_APP_STR(x) \ diff --git a/fsw/tables/sample_app_tbl.c b/fsw/tables/sample_app_tbl.c index c36c412..4a53ac8 100644 --- a/fsw/tables/sample_app_tbl.c +++ b/fsw/tables/sample_app_tbl.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/mission_build.cmake b/mission_build.cmake index 7c156c6..99a5ec7 100644 --- a/mission_build.cmake +++ b/mission_build.cmake @@ -10,8 +10,8 @@ # The list of header files that control the SAMPLE_APP configuration set(SAMPLE_APP_MISSION_CONFIG_FILE_LIST - sample_app_fcncodes.h - sample_app_interface_cfg.h + sample_app_fcncode_values.h + sample_app_interface_cfg_values.h sample_app_mission_cfg.h sample_app_perfids.h sample_app_msg.h @@ -20,33 +20,8 @@ set(SAMPLE_APP_MISSION_CONFIG_FILE_LIST sample_app_tbl.h sample_app_tbldefs.h sample_app_tblstruct.h - sample_app_topicids.h + sample_app_topicid_values.h ) -if (CFE_EDS_ENABLED_BUILD) +generate_configfile_set(${SAMPLE_APP_MISSION_CONFIG_FILE_LIST}) - # In an EDS-based build, these files come generated from the EDS tool - set(SAMPLE_APP_CFGFILE_SRC_sample_app_interface_cfg "sample_app_eds_designparameters.h") - set(SAMPLE_APP_CFGFILE_SRC_sample_app_tbldefs "sample_app_eds_typedefs.h") - set(SAMPLE_APP_CFGFILE_SRC_sample_app_tblstruct "sample_app_eds_typedefs.h") - set(SAMPLE_APP_CFGFILE_SRC_sample_app_msgdefs "sample_app_eds_typedefs.h") - set(SAMPLE_APP_CFGFILE_SRC_sample_app_msgstruct "sample_app_eds_typedefs.h") - set(SAMPLE_APP_CFGFILE_SRC_sample_app_fcncodes "sample_app_eds_cc.h") - -endif(CFE_EDS_ENABLED_BUILD) - -# Create wrappers around the all the config header files -# This makes them individually overridable by the missions, without modifying -# the distribution default copies -foreach(SAMPLE_APP_CFGFILE ${SAMPLE_APP_MISSION_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}" - ${DEFAULT_SOURCE} - ) -endforeach() diff --git a/unit-test/common/eventcheck.c b/unit-test/common/eventcheck.c index 5bb23ee..4d2b89a 100644 --- a/unit-test/common/eventcheck.c +++ b/unit-test/common/eventcheck.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/common/eventcheck.h b/unit-test/common/eventcheck.h index 07168aa..793862d 100644 --- a/unit-test/common/eventcheck.h +++ b/unit-test/common/eventcheck.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/common/setup.c b/unit-test/common/setup.c index 9d6011e..7fb7b73 100644 --- a/unit-test/common/setup.c +++ b/unit-test/common/setup.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/common/setup.h b/unit-test/common/setup.h index a1ed825..8a2d502 100644 --- a/unit-test/common/setup.h +++ b/unit-test/common/setup.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/coveragetest/coveragetest_sample_app.c b/unit-test/coveragetest/coveragetest_sample_app.c index b6d31c4..0b6075c 100644 --- a/unit-test/coveragetest/coveragetest_sample_app.c +++ b/unit-test/coveragetest/coveragetest_sample_app.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/coveragetest/coveragetest_sample_app_cmds.c b/unit-test/coveragetest/coveragetest_sample_app_cmds.c index 9bee959..57fa2d0 100644 --- a/unit-test/coveragetest/coveragetest_sample_app_cmds.c +++ b/unit-test/coveragetest/coveragetest_sample_app_cmds.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/coveragetest/coveragetest_sample_app_dispatch.c b/unit-test/coveragetest/coveragetest_sample_app_dispatch.c index a968286..e92dd2d 100644 --- a/unit-test/coveragetest/coveragetest_sample_app_dispatch.c +++ b/unit-test/coveragetest/coveragetest_sample_app_dispatch.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/coveragetest/coveragetest_sample_app_eds_dispatch.c b/unit-test/coveragetest/coveragetest_sample_app_eds_dispatch.c index 1f06fa9..2bc2a48 100644 --- a/unit-test/coveragetest/coveragetest_sample_app_eds_dispatch.c +++ b/unit-test/coveragetest/coveragetest_sample_app_eds_dispatch.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/coveragetest/coveragetest_sample_app_utils.c b/unit-test/coveragetest/coveragetest_sample_app_utils.c index 6c81011..a649439 100644 --- a/unit-test/coveragetest/coveragetest_sample_app_utils.c +++ b/unit-test/coveragetest/coveragetest_sample_app_utils.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -57,9 +57,9 @@ void Test_SAMPLE_APP_TblValidationFunc(void) /* nominal case (0) should succeed */ UtAssert_INT32_EQ(SAMPLE_APP_TblValidationFunc(&TestTblData), CFE_SUCCESS); - /* error case should return SAMPLE_APP_TABLE_OUT_OF_RANGE_ERR_CODE */ - TestTblData.Int1 = 1 + SAMPLE_APP_TBL_ELEMENT_1_MAX; - UtAssert_INT32_EQ(SAMPLE_APP_TblValidationFunc(&TestTblData), SAMPLE_APP_TABLE_OUT_OF_RANGE_ERR_CODE); + /* error case should return SAMPLE_APP_PLATFORM_TABLE_OUT_OF_RANGE_ERR_CODE */ + TestTblData.Int1 = 1 + SAMPLE_APP_PLATFORM_TBL_ELEMENT_1_MAX; + UtAssert_INT32_EQ(SAMPLE_APP_TblValidationFunc(&TestTblData), SAMPLE_APP_PLATFORM_TABLE_OUT_OF_RANGE_ERR_CODE); } void Test_SAMPLE_APP_GetCrc(void) diff --git a/unit-test/coveragetest/sample_app_coveragetest_common.h b/unit-test/coveragetest/sample_app_coveragetest_common.h index 792ee5b..1a71ff5 100644 --- a/unit-test/coveragetest/sample_app_coveragetest_common.h +++ b/unit-test/coveragetest/sample_app_coveragetest_common.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/stubs/sample_app_cmds_stubs.c b/unit-test/stubs/sample_app_cmds_stubs.c index bfa80ce..0eb5dee 100644 --- a/unit-test/stubs/sample_app_cmds_stubs.c +++ b/unit-test/stubs/sample_app_cmds_stubs.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/stubs/sample_app_dispatch_stubs.c b/unit-test/stubs/sample_app_dispatch_stubs.c index 7d956f4..5a3ba00 100644 --- a/unit-test/stubs/sample_app_dispatch_stubs.c +++ b/unit-test/stubs/sample_app_dispatch_stubs.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/stubs/sample_app_global_stubs.c b/unit-test/stubs/sample_app_global_stubs.c index c80a9d0..19405bc 100644 --- a/unit-test/stubs/sample_app_global_stubs.c +++ b/unit-test/stubs/sample_app_global_stubs.c @@ -1,8 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,920-1, and identified as “Core Flight - * System (cFS) Health & Safety (HS) Application version 2.4.1” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2021 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/stubs/sample_app_stubs.c b/unit-test/stubs/sample_app_stubs.c index 16977fd..dfc211c 100644 --- a/unit-test/stubs/sample_app_stubs.c +++ b/unit-test/stubs/sample_app_stubs.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/unit-test/stubs/sample_app_utils_stubs.c b/unit-test/stubs/sample_app_utils_stubs.c index 88e52c1..528ac70 100644 --- a/unit-test/stubs/sample_app_utils_stubs.c +++ b/unit-test/stubs/sample_app_utils_stubs.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. *