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

Integration Candidate 2020-03-25 #52

Merged
merged 3 commits into from
Apr 3, 2020
Merged

Integration Candidate 2020-03-25 #52

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
7bf9876
Fix #19, Release table address
Mar 11, 2020
4f40a95
Increase version to 1.1.7 and update ReadMe
Apr 1, 2020
34321ff
Integration Fix: Make Sample_AppData uppercase and add missing "statu…
Apr 3, 2020
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: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ This sample application is a non-flight example application implementation for t
sample_app is an example for how to build and link an application in cFS.

## Version Notes

- 1.1.7
- Fix bug where table is not released after being used
- Minor updates (see https://github.com/nasa/sample_app/pull/48)
- 1.1.6
- Minor updates (see https://github.com/nasa/sample_app/pull/49)
- 1.1.5
Expand Down
8 changes: 8 additions & 0 deletions fsw/src/sample_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,14 @@ int32 SAMPLE_Process( const SAMPLE_Process_t *Msg )

SAMPLE_GetCrc(TableName);

status = CFE_TBL_ReleaseAddress(SAMPLE_AppData.TblHandles[0]);
if (status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("Sample App: Fail to release table address: 0x%08lx",
(unsigned long)status);
return status;
}

/* Invoke a function provided by SAMPLE_LIB */
SAMPLE_Function();

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 @@ -33,7 +33,7 @@

#define SAMPLE_APP_MAJOR_VERSION 1
#define SAMPLE_APP_MINOR_VERSION 1
#define SAMPLE_APP_REVISION 6
#define SAMPLE_APP_REVISION 7
#define SAMPLE_APP_MISSION_REV 0


Expand Down