Merge pull request #2441 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev58
nasa · Sep 13, 2023 · c1aa16a · c1aa16a
2 parents 798d557 + efc8905
commit c1aa16a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev389
+- Adds a cast to the negation of unsigned expression
+- See <https://github.com/nasa/cFE/pull/2437>
+
 ## Development Build: v7.0.0-rc4+dev384
 - Uninitialized PktTime in EVS_SendViaPorts
 - Uninitialized ExceptionTaskID in CFE_ES_RunExceptionScan

diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   384 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   389 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */

diff --git a/modules/evs/fsw/src/cfe_evs_utils.c b/modules/evs/fsw/src/cfe_evs_utils.c
@@ -301,7 +301,7 @@ bool EVS_CheckAndIncrementSquelchTokens(EVS_AppData_t *AppDataPtr)
      * CFE_PLATFORM_EVS_APP_EVENTS_PER_SEC) seconds after flooding stops if
      * saturated
      */
-    const int32 LOWER_THRESHOLD = -CFE_EVS_Global.EVS_EventBurstMax * 1000;
+    const int32 LOWER_THRESHOLD = -(int32)CFE_EVS_Global.EVS_EventBurstMax * 1000;
 
     /*
      * Set this to 1000 to avoid integer division while computing CreditCount