Merge pull request nasa#40 from skliper/fix#20-apply-style

Fix nasa#20, Apply standard code style
thnkslprpt · May 28, 2020 · ee62526 · ee62526
2 parents b9b76e2 + fce3a6e
commit ee62526
Show file tree

Hide file tree

Showing 8 changed files with 307 additions and 347 deletions.
diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/mission_inc/to_lab_perfids.h
@@ -20,7 +20,7 @@
 **
 ** File: to_lab_perfids.h
 **
-** Purpose: 
+** Purpose:
 ** Define TO Lab Performance IDs
 **
 ** Notes:
@@ -29,8 +29,8 @@
 #ifndef _to_lab_perfids_h_
 #define _to_lab_perfids_h_
 
-#define TO_MAIN_TASK_PERF_ID  34
-#define TO_SOCKET_SEND_PERF_ID  35
+#define TO_MAIN_TASK_PERF_ID 34
+#define TO_SOCKET_SEND_PERF_ID 35
 
 #endif /* _to_lab_perfids_h_ */
 

diff --git a/fsw/platform_inc/to_lab_msgids.h b/fsw/platform_inc/to_lab_msgids.h
@@ -20,7 +20,7 @@
 **
 ** File: to_lab_msgids.h
 **
-** Purpose: 
+** Purpose:
 ** Define TO Lab Message IDs
 **
 ** Notes:
@@ -29,12 +29,11 @@
 #ifndef _to_lab_msgids_h_
 #define _to_lab_msgids_h_
 
+#define TO_LAB_CMD_MID 0x1880
+#define TO_LAB_SEND_HK_MID 0x1881
 
-#define TO_LAB_CMD_MID 0x1880
-#define TO_LAB_SEND_HK_MID 0x1881
-
-#define TO_LAB_HK_TLM_MID 0x0880
-#define TO_LAB_DATA_TYPES_MID 0x0881
+#define TO_LAB_HK_TLM_MID 0x0880
+#define TO_LAB_DATA_TYPES_MID 0x0881
 
 #endif /* _to_lab_msgids_h_ */
 

diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/platform_inc/to_lab_sub_table.h
@@ -20,14 +20,14 @@
 **
 ** File: to_sub_table.h
 **
-** Purpose: 
-** Define TO Lab CPU specific subscription table 
+** Purpose:
+** Define TO Lab CPU specific subscription table
 **
 ** Notes:
 **
 *************************************************************************/
 
-/* 
+/*
 ** Add the proper include file for the message IDs below
 */
 #include "cfe_msgids.h"
@@ -47,13 +47,12 @@
 #include "lc_msgids.h"
 #endif
 
-static TO_subscription_t TO_SubTable[] =
-{
- /* CFS App Subscriptions */
- {CFE_SB_MSGID_WRAP_VALUE(TO_LAB_HK_TLM_MID), {0,0}, 4},
- {CFE_SB_MSGID_WRAP_VALUE(TO_LAB_DATA_TYPES_MID), {0,0}, 4},
- {CFE_SB_MSGID_WRAP_VALUE(CI_LAB_HK_TLM_MID), {0,0}, 4},
- {CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_HK_TLM_MID), {0,0}, 4},
+static TO_subscription_t TO_SubTable[] = {
+ /* CFS App Subscriptions */
+ {CFE_SB_MSGID_WRAP_VALUE(TO_LAB_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(TO_LAB_DATA_TYPES_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CI_LAB_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_HK_TLM_MID), {0, 0}, 4},
 
 #if 0
  /* Add these if needed */
@@ -64,29 +63,28 @@ static TO_subscription_t TO_SubTable[] =
  {LC_HK_TLM_MID, {0,0}, 4},
 #endif
 
-  /* cFE Core subscriptions */
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_HK_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_HK_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_HK_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_HK_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_HK_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_DIAG_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_STATS_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_REG_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_LONG_EVENT_MSG_MID), {0,0}, 32},
+ /* cFE Core subscriptions */
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_HK_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_DIAG_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_STATS_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_REG_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_LONG_EVENT_MSG_MID), {0, 0}, 32},
 
 #ifndef CFE_OMIT_DEPRECATED_6_7
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SHELL_TLM_MID),  {0,0}, 32},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SHELL_TLM_MID), {0, 0}, 32},
 #endif
 
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_APP_TLM_MID),  {0,0},  4},
-  {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_MEMSTATS_TLM_MID),  {0,0},  4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_APP_TLM_MID), {0, 0}, 4},
+ {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_MEMSTATS_TLM_MID), {0, 0}, 4},
 
- {TO_UNUSED, {0,0}, 0},
- {TO_UNUSED, {0,0}, 0},
- {TO_UNUSED, {0,0}, 0}
-};
+ {TO_UNUSED, {0, 0}, 0},
+ {TO_UNUSED, {0, 0}, 0},
+ {TO_UNUSED, {0, 0}, 0}};
 
 /************************
-** End of File Comment ** 
+** End of File Comment **
 ************************/