Merge pull request #93 from nasa/integration-candidate

Integration Candidate: 2020-08-26
nasa · Sep 1, 2020 · 9ff605e · 9ff605e
2 parents c1348d6 + 2a0c8d5
commit 9ff605e
Show file tree

Hide file tree

Showing 13 changed files with 211 additions and 322 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,12 @@ sample_app is an example for how to build and link an application in cFS. See al
 
 ## Version History
 
+### Development Build: 1.2.0-rc1+dev5
+
+- Applies standard coding style.
+- Removes test code call of CFE_SB_InitMsg and sets the API/stub buffers directly.
+- See <https://github.com/nasa/sample_app/pull/93>
+
 ### Development Build: 1.1.0+dev65
 
 - Add build number and baseline to version report

diff --git a/fsw/mission_inc/sample_app_perfids.h b/fsw/mission_inc/sample_app_perfids.h
@@ -20,7 +20,7 @@
 **
 ** File: sample_app_perfids.h
 **
-** Purpose: 
+** Purpose:
 **  Define Sample App Performance IDs
 **
 ** Notes:
@@ -29,8 +29,7 @@
 #ifndef _sample_app_perfids_h_
 #define _sample_app_perfids_h_
 
-
-#define SAMPLE_APP_PERF_ID              91 
+#define SAMPLE_APP_PERF_ID 91
 
 #endif /* _sample_app_perfids_h_ */
 

diff --git a/fsw/platform_inc/sample_app_msgids.h b/fsw/platform_inc/sample_app_msgids.h
@@ -20,7 +20,7 @@
 **
 ** File: sample_app_msgids.h
 **
-** Purpose: 
+** Purpose:
 **  Define Sample App  Message IDs
 **
 ** Notes:
@@ -30,9 +30,9 @@
 #ifndef _sample_app_msgids_h_
 #define _sample_app_msgids_h_
 
-#define SAMPLE_APP_CMD_MID            	0x1882
-#define SAMPLE_APP_SEND_HK_MID        	0x1883
-#define SAMPLE_APP_HK_TLM_MID		0x0883
+#define SAMPLE_APP_CMD_MID     0x1882
+#define SAMPLE_APP_SEND_HK_MID 0x1883
+#define SAMPLE_APP_HK_TLM_MID  0x0883
 
 #endif /* _sample_app_msgids_h_ */
 

diff --git a/fsw/platform_inc/sample_app_table.h b/fsw/platform_inc/sample_app_table.h
@@ -35,8 +35,8 @@
 */
 typedef struct
 {
-    uint16     Int1;
-    uint16     Int2;
+    uint16 Int1;
+    uint16 Int2;
 
 } SAMPLE_APP_Table_t;