NASA Docket No. GSC-19,200-1, and identified as "cFS Draco"

Batch update of latest cFS software release

Reflects commit dcf2324cf56d27f9f49efeb2294ca279d1a28388 from NASA internal development repo

Author: jphickey

CMakeLists.txt

@@ -2,10 +2,16 @@ project(CFS_HK C)
 
 set(APP_SRC_FILES
   fsw/src/hk_app.c
-  fsw/src/hk_dispatch.c
+  fsw/src/hk_cmds.c
   fsw/src/hk_utils.c
 )
 
+if (CFE_EDS_ENABLED)
+  list(APPEND APP_SRC_FILES fsw/src/hk_eds_dispatch.c)
+else()
+  list(APPEND APP_SRC_FILES fsw/src/hk_dispatch.c)
+endif()
+
 # Create the app module
 add_cfe_app(hk ${APP_SRC_FILES})
 

arch_build.cmake

@@ -0,0 +1,19 @@
+###########################################################
+#
+# HK App platform build setup
+#
+# This file is evaluated as part of the "prepare" stage
+# and can be used to set up prerequisites for the build,
+# such as generating header files
+#
+###########################################################
+
+# The list of header files that control the app configuration
+set(HK_PLATFORM_CONFIG_FILE_LIST
+  hk_internal_cfg_values.h
+  hk_msgids.h
+  hk_msgid_values.h
+  hk_platform_cfg.h
+)
+
+generate_configfile_set(${HK_PLATFORM_CONFIG_FILE_LIST})

config/default_hk_fcncode_values.h

@@ -0,0 +1,42 @@
+/************************************************************************
+ * 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
+ *  The CFS Housekeeping (HK) 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/or the public API, if applicable.
+ *
+ * @note This file may be overridden/superceded by mission-provided defintions
+ * either by overriding this header or by generating definitions from a command/data
+ * dictionary tool.
+ */
+#ifndef DEFAULT_HK_FCNCODE_VALUES_H
+#define DEFAULT_HK_FCNCODE_VALUES_H
+
+#define HK_CCVAL(x) HK_FunctionCode_##x
+
+enum HK_FunctionCode
+{
+    HK_FunctionCode_NOOP           = 0,
+    HK_FunctionCode_RESET_COUNTERS = 1
+};
+
+#endif

config/default_hk_interface_cfg_values.h

@@ -0,0 +1,38 @@
+/************************************************************************
+ * 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
+ *  The CFS Housekeeping (HK) 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/or the public API, if applicable.
+ *
+ * @note This file may be overridden/superceded by mission-provided defintions
+ * either by overriding this header or by generating definitions from a command/data
+ * dictionary tool.
+ */
+
+#ifndef DEFAULT_HK_INTERFACE_CFG_VALUES_H
+#define DEFAULT_HK_INTERFACE_CFG_VALUES_H
+
+/* Use the default configuration value for all */
+#define HK_INTERFACE_CFGVAL(x) DEFAULT_HK_INTERFACE_##x
+
+#endif

config/default_hk_internal_cfg_values.h

@@ -0,0 +1,40 @@
+/************************************************************************
+ * 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
+ *  The CFS Housekeeping (HK) Application Config Definitions
+ *
+ * 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 defintions
+ * either by overriding this header or by generating definitions from a command/data
+ * dictionary tool.
+ */
+#ifndef DEFAULT_HK_INTERNAL_CFG_H
+#define DEFAULT_HK_INTERNAL_CFG_H
+
+/* Use the default configuration value for all */
+#define HK_INTERNAL_CFGVAL(x) DEFAULT_HK_INTERNAL_##x
+
+#endif

config/default_hk_mission_cfg.h

@@ -0,0 +1,37 @@
+/************************************************************************
+ * 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
+ *  The CFS Housekeeping (HK) 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/or the public API, if applicable.
+ *
+ * @note This file may be overridden/superceded by mission-provided defintions
+ * either by overriding this header or by generating definitions from a command/data
+ * dictionary tool.
+ */
+
+#ifndef DEFAULT_HK_MISSION_CONFIG_H
+#define DEFAULT_HK_MISSION_CONFIG_H
+
+#include "hk_interface_cfg.h"
+
+#endif /* DEFAULT_HK_MISSION_CONFIG_H */

config/default_hk_msg.h

@@ -0,0 +1,37 @@
+/************************************************************************
+ * 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
+ *  The CFS Housekeeping (HK) Application Message Structure Definition
+ *
+ * This is a compatibility header for the "hk_msg.h" file that has
+ * traditionally provided the message definitions for cFS apps.
+ *
+ * @note This file may be overridden/superceded by mission-provided defintions
+ * either by overriding this header or by generating definitions from a command/data
+ * dictionary tool.
+ */
+#ifndef DEFAULT_HK_MSG_H
+#define DEFAULT_HK_MSG_H
+
+#include "hk_fcncodes.h"
+#include "hk_msgdefs.h"
+#include "hk_msgstruct.h"
+
+#endif

config/default_hk_msgdefs.h

@@ -0,0 +1,43 @@
+/************************************************************************
+ * 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
+ *  The CFS Housekeeping (HK) Application function codes
+ *
+ */
+#ifndef DEFAULT_HK_MSGDEFS_H
+#define DEFAULT_HK_MSGDEFS_H
+
+#include "common_types.h"
+#include "cfe_es_extern_typedefs.h"
+
+/**
+ *  \brief HK Application housekeeping Payload
+ */
+typedef struct
+{
+    uint8              CmdCounter;          /**< \brief Count of valid commands received */
+    uint8              ErrCounter;          /**< \brief Count of invalid commands received */
+    uint16             Padding;             /**< \brief Padding to force 32 bit alignment */
+    uint16             CombinedPacketsSent; /**< \brief Count of combined tlm pkts sent */
+    uint16             MissingDataCtr;      /**< \brief Number of times missing data was detected */
+    CFE_ES_MemHandle_t MemPoolHandle;       /**< \brief Memory pool handle used to get mempool diags */
+} HK_HkTlm_Payload_t;
+
+#endif

config/default_hk_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
+ *  The CFS Housekeeping (HK) Application Message IDs header file
+ */
+#ifndef DEFAULT_HK_MSGID_VALUES_H
+#define DEFAULT_HK_MSGID_VALUES_H
+
+#include "cfe_core_api_base_msgids.h"
+#include "hk_topicids.h"
+
+#define CFE_PLATFORM_HK_CMD_MIDVAL(x) CFE_PLATFORM_CMD_TOPICID_TO_MIDV(CFE_MISSION_HK_##x##_TOPICID)
+#define CFE_PLATFORM_HK_TLM_MIDVAL(x) CFE_PLATFORM_TLM_TOPICID_TO_MIDV(CFE_MISSION_HK_##x##_TOPICID)
+
+#endif

fsw/inc/hk_msgids.h config/default_hk_msgids.hfsw/inc/hk_msgids.h renamed to config/default_hk_msgids.h

@@ -1,8 +1,7 @@
 /************************************************************************
- * NASA Docket No. GSC-18,919-1, and identified as “Core Flight
- * System (cFS) Housekeeping (HK) Application version 2.5.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.
  *
@@ -21,18 +20,19 @@
  * @file
  *  The CFS Housekeeping (HK) Application Message IDs header file
  */
-#ifndef HK_MSGIDS_H
-#define HK_MSGIDS_H
+#ifndef DEFAULT_HK_MSGIDS_H
+#define DEFAULT_HK_MSGIDS_H
+
+#include "hk_msgid_values.h"
 
 /**
  * \defgroup cfshkcmdmid CFS Housekeeping Command Message IDs
  * \{
  */
 
-#define HK_CMD_MID     0x189A /**< \brief HK Ground Commands Message ID */
-#define HK_SEND_HK_MID 0x189B /**< \brief HK Send Housekeeping Data Cmd Message ID */
-
-#define HK_SEND_COMBINED_PKT_MID 0x189C /**< \brief HK Send Combined Pkt Cmd Message ID */
+#define HK_CMD_MID               CFE_PLATFORM_HK_CMD_MIDVAL(CMD)
+#define HK_SEND_HK_MID           CFE_PLATFORM_HK_CMD_MIDVAL(SEND_HK)
+#define HK_SEND_COMBINED_PKT_MID CFE_PLATFORM_HK_CMD_MIDVAL(SEND_COMBINED_PKT)
 
 /**\}*/
 
@@ -41,12 +41,16 @@
  * \{
  */
 
-#define HK_HK_TLM_MID 0x089B /**< \brief HK Housekeeping Telemetry Message ID */
+#define HK_HK_TLM_MID CFE_PLATFORM_HK_TLM_MIDVAL(HK_TLM) /**< \brief HK Housekeeping Telemetry Message ID */
 
-#define HK_COMBINED_PKT1_MID 0x089C /**< \brief HK Combined Packet 1 Message ID */
-#define HK_COMBINED_PKT2_MID 0x089D /**< \brief HK Combined Packet 2 Message ID */
-#define HK_COMBINED_PKT3_MID 0x089E /**< \brief HK Combined Packet 3 Message ID */
-#define HK_COMBINED_PKT4_MID 0x089F /**< \brief HK Combined Packet 4 Message ID */
+#define HK_COMBINED_PKT1_MID \
+    CFE_PLATFORM_HK_TLM_MIDVAL(COMBINED_PKT1_TLM) /**< \brief HK Combined Packet 1 Message ID */
+#define HK_COMBINED_PKT2_MID \
+    CFE_PLATFORM_HK_TLM_MIDVAL(COMBINED_PKT2_TLM) /**< \brief HK Combined Packet 2 Message ID */
+#define HK_COMBINED_PKT3_MID \
+    CFE_PLATFORM_HK_TLM_MIDVAL(COMBINED_PKT3_TLM) /**< \brief HK Combined Packet 3 Message ID */
+#define HK_COMBINED_PKT4_MID \
+    CFE_PLATFORM_HK_TLM_MIDVAL(COMBINED_PKT4_TLM) /**< \brief HK Combined Packet 4 Message ID */
 
 /**\}*/