Merge pull request #52 from nasa/integration-candidate

Integration Candidate 2020-03-25
nasa · Apr 3, 2020 · b956292 · b956292
2 parents 602aabe + 34321ff
commit b956292
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -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  

diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c
@@ -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();
 

diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h
@@ -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