CCB 2019-09-04: Merge #1 #3 #4 #5 #7

Reviewed and approved at 2019-09-04 CCB
nasa · Sep 10, 2019 · 3589e5c · 3589e5c
2 parents 49c0ed5 + 8fddb03
commit 3589e5c
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 235 deletions.
diff --git a/fsw/for_build/Makefile b/fsw/for_build/Makefile
diff --git a/fsw/mission_inc/to_lab_perfids.h b/fsw/mission_inc/to_lab_perfids.h
@@ -18,29 +18,19 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File:
+** File: to_lab_perfids.h
 **
 ** Purpose: 
 **  Define TO Lab Performance IDs
 **
 ** Notes:
 **
-** $Log: to_lab_perfids.h  $
-** Revision 1.3 2010/09/20 12:28:05GMT-05:00 wmoleski 
-** Modified the CI_LAB, SCH_LAB and TO_LAB applications to use unique message IDs and Pipe Names. The "_LAB"
-** was added to all definitions so that a mission can use these "Lab" apps as well as their own mission apps together.
-** Revision 1.2 2008/04/30 14:43:01EDT rjmcgraw 
-** Member moved from to_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj to to_lab_perfids.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/mission_inc/project.pj.
-** Revision 1.1 2008/04/30 13:43:01ACT rjmcgraw 
-** Initial revision
-** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj
-**
 *************************************************************************/
 #ifndef _to_lab_perfids_h_
 #define _to_lab_perfids_h_
 
-#define TO_MAIN_TASK_PERF_ID            22
-#define TO_SOCKET_SEND_PERF_ID          23
+#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
@@ -18,21 +18,13 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File:
+** File: to_lab_msgids.h
 **
 ** Purpose: 
 **  Define TO Lab Message IDs
 **
 ** Notes:
 **
-** $Log: to_lab_msgids.h  $
-** Revision 1.2 2010/09/20 12:28:05GMT-05:00 wmoleski 
-** Modified the CI_LAB, SCH_LAB and TO_LAB applications to use unique message IDs and Pipe Names. The "_LAB"
-** was added to all definitions so that a mission can use these "Lab" apps as well as their own mission apps together.
-** Revision 1.1 2008/04/30 14:42:40EDT rjmcgraw 
-** Initial revision
-** Member added to project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj
-**
 *************************************************************************/
 #ifndef _to_lab_msgids_h_
 #define _to_lab_msgids_h_

diff --git a/fsw/platform_inc/to_lab_sub_table.h b/fsw/platform_inc/to_lab_sub_table.h
@@ -25,12 +25,6 @@
 **
 ** Notes:
 **
-** $Log: to_lab_sub_table.h  $
-** Revision 1.3 2014/07/16 14:44:45GMT-05:00 acudmore 
-** Member renamed from to_sub_table.h to to_lab_sub_table.h in project c:/MKSDATA/MKS-REPOSITORY/CFS-REPOSITORY/to_lab/fsw/platform_inc/project.pj.
-** Revision 1.2 2014/07/16 14:44:45ACT acudmore 
-** Updated TO_LAB subscription table header file ( comments, clean up )
-**
 *************************************************************************/
 
 /* 
@@ -53,7 +47,7 @@
 #include "lc_msgids.h"
 #endif
 
-static TO_subsciption_t  TO_SubTable[] =
+static TO_subscription_t  TO_SubTable[] =
 {
             /* CFS App Subscriptions */
             {TO_LAB_HK_TLM_MID,     {0,0},  4},
@@ -69,19 +63,20 @@ static TO_subsciption_t  TO_SubTable[] =
             {DS_HK_TLM_MID,         {0,0},  4},
             {LC_HK_TLM_MID,         {0,0},  4},
 #endif
-            /* cFE Core subsciptions */
-            {CFE_ES_HK_TLM_MID,     {0,0},  4},
-            {CFE_EVS_HK_TLM_MID,    {0,0},  4},
-            {CFE_SB_HK_TLM_MID,     {0,0},  4},
-            {CFE_TBL_HK_TLM_MID,    {0,0},  4},
-            {CFE_TIME_HK_TLM_MID,   {0,0},  4},
-            {CFE_TIME_DIAG_TLM_MID, {0,0},  4},
-            {CFE_SB_STATS_TLM_MID,  {0,0},  4},
-            {CFE_TBL_REG_TLM_MID,   {0,0},  4},
-            {CFE_EVS_EVENT_MSG_MID, {0,0},  32},
-            {CFE_ES_SHELL_TLM_MID,  {0,0},  32},
-            {CFE_ES_APP_TLM_MID,    {0,0},   4},
-            {CFE_ES_MEMSTATS_TLM_MID,{0,0},  4},
+
+            /* cFE Core subscriptions */
+            {CFE_ES_HK_TLM_MID,          {0,0},  4},
+            {CFE_EVS_HK_TLM_MID,         {0,0},  4},
+            {CFE_SB_HK_TLM_MID,          {0,0},  4},
+            {CFE_TBL_HK_TLM_MID,         {0,0},  4},
+            {CFE_TIME_HK_TLM_MID,        {0,0},  4},
+            {CFE_TIME_DIAG_TLM_MID,      {0,0},  4},
+            {CFE_SB_STATS_TLM_MID,       {0,0},  4},
+            {CFE_TBL_REG_TLM_MID,        {0,0},  4},
+            {CFE_EVS_LONG_EVENT_MSG_MID, {0,0}, 32},
+            {CFE_ES_SHELL_TLM_MID,       {0,0}, 32},
+            {CFE_ES_APP_TLM_MID,         {0,0},  4},
+            {CFE_ES_MEMSTATS_TLM_MID,    {0,0},  4},
 
             {TO_UNUSED,              {0,0},  0},
             {TO_UNUSED,              {0,0},  0},