Merge pull request #230 from nasa/integration-candidate

sample_app Integration candidate: Equuleus-rc1+dev7
nasa · Mar 12, 2024 · ad59627 · ad59627
2 parents 2dd3b1c + efa1a48
commit ad59627
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc4+dev40
+- apply name changes to EDS dispatcher
+- See <https://github.com/nasa/sample_app/pull/229>
+
 ## Development Build: equuleus-rc1+dev36
 - updating sample_app to use new versioning system
 - See <https://github.com/nasa/sample_app/pull/226>

diff --git a/fsw/src/sample_app_eds_dispatch.c b/fsw/src/sample_app_eds_dispatch.c
@@ -37,7 +37,7 @@
 /*
  * Define a lookup table for SAMPLE app command codes
  */
-static const SAMPLE_APP_Application_Component_Telecommand_DispatchTable_t SAMPLE_TC_DISPATCH_TABLE = {
+static const EdsDispatchTable_SAMPLE_APP_Application_CFE_SB_Telecommand_t SAMPLE_TC_DISPATCH_TABLE = {
     .CMD     = {.NoopCmd_indication          = SAMPLE_APP_NoopCmd,
             .ResetCountersCmd_indication = SAMPLE_APP_ResetCountersCmd,
             .ProcessCmd_indication       = SAMPLE_APP_ProcessCmd,
@@ -58,8 +58,7 @@ void SAMPLE_APP_TaskPipe(const CFE_SB_Buffer_t *SBBufPtr)
     CFE_MSG_Size_t    MsgSize;
     CFE_MSG_FcnCode_t MsgFc;
 
-    Status = SAMPLE_APP_Application_Component_Telecommand_Dispatch(CFE_SB_Telecommand_indication_Command_ID, SBBufPtr,
-                                                                   &SAMPLE_TC_DISPATCH_TABLE);
+    Status = EdsDispatch_SAMPLE_APP_Application_Telecommand(SBBufPtr, &SAMPLE_TC_DISPATCH_TABLE);
 
     if (Status != CFE_SUCCESS)
     {

diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h
@@ -27,7 +27,7 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_APP_BUILD_NUMBER    36 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_APP_BUILD_NUMBER    40 /*!< Development Build: Number of commits since baseline */
 #define SAMPLE_APP_BUILD_BASELINE  "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
 #define SAMPLE_APP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define SAMPLE_APP_BUILD_CODENAME  "Equuleus" /**< @brief: Development: Code name for the current build */