Skip to content

Commit c37ceda

Browse files
jphickeyjphickey
committed
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
1 parent 46279d0 commit c37ceda

59 files changed

Lines changed: 640 additions & 241 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codeql-build.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ name: CodeQl Analysis
22

33
on:
44
push:
5+
branches:
6+
- dev
7+
- main
58
pull_request:
6-
9+
types:
10+
- opened
11+
- reopened
12+
- synchronize
13+
workflow_dispatch:
714

815
jobs:
916
codeql:
1017
name: Codeql Analysis
1118
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
12-
with:
19+
with:
1320
component-path: apps/sample_app
1421
prep: 'make prep; make -C build/tools/elf2cfetbl'
1522
make: 'make -C build/native/default_cpu1/apps/sample_app'

‎.github/workflows/format-check.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ name: Format Check
22

33
# Run on all push and pull requests
44
on:
5-
push:
65
pull_request:
6+
types:
7+
- opened
8+
- reopened
9+
- synchronize
710

811
jobs:
912
format-check:
1013
name: Run format check
1114
uses: nasa/cFS/.github/workflows/format-check.yml@main
12-

‎.github/workflows/static-analysis.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@ name: Static Analysis
33
# Run on all push and pull requests
44
on:
55
push:
6+
branches:
7+
- dev
8+
- main
69
pull_request:
10+
types:
11+
- opened
12+
- reopened
13+
- synchronize
14+
workflow_dispatch:
715

816
jobs:
917
static-analysis:

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(APP_SRC_FILES
66
fsw/src/sample_app_utils.c
77
)
88

9-
if (CFE_EDS_ENABLED_BUILD)
9+
if (CFE_EDS_ENABLED)
1010
list(APPEND APP_SRC_FILES
1111
fsw/src/sample_app_eds_dispatch.c
1212
)

‎arch_build.cmake‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,12 @@
1010

1111
# The list of header files that control the SAMPLE_APP configuration
1212
set(SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST
13-
sample_app_internal_cfg.h
13+
sample_app_internal_cfg_values.h
1414
sample_app_platform_cfg.h
1515
sample_app_perfids.h
1616
sample_app_msgids.h
17+
sample_app_msgid_values.h
1718
)
1819

19-
# Create wrappers around the all the config header files
20-
# This makes them individually overridable by the missions, without modifying
21-
# the distribution default copies
22-
foreach(SAMPLE_APP_CFGFILE ${SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST})
23-
get_filename_component(CFGKEY "${SAMPLE_APP_CFGFILE}" NAME_WE)
24-
if (DEFINED SAMPLE_APP_CFGFILE_SRC_${CFGKEY})
25-
set(DEFAULT_SOURCE GENERATED_FILE "${SAMPLE_APP_CFGFILE_SRC_${CFGKEY}}")
26-
else()
27-
set(DEFAULT_SOURCE FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${SAMPLE_APP_CFGFILE}")
28-
endif()
29-
generate_config_includefile(
30-
FILE_NAME "${SAMPLE_APP_CFGFILE}"
31-
${DEFAULT_SOURCE}
32-
)
33-
endforeach()
20+
generate_configfile_set(${SAMPLE_APP_PLATFORM_CONFIG_FILE_LIST})
21+

‎config/default_sample_app_fcncode_values.h‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/************************************************************************
2+
* NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"
3+
*
4+
* Copyright (c) 2023 United States Government as represented by the
5+
* Administrator of the National Aeronautics and Space Administration.
6+
* All Rights Reserved.
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License. You may obtain
10+
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
************************************************************************/
18+
19+
/**
20+
* @file
21+
* Specification for the CFE Executive Services (CFE_ES) command function codes
22+
*
23+
* @note
24+
* This file should be strictly limited to the command/function code (CC)
25+
* macro definitions. Other definitions such as enums, typedefs, or other
26+
* macros should be placed in the msgdefs.h or msg.h files.
27+
*/
28+
#ifndef DEFAULT_SAMPLE_APP_FCNCODE_VALUES_H
29+
#define DEFAULT_SAMPLE_APP_FCNCODE_VALUES_H
30+
31+
/************************************************************************
32+
* Macro Definitions
33+
************************************************************************/
34+
35+
#define SAMPLE_APP_CCVAL(x) SAMPLE_APP_FunctionCode_##x
36+
37+
enum SAMPLE_APP_FunctionCode_
38+
{
39+
SAMPLE_APP_FunctionCode_NOOP = 0,
40+
SAMPLE_APP_FunctionCode_RESET_COUNTERS = 1,
41+
SAMPLE_APP_FunctionCode_PROCESS = 2,
42+
SAMPLE_APP_FunctionCode_DISPLAY_PARAM = 3,
43+
};
44+
45+
#endif

config/default_sample_app_interface_cfg.h renamed to config/default_sample_app_interface_cfg_values.h

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
2-
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
2+
* NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"
33
*
4-
* Copyright (c) 2020 United States Government as represented by the
4+
* Copyright (c) 2023 United States Government as represented by the
55
* Administrator of the National Aeronautics and Space Administration.
66
* All Rights Reserved.
77
*
@@ -25,20 +25,14 @@
2525
* interface, tables definitions, and any other data products that
2626
* serve to exchange information with other entities.
2727
*
28-
* @note This file may be overridden/superceded by mission-provided defintions
28+
* @note This file may be overridden/superceded by mission-provided definitionsm
2929
* either by overriding this header or by generating definitions from a command/data
3030
* dictionary tool.
3131
*/
32-
#ifndef SAMPLE_APP_INTERFACE_CFG_H
33-
#define SAMPLE_APP_INTERFACE_CFG_H
32+
#ifndef DEFAULT_SAMPLE_APP_INTERFACE_CFG_H
33+
#define DEFAULT_SAMPLE_APP_INTERFACE_CFG_H
3434

35-
/**
36-
* \brief Length of string buffer in the Display Value command
37-
*
38-
* The Display Value command offers an example of how to use command
39-
* parameters of different types. This macro controls the length
40-
* of the string parameter.
41-
*/
42-
#define SAMPLE_APP_STRING_VAL_LEN 10
35+
/* Use the default configuration value for all */
36+
#define SAMPLE_APP_MISSION_CFGVAL(x) DEFAULT_SAMPLE_APP_MISSION_##x
4337

4438
#endif

config/default_sample_app_internal_cfg.h renamed to config/default_sample_app_internal_cfg_values.h

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
2-
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
2+
* NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"
33
*
4-
* Copyright (c) 2020 United States Government as represented by the
4+
* Copyright (c) 2023 United States Government as represented by the
55
* Administrator of the National Aeronautics and Space Administration.
66
* All Rights Reserved.
77
*
@@ -25,21 +25,14 @@
2525
* to items in this file only affect the local module and will be transparent
2626
* to external entities that are using the public interface(s).
2727
*
28-
* @note This file may be overridden/superceded by mission-provided defintions
28+
* @note This file may be overridden/superceded by mission-provided definitions
2929
* either by overriding this header or by generating definitions from a command/data
3030
* dictionary tool.
3131
*/
32-
#ifndef SAMPLE_APP_INTERNAL_CFG_H
33-
#define SAMPLE_APP_INTERNAL_CFG_H
32+
#ifndef DEFAULT_SAMPLE_APP_INTERNAL_CFG_H
33+
#define DEFAULT_SAMPLE_APP_INTERNAL_CFG_H
3434

35-
/***********************************************************************/
36-
#define SAMPLE_APP_PIPE_DEPTH 32 /* Depth of the Command Pipe for Application */
37-
#define SAMPLE_APP_PIPE_NAME "SAMPLE_APP_CMD_PIPE"
38-
39-
#define SAMPLE_APP_NUMBER_OF_TABLES 1 /* Number of Example Table(s) */
40-
41-
#define SAMPLE_APP_TABLE_OUT_OF_RANGE_ERR_CODE -1
42-
43-
#define SAMPLE_APP_TBL_ELEMENT_1_MAX 10
35+
/* Use the default configuration value for all */
36+
#define SAMPLE_APP_PLATFORM_CFGVAL(x) DEFAULT_SAMPLE_APP_PLATFORM_##x
4437

4538
#endif

‎config/default_sample_app_mission_cfg.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
2-
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
2+
* NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"
33
*
4-
* Copyright (c) 2020 United States Government as represented by the
4+
* Copyright (c) 2023 United States Government as represented by the
55
* Administrator of the National Aeronautics and Space Administration.
66
* All Rights Reserved.
77
*
@@ -24,12 +24,12 @@
2424
* This is a compatibility header for the "mission_cfg.h" file that has
2525
* traditionally provided public config definitions for each CFS app.
2626
*
27-
* @note This file may be overridden/superceded by mission-provided defintions
27+
* @note This file may be overridden/superceded by mission-provided definitions
2828
* either by overriding this header or by generating definitions from a command/data
2929
* dictionary tool.
3030
*/
31-
#ifndef SAMPLE_APP_MISSION_CFG_H
32-
#define SAMPLE_APP_MISSION_CFG_H
31+
#ifndef DEFAULT_SAMPLE_APP_MISSION_CFG_H
32+
#define DEFAULT_SAMPLE_APP_MISSION_CFG_H
3333

3434
#include "sample_app_interface_cfg.h"
3535

‎config/default_sample_app_msg.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
2-
* NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
2+
* NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"
33
*
4-
* Copyright (c) 2020 United States Government as represented by the
4+
* Copyright (c) 2023 United States Government as represented by the
55
* Administrator of the National Aeronautics and Space Administration.
66
* All Rights Reserved.
77
*
@@ -24,12 +24,12 @@
2424
* This is a compatibility header for the "sample_app_msg.h" file that has
2525
* traditionally provided the message definitions for cFS apps.
2626
*
27-
* @note This file may be overridden/superceded by mission-provided defintions
27+
* @note This file may be overridden/superceded by mission-provided definitions
2828
* either by overriding this header or by generating definitions from a command/data
2929
* dictionary tool.
3030
*/
31-
#ifndef SAMPLE_APP_MSG_H
32-
#define SAMPLE_APP_MSG_H
31+
#ifndef DEFAULT_SAMPLE_APP_MSG_H
32+
#define DEFAULT_SAMPLE_APP_MSG_H
3333

3434
#include "sample_app_mission_cfg.h"
3535
#include "sample_app_msgdefs.h"

0 commit comments

Comments
 (0)