Merge pull request nasa#833 from nasa/integration-candidate

Integration Candidate: 2020-08-19
jphickey · Aug 25, 2020 · 06c0826 · 06c0826
2 parents a148b97 + 993d556
commit 06c0826
Show file tree

Hide file tree

Showing 69 changed files with 6,577 additions and 2,167 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,8 @@ script:
   # Check versions
   - cppcheck --version
 
-  #cppcheck flight software cfe/fsw/cfe-core/src
-  - cppcheck --force --inline-suppr --std=c99 --language=c --error-exitcode=1 --enable=warning,performance,portability,style --suppress=variableScope --inconclusive fsw/cfe-core/src 2>cppcheck_flight_cfe.txt
+  #cppcheck flight software fsw/cfe-core/src and modules
+  - cppcheck --force --inline-suppr --std=c99 --language=c --error-exitcode=1 --enable=warning,performance,portability,style --suppress=variableScope --inconclusive fsw/cfe-core/src modules 2>cppcheck_flight_cfe.txt
   - |
     if [[ -s cppcheck_flight_cfe.txt ]]; then
       echo "You must fix cppcheck errors before submitting a pull request"

diff --git a/README.md b/README.md
@@ -10,6 +10,14 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 
 ## Version History
 
+### Development Build: 6.8.0-rc1+dev28
+
+- Add msg stubs, update SB_UT to use them, and remove msg module include from unit tests
+- Collapses time options down to just 32 bit second, 16 bit subsecond, always big endian. Removes old defines, and triggers an error if the configuration is set to a format that was removed.
+- Enables source selection and out-of-tree mission-defined overrides in the msg directory
+- Unit tests added from within unit tests will not execute, replaced this pattern with direct calls to the main subtest setup routine.
+- See <https://github.com/nasa/cFE/pull/833>
+
 ### Development Build: 6.8.0-rc1+dev13
 
 - Deprecates `CFE_SB_GetLastSenderId()` API by introducing new `CFE_OMIT_DEPRECATED_6_8` tag

diff --git a/cmake/mission_defaults.cmake b/cmake/mission_defaults.cmake
@@ -14,6 +14,7 @@ set(MISSION_CORE_MODULES
     "cfe-core" 
     "osal"
     "psp"
+    "msg"
 )
 
 # The "MISSION_GLOBAL_APPLIST" is a set of apps/libs that will be built

diff --git a/cmake/sample_defs/sample_mission_cfg.h b/cmake/sample_defs/sample_mission_cfg.h
@@ -67,26 +67,6 @@
 #undef MESSAGE_FORMAT_IS_CCSDS_VER_2
 
 
-
-/** \name Packet timestamp format identifiers */
-/** \{ */
-#define CFE_MISSION_SB_TIME_32_16_SUBS   1  /**< \brief 32 bits seconds + 16 bits subseconds (units = 2^^-16)  */
-#define CFE_MISSION_SB_TIME_32_32_SUBS   2  /**< \brief 32 bits seconds + 32 bits subseconds (units = 2^^-32)  */
-#define CFE_MISSION_SB_TIME_32_32_M_20   3  /**< \brief 32 bits seconds + 20 bits microsecs + 12 bits reserved */
-/** \} */
-
-/**
-**  \cfemissioncfg Packet Timestamp Format Selection
-**
-**  \par Description:
-**      Defines the size, format and contents of the telemetry packet timestamp.
-**
-**  \par Limits
-**      Must be defined as one of the supported formats listed above
-*/
-#define CFE_MISSION_SB_PACKET_TIME_FORMAT  CFE_MISSION_SB_TIME_32_16_SUBS
-
-
 /**
 **  \cfesbcfg Maximum SB Message Size
 **
@@ -699,10 +679,6 @@
 #ifndef CFE_OMIT_DEPRECATED_6_6
 
 #define CFE_SPACECRAFT_ID           CFE_MISSION_SPACECRAFT_ID
-#define CFE_SB_TIME_32_16_SUBS      CFE_MISSION_SB_TIME_32_16_SUBS
-#define CFE_SB_TIME_32_32_SUBS      CFE_MISSION_SB_TIME_32_32_SUBS
-#define CFE_SB_TIME_32_32_M_20      CFE_MISSION_SB_TIME_32_32_M_20
-#define CFE_SB_PACKET_TIME_FORMAT   CFE_MISSION_SB_PACKET_TIME_FORMAT
 #define CFE_SB_MAX_SB_MSG_SIZE      CFE_MISSION_SB_MAX_SB_MSG_SIZE
 #define CFE_TIME_CFG_DEFAULT_TAI    CFE_MISSION_TIME_CFG_DEFAULT_TAI
 #define CFE_TIME_CFG_DEFAULT_UTC    CFE_MISSION_TIME_CFG_DEFAULT_UTC