Merge pull request #483 from nasa/draco-integration

Open Source Draco Release

Author: dzbaker

.github/workflows/build-documentation.yml

@@ -2,7 +2,15 @@ name: Build and Deploy Documentation
 
 on:
   push:
+    branches:
+      - dev
+      - main
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  workflow_dispatch:
 
 jobs:
   build-documentation:

.github/workflows/build-run-app.yml

@@ -2,7 +2,15 @@ name: Build and Run
 
 on:
   push:
+    branches:
+      - dev
+      - main
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  workflow_dispatch:
 
 jobs:
   build-run:

.github/workflows/codeql-build.yml

@@ -2,15 +2,22 @@ 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:
-      component-path: apps/cf 
+      component-path: apps/cf
       prep: 'make prep; make -C build/tools/elf2cfetbl'
       make: 'make -C build/native/default_cpu1/apps/cf'
       setup: |

.github/workflows/format-check.yml

@@ -2,8 +2,11 @@ name: Format Check
 
 # Run on all push and pull requests
 on:
-  push:
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 jobs:
   format-check:

.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:

.github/workflows/unit-test-coverage.yml

@@ -2,7 +2,15 @@ name: Unit Test and Coverage
 
 on:
   push:
+    branches:
+      - dev
+      - main
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  workflow_dispatch:
 
 jobs:
   unit-test-coverage:

CMakeLists.txt

@@ -18,7 +18,7 @@ set(APP_SRC_FILES
   fsw/src/cf_utils.c
 )
 
-if (CFE_EDS_ENABLED_BUILD)
+if (CFE_EDS_ENABLED)
   list(APPEND APP_SRC_FILES fsw/src/cf_eds_dispatch.c)
 else()
   list(APPEND APP_SRC_FILES fsw/src/cf_dispatch.c)

arch_build.cmake

@@ -10,23 +10,10 @@
 
 # The list of header files that control the CF configuration
 set(CF_PLATFORM_CONFIG_FILE_LIST
-  cf_internal_cfg.h
+  cf_internal_cfg_values.h
+  cf_msgid_values.h
   cf_msgids.h
   cf_platform_cfg.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(CF_CFGFILE ${CF_PLATFORM_CONFIG_FILE_LIST})
-  get_filename_component(CFGKEY "${CF_CFGFILE}" NAME_WE)
-  if (DEFINED CF_CFGFILE_SRC_${CFGKEY})
-    set(DEFAULT_SOURCE GENERATED_FILE "${CF_CFGFILE_SRC_${CFGKEY}}")
-  else()
-    set(DEFAULT_SOURCE FALLBACK_FILE "${CMAKE_CURRENT_LIST_DIR}/config/default_${CF_CFGFILE}")
-  endif()
-  generate_config_includefile(
-    FILE_NAME           "${CF_CFGFILE}"
-    ${DEFAULT_SOURCE}
-  )
-endforeach()
+generate_configfile_set(${CF_PLATFORM_CONFIG_FILE_LIST})

config/default_cf_extern_typedefs.h

@@ -23,34 +23,12 @@
  * Declarations and prototypes for cf_extern_typedefs module
  */
 
-#ifndef CF_EXTERN_TYPEDEFS_H
-#define CF_EXTERN_TYPEDEFS_H
+#ifndef DEFAULT_CF_EXTERN_TYPEDEFS_H
+#define DEFAULT_CF_EXTERN_TYPEDEFS_H
 
 /* constants such as CF_FILENAME_MAX_LEN are in mission_cfg.h */
 #include "cf_mission_cfg.h"
 
-#ifdef CFE_EDS_ENABLED_BUILD
-
-#include "cf_eds_typedefs.h"
-
-typedef CF_QueueIdx_Enum_t CF_QueueIdx_t;
-#define CF_QueueIdx_NUM       (1 + EdsDataType_CF_QueueIdx_t_MAX)
-#define CF_GetSet_ValueID_MAX (1 + EdsDataType_CF_GetSet_ValueID_t_MAX)
-
-typedef CF_EntityId_Atom_t       CF_EntityId_t;
-typedef CF_TransactionSeq_Atom_t CF_TransactionSeq_t;
-
-typedef CF_CFDP_Enum_t           CF_CFDP_Class_t;
-typedef CF_GetSet_ValueID_Enum_t CF_GetSet_ValueID_t;
-
-typedef EdsDataType_BASE_TYPES_PathName_t CF_PathName_t;
-typedef EdsDataType_BASE_TYPES_FileName_t CF_FileName_t;
-
-#define CF_FILENAME_MAX_NAME ((int)sizeof(CF_FileName_t))
-#define CF_FILENAME_MAX_LEN  ((int)sizeof(CF_PathName_t))
-
-#else
-
 /**
  * @brief Values for CFDP file transfer class
  *
@@ -134,6 +112,4 @@ typedef uint32 CF_EntityId_t;
  */
 typedef uint32 CF_TransactionSeq_t;
 
-#endif
-
 #endif /* CF_EXTERN_TYPEDEFS_H */

config/default_cf_fcncode_values.h

@@ -0,0 +1,62 @@
+/************************************************************************
+ * NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
+ * Application version 3.0.0”
+ *
+ * Copyright (c) 2019 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 CFS CFDP (CF) 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_CF_FCNCODES_H
+#define DEFAULT_CF_FCNCODES_H
+
+/************************************************************************
+ * Macro Definitions
+ ************************************************************************/
+
+ #define CF_CCVAL(x) CF_FunctionCode_##x
+
+ enum CF_FunctionCode_
+ {
+    CF_FunctionCode_NOOP                  = 0,
+    CF_FunctionCode_RESET_COUNTERS        = 1,
+    CF_FunctionCode_TX_FILE               = 2,
+    CF_FunctionCode_PLAYBACK_DIR          = 3,
+    CF_FunctionCode_FREEZE                = 4,
+    CF_FunctionCode_THAW                  = 5,
+    CF_FunctionCode_SUSPEND               = 6,
+    CF_FunctionCode_RESUME                = 7,
+    CF_FunctionCode_CANCEL                = 8,
+    CF_FunctionCode_ABANDON               = 9,
+    CF_FunctionCode_SET_PARAM             = 10,
+    CF_FunctionCode_GET_PARAM             = 11,
+    CF_FunctionCode_WRITE_QUEUE           = 15,
+    CF_FunctionCode_ENABLE_DEQUEUE        = 16,
+    CF_FunctionCode_DISABLE_DEQUEUE       = 17,
+    CF_FunctionCode_ENABLE_DIR_POLLING    = 18,
+    CF_FunctionCode_DISABLE_DIR_POLLING   = 19,
+    CF_FunctionCode_PURGE_QUEUE           = 21,
+    CF_FunctionCode_ENABLE_ENGINE         = 22,
+    CF_FunctionCode_DISABLE_ENGINE        = 23,
+ };
+
+ #endif