Skip to content

Commit b956292

Browse files
authored
Merge pull request #52 from nasa/integration-candidate
Integration Candidate 2020-03-25
2 parents 602aabe + 34321ff commit b956292

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ This sample application is a non-flight example application implementation for t
77
sample_app is an example for how to build and link an application in cFS.
88

99
## Version Notes
10-
10+
- 1.1.7
11+
- Fix bug where table is not released after being used
12+
- Minor updates (see https://github.com/nasa/sample_app/pull/48)
1113
- 1.1.6
1214
- Minor updates (see https://github.com/nasa/sample_app/pull/49)
1315
- 1.1.5

fsw/src/sample_app.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,14 @@ int32 SAMPLE_Process( const SAMPLE_Process_t *Msg )
451451

452452
SAMPLE_GetCrc(TableName);
453453

454+
status = CFE_TBL_ReleaseAddress(SAMPLE_AppData.TblHandles[0]);
455+
if (status != CFE_SUCCESS)
456+
{
457+
CFE_ES_WriteToSysLog("Sample App: Fail to release table address: 0x%08lx",
458+
(unsigned long)status);
459+
return status;
460+
}
461+
454462
/* Invoke a function provided by SAMPLE_LIB */
455463
SAMPLE_Function();
456464

fsw/src/sample_app_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#define SAMPLE_APP_MAJOR_VERSION 1
3535
#define SAMPLE_APP_MINOR_VERSION 1
36-
#define SAMPLE_APP_REVISION 6
36+
#define SAMPLE_APP_REVISION 7
3737
#define SAMPLE_APP_MISSION_REV 0
3838

3939

0 commit comments

Comments
 (0)