Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sample_app Integration candidate: Equuleus-rc1+dev7 #230

Merged
merged 3 commits into from
Mar 12, 2024
Merged

sample_app Integration candidate: Equuleus-rc1+dev7 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41018a8
Fix #228, apply name changes to EDS dispatcher
jphickey Mar 7, 2024
f163a90
Merge pull request #229 from jphickey:fix-228-eds-namechange
dzbaker Mar 11, 2024
efa1a48
Updating documentation and version numbers for equuleus-rc1+dev40
dzbaker Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
5 changes: 2 additions & 3 deletions fsw/src/sample_app_eds_dispatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sample_app_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading