Fixes, #59, Updates CMD/TLM definition files

Fix #59, Updated GroundSystem.py cmd and tlm definitions Fix #59, Updated GroundSystem.py cmd and tlm definitions
nasa · Mar 18, 2020 · 5ae236a · 5ae236a
1 parent 33a9829
commit 5ae236a
Show file tree

Hide file tree

Showing 100 changed files with 387 additions and 25 deletions.
diff --git a/Subsystems/cmdGui/CHeaderParser-hdr-paths.txt b/Subsystems/cmdGui/CHeaderParser-hdr-paths.txt
@@ -15,3 +15,9 @@
 #
 #../../../../apps/to_lab/fsw/src/to_lab_msg.h
 #../../../../apps/ci_lab/fsw/src/ci_lab_msg.h
+#../../../../apps/sample_app/fsw/src/sample_app_msg.h
+../../../../cfe/fsw/cfe-core/src/inc/cfe_es_msg.h
+#../../../../cfe/fsw/cfe-core/src/inc/cfe_time_msg.h
+#../../../../cfe/fsw/cfe-core/src/inc/cfe_evs_msg.h
+#../../../../cfe/fsw/cfe-core/src/inc/cfe_sb_msg.h
+#../../../../cfe/fsw/cfe-core/src/inc/cfe_tbl_msg.h
diff --git a/Subsystems/cmdGui/CHeaderParser.py b/Subsystems/cmdGui/CHeaderParser.py
@@ -435,7 +435,7 @@ def getFileList(self, filename='CHeaderParser-hdr-paths.txt'):
 
 				# If no type could match, ask user for data type
 				if dataTypeNew == '':
-					typeNew = parser.findKeyword(dataTypesOrig[-1])
+					#typeNew = parser.findKeyword(dataTypesOrig[-1])
 					dataTypeNew = input('Data type for '+paramNames[-1]+' not found. Please enter new data type by hand: ')
 
 				dataTypesNew.append(dataTypeNew)

diff --git a/Subsystems/cmdGui/CommandFiles/CFE_ES_CMD b/Subsystems/cmdGui/CommandFiles/CFE_ES_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/CFE_EVS_CMD b/Subsystems/cmdGui/CommandFiles/CFE_EVS_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/CFE_SB_CMD b/Subsystems/cmdGui/CommandFiles/CFE_SB_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/CFE_TBL_CMD b/Subsystems/cmdGui/CommandFiles/CFE_TBL_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/CFE_TIME_CMD b/Subsystems/cmdGui/CommandFiles/CFE_TIME_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/CI_LAB_CMD b/Subsystems/cmdGui/CommandFiles/CI_LAB_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/SAMPLE_APP_CMD b/Subsystems/cmdGui/CommandFiles/SAMPLE_APP_CMD
diff --git a/Subsystems/cmdGui/CommandFiles/TO_LAB_CMD b/Subsystems/cmdGui/CommandFiles/TO_LAB_CMD
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_DELETE_CDS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_DELETE_CDS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_DUMP_CDS_REGISTRY_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_DUMP_CDS_REGISTRY_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_OVER_WRITE_SYSLOG_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_OVER_WRITE_SYSLOG_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_QUERY_ALL_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_QUERY_ALL_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_QUERY_ALL_TASKS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_QUERY_ALL_TASKS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_QUERY_ONE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_QUERY_ONE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_RELOAD_APP_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_RELOAD_APP_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_RESTART_APP_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_RESTART_APP_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_RESTART_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_RESTART_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_SEND_MEM_POOL_STATS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_SEND_MEM_POOL_STATS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_SET_MAX_PR_COUNT_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_SET_MAX_PR_COUNT_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_SET_PERF_FILTER_MASK_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_SET_PERF_FILTER_MASK_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_SET_PERF_TRIGGER_MASK_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_SET_PERF_TRIGGER_MASK_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_SHELL_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_SHELL_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_START_APP_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_START_APP_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_START_PERF_DATA_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_START_PERF_DATA_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_STOP_APP_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_STOP_APP_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_STOP_PERF_DATA_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_STOP_PERF_DATA_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_WRITE_ER_LOG_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_WRITE_ER_LOG_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_ES_WRITE_SYSLOG_CC b/Subsystems/cmdGui/ParameterFiles/CFE_ES_WRITE_SYSLOG_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ADD_EVENT_FILTER_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ADD_EVENT_FILTER_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DELETE_EVENT_FILTER_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DELETE_EVENT_FILTER_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_APP_EVENTS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_APP_EVENTS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_APP_EVENT_TYPE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_APP_EVENT_TYPE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_EVENT_TYPE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_EVENT_TYPE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_PORTS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_DISABLE_PORTS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_APP_EVENTS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_APP_EVENTS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_APP_EVENT_TYPE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_APP_EVENT_TYPE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_EVENT_TYPE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_EVENT_TYPE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_PORTS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_ENABLE_PORTS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_RESET_ALL_FILTERS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_RESET_ALL_FILTERS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_RESET_APP_COUNTER_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_RESET_APP_COUNTER_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_RESET_FILTER_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_RESET_FILTER_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_SET_EVENT_FORMAT_MODE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_SET_EVENT_FORMAT_MODE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_SET_FILTER_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_SET_FILTER_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_SET_LOG_MODE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_SET_LOG_MODE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_WRITE_APP_DATA_FILE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_WRITE_APP_DATA_FILE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_EVS_WRITE_LOG_DATA_FILE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_EVS_WRITE_LOG_DATA_FILE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_SB_DISABLE_ROUTE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_SB_DISABLE_ROUTE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_SB_ENABLE_ROUTE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_SB_ENABLE_ROUTE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_SB_SEND_MAP_INFO_CC b/Subsystems/cmdGui/ParameterFiles/CFE_SB_SEND_MAP_INFO_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_SB_SEND_PIPE_INFO_CC b/Subsystems/cmdGui/ParameterFiles/CFE_SB_SEND_PIPE_INFO_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_SB_SEND_ROUTING_INFO_CC b/Subsystems/cmdGui/ParameterFiles/CFE_SB_SEND_ROUTING_INFO_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_ABORT_LOAD_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_ABORT_LOAD_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_ACTIVATE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_ACTIVATE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_DELETE_CDS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_DELETE_CDS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_DUMP_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_DUMP_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_DUMP_REGISTRY_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_DUMP_REGISTRY_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_LOAD_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_LOAD_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_SEND_REGISTRY_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_SEND_REGISTRY_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TBL_VALIDATE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TBL_VALIDATE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_ADD_1HZ_ADJUSTMENT_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_ADD_1HZ_ADJUSTMENT_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_ADD_ADJUST_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_ADD_ADJUST_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_ADD_DELAY_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_ADD_DELAY_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_LEAP_SECONDS_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_LEAP_SECONDS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_MET_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_MET_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_SIGNAL_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_SIGNAL_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_SOURCE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_SOURCE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_STATE_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_STATE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_STCF_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_STCF_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_TIME_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SET_TIME_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SUB_1HZ_ADJUSTMENT_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SUB_1HZ_ADJUSTMENT_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SUB_ADJUST_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SUB_ADJUST_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SUB_DELAY_CC b/Subsystems/cmdGui/ParameterFiles/CFE_TIME_SUB_DELAY_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CI_CAPTURE_PDUS_CC b/Subsystems/cmdGui/ParameterFiles/CI_CAPTURE_PDUS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CI_DROP_PDUS_CC b/Subsystems/cmdGui/ParameterFiles/CI_DROP_PDUS_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/CI_MODIFY_PDU_FILESIZE_CC b/Subsystems/cmdGui/ParameterFiles/CI_MODIFY_PDU_FILESIZE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/TO_ADD_PKT_CC b/Subsystems/cmdGui/ParameterFiles/TO_ADD_PKT_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/TO_OUTPUT_ENABLE_CC b/Subsystems/cmdGui/ParameterFiles/TO_OUTPUT_ENABLE_CC
diff --git a/Subsystems/cmdGui/ParameterFiles/TO_REMOVE_PKT_CC b/Subsystems/cmdGui/ParameterFiles/TO_REMOVE_PKT_CC
diff --git a/Subsystems/cmdGui/command-pages.txt b/Subsystems/cmdGui/command-pages.txt
@@ -21,6 +21,17 @@
 #  Note(1): Lines starting with a # will be skipped
 #  Note(2): Please do not leave a blank line at the end of the file!
 #
+Executive Services,         CFE_ES_CMD,         0x1806, LE, UdpCommands.py,  127.0.0.1,   1234
+Software Bus,               CFE_SB_CMD,         0x1803, LE, UdpCommands.py,  127.0.0.1,   1234
+Table Services,             CFE_TBL_CMD,        0x1804, LE, UdpCommands.py,  127.0.0.1,   1234
+Time Services,              CFE_TIME_CMD,       0x1805, LE, UdpCommands.py,  127.0.0.1,   1234
+Event Services,             CFE_EVS_CMD,        0x1801, LE, UdpCommands.py,  127.0.0.1,   1234
+Command Ingest,             CI_LAB_CMD,         0x1884, LE, UdpCommands.py,  127.0.0.1,   1234
+Telemetry Output,           TO_LAB_CMD,         0x1880, LE, UdpCommands.py,  127.0.0.1,   1234
+Sample App,                 SAMPLE_APP_CMD,     0x1882, LE, UdpCommands.py,  127.0.0.1,   1234
+Spare,                                    ,     0x0000, LE, UdpCommands.py,  127.0.0.1,   1234
+Spare,                                    ,     0x0000, LE, UdpCommands.py,  127.0.0.1,   1234
+LEGACY DEFINITIONS,                       ,     0x0000, LE, UdpCommands.py,  127.0.0.1,   1234
 Executive Services (CPU1),  cfe__es__msg_8h,    0x1806, LE, UdpCommands.py,  127.0.0.1,   1234
 Software Bus (CPU1),        cfe__sb__msg_8h,    0x1803, LE, UdpCommands.py,  127.0.0.1,   1234
 Table Services (CPU1),      cfe__tbl__msg_8h,   0x1804, LE, UdpCommands.py,  127.0.0.1,   1234

diff --git a/Subsystems/cmdGui/quick-buttons.txt b/Subsystems/cmdGui/quick-buttons.txt
@@ -20,6 +20,14 @@
 # Note(3): Subsystem name must match name in command-pages.txt exactly
 # Note(4): Command name need not match name in command definition file; shorten name if possible
 #
-Telemetry Output LAB,       to_lab_msg,         Enable Tlm,    6, 0x1880, LE, 127.0.0.1, 1234, TO_OUTPUT_ENABLE_CC
+Telemetry Output LAB,       to_lab_msg,         Enable Tlm,    6, 0x1880, LE, 127.0.0.1, 1234,  TO_OUTPUT_ENABLE_CC
 Executive Services (CPU1),  cfe__es__msg_8h,    ES No-Op,      0, 0x1806, LE, 127.0.0.1, 1234, struct_c_f_e___e_s___no_args_cmd__t
 Time Services (CPU1),       cfe__time__msg_8h,  Time No-Op,    0, 0x1805, LE, 127.0.0.1, 1234, struct_c_f_e___t_i_m_e___no_args_cmd__t
+Telemetry Output,            TO_LAB_CMD,        Enable Tlm,    6, 0x1880, LE, 127.0.0.1,  1234, TO_OUTPUT_ENABLE_CC
+Executive Services,         CFE_ES_CMD,         ES No-Op,      0, 0x1806, LE, 127.0.0.1,  1234, CFE_ES_NOOP_CC
+Software Bus,               CFE_SB_CMD,         SB No-Op,      0, 0x1803, LE, 127.0.0.1,  1234, CFE_SB_NOOP_CC
+Table Services,             CFE_TBL_CMD,        TBL No-Op,      0, 0x1804, LE, 127.0.0.1,  1234, CFE_TBL_NOOP_CC
+Time Services,              CFE_TIME_CMD,       Time No-Op,    0, 0x1805, LE, 127.0.0.1,  1234, CFE_TIME_NOOP_CC
+Event Services,             CFE_EVS_CMD,        EVS No-Op,     0, 0x1801, LE, 127.0.0.1,  1234, CFE_EVS_NOOP_CC
+Command Ingest,             CI_LAB_CMD,         CI No-Op,      0, 0x1884, LE, 127.0.0.1,  1234, CI_LAB_NOOP_CC
+Sample App,                 SAMPLE_APP_CMD,     Sample No-Op,  0, 0x1882, LE, 127.0.0.1,  1234, SAMPLE_APP_NOOP_CC
diff --git a/Subsystems/tlmGUI/cfe-es-app-tlm.txt b/Subsystems/tlmGUI/cfe-es-app-tlm.txt
@@ -0,0 +1,19 @@
+Name,                 20, 20,  s, Str, NULL,        NULL,        NULL,       NULL
+EntryPoint,           40, 20,  s, Str, NULL,        NULL,        NULL,       NULL
+FileName,             60, 64,  s, Str, NULL,        NULL,        NULL,       NULL
+StackSize,            124,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+ModuleId,             128,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+AddressesAreValid,    132,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+CodeAddress,          136,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+CodeSize,             140,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+DataAddress,          144,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+DataSize,             148,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+BSSAddress,           152,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+BSSSize,              156,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+StartAddress,         160,  4,  I, Hex, NULL,        NULL,        NULL,       NULL
+ExceptionAction,      164,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Priority,             166,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+MainTaskId,           168,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+ExecutionCounter,     172,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MainTaskName,         176,  20, s, Str, NULL,        NULL,        NULL,       NULL
+NumOfChildTasks,      196,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt b/Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt
@@ -0,0 +1,9 @@
+BlockSize,           16,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumCreated,          20,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumFree,             24,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+BlockSize,           28,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumCreated,          32,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumFree,             36,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+BlockSize,           40,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumCreated,          44,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumFree,             46,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-es-memstats-tlm.txt b/Subsystems/tlmGUI/cfe-es-memstats-tlm.txt
@@ -0,0 +1,5 @@
+PoolHandle,                    20,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PoolSize,                      24,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumBlocksRequested,            28,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+CheckErrCtr,                   32,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+NumFreeBytes,                  36,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-es-shell-tlm.txt b/Subsystems/tlmGUI/cfe-es-shell-tlm.txt
@@ -0,0 +1 @@
+ShellOutput,             16, 64,  s, Str, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-evs-hk-tlm.txt b/Subsystems/tlmGUI/cfe-evs-hk-tlm.txt
@@ -0,0 +1,15 @@
+#
+Command Counter,        12,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+CommandErrorCounter,    13,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+MessageFormatMode,      14,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+MessageTruncCounter,    15,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+UnregisteredAppCounter, 16,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+OutputPort,             17,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+LogFullFlag,            18,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+LogMode,                19,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+MessageSendCounter,     20,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+LogOverflowCounter,     22,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+LogEnabled,             24,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare1,                 25,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare2,                 26,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare3,                 27,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-sb-allsubs-tlm.txt b/Subsystems/tlmGUI/cfe-sb-allsubs-tlm.txt
@@ -0,0 +1,3 @@
+PktSegment,                    16,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+TotalSegments,                 20,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+Entries,                       24,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt b/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt
@@ -0,0 +1,17 @@
+#
+Command Counter,               16,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Error Counter,                 17,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+NoSubscribersCounter,          18,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+MsgSendErrorCounter,           19,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+MsgReceiveErrorCounter,        20,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+InternalErrorCounter,          21,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+CreatePipeErrorCounter,        22,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+SubscribeErrorCounter,         23,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+PipeOptsErrorCounter,          24,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+DuplicateSubscriptionsCounter, 25,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare2Align,                   26,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeOverflowErrorCounter,      28,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+MsgLimitErrorCounter,          30,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+MemPoolHandle,                 32,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MemInUse,                      36,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+UnmarkedMem,                   40,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-sb-onesub-tlm.txt b/Subsystems/tlmGUI/cfe-sb-onesub-tlm.txt
@@ -0,0 +1,5 @@
+SubType,                    12,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+MsgId,                      13,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+QOS.Priority,               15,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+QOS.Reliability,            16,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Pipe ID,                    17,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-sb-pipedepthstats_1-tlm.txt b/Subsystems/tlmGUI/cfe-sb-pipedepthstats_1-tlm.txt
@@ -0,0 +1,45 @@
+PipeId,           72,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            73,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            74,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      76,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      78,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           80,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            81,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            82,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      84,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      86,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           88,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            89,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            90,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      92,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      94,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           96,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            97,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            98,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      100,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      102,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           104,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            105,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            106,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      108,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      110,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           112,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            113,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            114,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      116,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      118,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           120,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            121,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            122,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      124,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      126,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           128,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            129,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            130,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      132,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      134,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           136,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            137,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            138,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      140,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      142,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-sb-pipedepthstats_2-tlm.txt b/Subsystems/tlmGUI/cfe-sb-pipedepthstats_2-tlm.txt
@@ -0,0 +1,45 @@
+PipeId,           144,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            145,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            146,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      148,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      150,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           152,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            153,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            154,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      156,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      158,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           160,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            161,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            162,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      164,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      166,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           168,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            169,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            170,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      172,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      174,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           176,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            177,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            178,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      180,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      182,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           184,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            185,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            186,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      188,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      190,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           192,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            193,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            194,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      196,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      198,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           200,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            201,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            202,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      204,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      206,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+PipeId,           208,  1,  B, Dec, NULL,        NULL,        NULL,       NULL
+Spare,            209,  1,  B, Dec, NULL,        NULL,        NULL,       NULL  
+Depth,            210,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Msgs In Use,      212,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
+Peak In Use,      214,  2,  H, Dec, NULL,        NULL,        NULL,       NULL
diff --git a/Subsystems/tlmGUI/cfe-sb-stats-tlm.txt b/Subsystems/tlmGUI/cfe-sb-stats-tlm.txt
@@ -0,0 +1,15 @@
+MsgIdsInUse,               12,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PeakMsgIdsInUse,           16,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MaxMsgIdsAllowed,          20,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PipesInUse,                24,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PeakPipesInUse,            28,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MaxPipesAllowed,           32,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MemInUse,                  36,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PeakMemInUse,              40,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MaxMemAllowed,             44,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+SubscriptionsInUse,        48,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PeakSubscriptionsInUse,    52,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MaxSubscriptionsAllowed,   56,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+SBBuffersInUse,            60,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+PeakSBBuffersInUse,        64,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
+MaxPipeDepthAllowed,       68,  4,  I, Dec, NULL,        NULL,        NULL,       NULL
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ShellOutput, 16, 64, s, Str, NULL, NULL, NULL, NULL