From 41018a883e41e6f411062f1d8861c80dc453a1cf Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Wed, 6 Mar 2024 19:30:24 -0500 Subject: [PATCH 1/2] Fix #228, apply name changes to EDS dispatcher Renames symbols to match recent EdsLib change --- fsw/src/sample_app_eds_dispatch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fsw/src/sample_app_eds_dispatch.c b/fsw/src/sample_app_eds_dispatch.c index 156973f..6751e43 100644 --- 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) { From efa1a482c411f6e1ae9b78f7e79edd2d9de2127d Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 11 Mar 2024 07:59:08 -0400 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev40 --- CHANGELOG.md | 4 ++++ fsw/src/sample_app_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1024d1d..17bc40e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc4+dev40 +- apply name changes to EDS dispatcher +- See + ## Development Build: equuleus-rc1+dev36 - updating sample_app to use new versioning system - See diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index fd9349b..1a4cfda 100644 --- 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 */