Part #686, Update cFS Bundle for v7.0.1

.github/workflows/add-to-project.yml

@@ -0,0 +1,13 @@
+name: Add Issue or PR to Project
+
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened, ready_for_review, converted_to_draft]
+
+jobs:
+  add-to-project:
+    name: Add issue or pull request to project
+    uses: nasa/cFS/.github/workflows/add-to-project-reusable.yml@dev
+    secrets: inherit

README.md

@@ -89,12 +89,16 @@ Navigate to `http://localhost:2900` in a web browser to access the OpenC3 COSMOS
 1. Go to the OpenC3 Admin Tool, Plugins Tab
 1. Click the paperclip icon and choose your plugin.gem file
 1. Fill out the plugin parameters:
+   * `cfs_eds_enabled`
+      - Default: `false`
+      - If running FSW built with EDS enabled, use `true`
    * `cfs_mem_addr_size`
       - Default: `64`
       - If running a 32-bit system, use `32`
    * `cfs_endianness`
       - Default: `LITTLE_ENDIAN`
       - If running on a big endian system, use `BIG_ENDIAN`
+      - If running FSW built with EDS enabled, use `BIG_ENDIAN`
    * `cfs_1_intf_ip` and `cfs_2_intf_ip`:
       - Default: `172.17.0.1`
             - This should match the IP address listed for the default docker network bridge (`docker0`)

plugin.txt

@@ -4,8 +4,8 @@
 <% require 'cfs_fleet_globals' %>
 
 # To expose the EDS enabled flag to the plugin install, uncomment the lines below
-# VARIABLE cfs_eds_enabled false
-# <% cfs_globals_set_eds_enabled(cfs_eds_enabled) %>
+VARIABLE cfs_eds_enabled false
+<% cfs_globals_set_eds_enabled(cfs_eds_enabled) %>
 
 # To set the memory size, uncomment the lines below
 VARIABLE cfs_mem_addr_size 64

targets/CFS/cmd_tlm/cf_cmd_def.txt

@@ -1,6 +1,6 @@
-<%= cfs_cmd_hdr(target_name, 'CF_SEND_HK_CMD',         0, "CF Housekeeping Request Cmd") %>
+<%= cfs_cmd_hdr(target_name, 'CF_SEND_HK_CMD', 0, 'CF housekeeping request command') %>
 
-<%= cfs_cmd_hdr(target_name, 'CF_CMD_NOOP',  0, "CF No-Op Cmd") %>
+<%= cfs_cmd_hdr(target_name, 'CF_CMD_NOOP', 0, "Generate an info event message with app version") %>
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_RESET_COUNTERS',  1, "Resets HK TLM parent and child task counters") %>
     APPEND_PARAMETER RESET_TYPE 8 UINT 0 4 0 "Reset Value Type"
@@ -9,22 +9,20 @@
         STATE FAULT 2
         STATE RX 3
         STATE TX 4
-    APPEND_PARAMETER SPARE_1 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3 8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_TX_FILE',  2, "Send file from Spacecraft to Ground") %>
     APPEND_PARAMETER CFDP_CLASS 8 UINT 0 1 0 "CFDP class: CLASS_1=0 CLASS_2=1"
         STATE CLASS_1 0
         STATE CLASS_2 1
-    APPEND_PARAMETER KEEP 8 INT 0 1 0 "Keep file flag: 1=keep, else delete"
+    APPEND_PARAMETER KEEP_FILE_FLAG 8 INT 0 1 0 "Keep file flag: 1=keep, else delete"
         STATE DELETE 0
         STATE KEEP   1
     APPEND_PARAMETER CHAN_NUM 8 UINT 0 1 0 "Channel number"
     APPEND_PARAMETER PRIORITY 8 UINT 0 255 0 "Priority: 0=highest priority"
     APPEND_PARAMETER DEST_ID 32 UINT 0 MAX_UINT32 0 "Destination entity id"
     APPEND_PARAMETER SRC_FILENAME 512 STRING "" "Source filename"
-    APPEND_PARAMETER DST_FILENAME 512 STRING "" "Destination filename"
+    APPEND_PARAMETER DEST_FILENAME 512 STRING "" "Destination filename"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_PLAYBACK_DIR',  3, "Playback a directory") %>
     APPEND_PARAMETER CFDP_CLASS 8 UINT 0 1 0 "CFDP class: CLASS_1=0 CLASS_2=1"
@@ -41,47 +39,35 @@
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_FREEZE',  4, "Freeze a channel") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1 0 "Channel number"
-    APPEND_PARAMETER SPARE_1     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3     8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_THAW',  5, "Thaw a channel") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1 0 "Channel number"
-    APPEND_PARAMETER SPARE_1     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3     8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_SUSPEND',  6, "Suspend a transaction") %>
     APPEND_PARAMETER TRANSACTION_SEQ_NUM 32 UINT 0 MAX_UINT32 0 "Transaction sequence number"
     APPEND_PARAMETER EID 32 UINT 0 MAX_UINT32 0 "Entity id"
     APPEND_PARAMETER CHAN 8 UINT 0 255 0 "Channel number: 254=use ts, 255=all channels, else channel"
-    APPEND_PARAMETER SPARE_1 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3 8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_RESUME',  7, "Resume a transaction") %>
     APPEND_PARAMETER TRANSACTION_SEQ_NUM 32 UINT 0 MAX_UINT32 0 "Transaction sequence number"
     APPEND_PARAMETER EID 32 UINT 0 MAX_UINT32 0 "Entity id"
     APPEND_PARAMETER CHAN 8 UINT 0 255 0 "Channel number: 254=use ts, 255=all channels, else channel"
-    APPEND_PARAMETER SPARE_1 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3 8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_CANCEL',  8, "Cancel a transaction") %>
     APPEND_PARAMETER TRANSACTION_SEQ_NUM 32 UINT 0 MAX_UINT32 0 "Transaction sequence number"
     APPEND_PARAMETER EID 32 UINT 0 MAX_UINT32 0 "Entity id"
     APPEND_PARAMETER CHAN 8 UINT 0 255 0 "Channel number: 254=use ts, 255=all channels, else channel"
-    APPEND_PARAMETER SPARE_1 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3 8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_ABANDON',  9, "Abandon a transaction") %>
     APPEND_PARAMETER TRANSACTION_SEQ_NUM 32 UINT 0 MAX_UINT32 0 "Transaction sequence number"
     APPEND_PARAMETER EID 32 UINT 0 MAX_UINT32 0 "Entity id"
     APPEND_PARAMETER CHAN 8 UINT 0 255 0 "Channel number: 254=use ts, 255=all channels, else channel"
-    APPEND_PARAMETER SPARE_1 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2 8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3 8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_SET_PARAM',  10, "Set a local parameter") %>
     APPEND_PARAMETER VALUE 32 UINT 0 MAX_UINT32 0 "Parameter value to set"
@@ -97,7 +83,7 @@
         STATE LOCAL_EID           8
         STATE MAX_OUTGOING_MSGS   9
     APPEND_PARAMETER CHAN_NUM 8 UINT 0 1 0 "Channel number"
-    APPEND_PARAMETER SPARE   16 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 16 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_GET_PARAM',  11, "Get a local parameter") %>
     APPEND_PARAMETER KEY 8 UINT 0 9 0 "Parameter key"
@@ -124,20 +110,16 @@
         STATE ACTIVE  1
         STATE HISTORY 2
         STATE ALL     3
-    APPEND_PARAMETER SPARE   8 UINT 0 0 0 "Spare"
+    APPEND_PARAMETER PADDING   8 UINT 0 0 0 "Spare"
     APPEND_PARAMETER FILENAME 512 STRING "" "Filename written to"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_ENABLE_DEQUEUE',  16, "Enable dequeue (tx file) for a channel") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1 0 "Channel number"
-    APPEND_PARAMETER SPARE_1     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3     8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_DISABLE_DEQUEUE',  17, "Disable dequeue (tx file) for a channel") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1 0 "Channel number"
-    APPEND_PARAMETER SPARE_1     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_2     8 UINT 0 0 0 "Spare"
-    APPEND_PARAMETER SPARE_3     8 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 24 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_ENABLE_DIR_POLLING',  18, "Enable polling directory") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1   0 "Channel number"
@@ -148,7 +130,7 @@
         STATE THREE 3
         STATE FOUR  4
         STATE ALL 255
-    APPEND_PARAMETER SPARE      16 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 16 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_DISABLE_DIR_POLLING',  19, "Disable polling directory") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1   0 "Channel number"
@@ -159,21 +141,16 @@
         STATE THREE 3
         STATE FOUR  4
         STATE ALL 255
-    APPEND_PARAMETER SPARE      16 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 16 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_PURGE_QUEUE',  21, "Purge queue") %>
     APPEND_PARAMETER CHANNEL_NUM 8 UINT 0 1 0 "Channel number"
     APPEND_PARAMETER QUEUE_TYPE  8 UINT 0 2 0 "Queue type"
         STATE PENDING 0
         STATE HISTORY 1
         STATE ALL     2
-    APPEND_PARAMETER SPARE      16 UINT 0 0 0 "Spare"
+    APPEND_ARRAY_PARAMETER PADDING 8 UINT 16 "Spare for alignment"
 
 <%= cfs_cmd_hdr(target_name, 'CF_CMD_ENABLE_ENGINE',  22, "Enable Engine") %>
 
-<%= cfs_cmd_hdr(target_name, 'CF_CMD_DISABLE_ENGINE',  23, "Disable Engine") %>
-
-
-
-
-
+<%= cfs_cmd_hdr(target_name, 'CF_CMD_DISABLE_ENGINE',  23, "Disable Engine") %>

targets/CFS/cmd_tlm/cf_tlm_def.txt

@@ -1,7 +1,7 @@
 <%= cfs_tlm_hdr(target_name, 'CF_HK', "CF Hk Tlm Packet") %>
     APPEND_ITEM COMMAND_COUNTER 16 UINT "Command success counter"
     APPEND_ITEM COMMAND_ERROR_COUNTER 16 UINT "Command error counter"
-    APPEND_ITEM SPARE_0 32 UINT "Spare For Alignment"
+    APPEND_ITEM PADDING 32 UINT
 <% 2.times do |chan_idx| %>
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_SENT_FILE_DATA_BYTES 64 UINT "Sent file data bytes"
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_SENT_PDU 32 UINT "Sent PDUs counter"
@@ -23,7 +23,7 @@
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_FAULT_NAK_LIMIT 16 UINT "NAK limit exceeded fault counter"
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_FAULT_ACK_LIMIT 16 UINT "ACK limit exceeded fault counter"
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_FAULT_INACTIVITY_TIMER 16 UINT "Inactivity timer exceeded counter"
-    APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_FAULT_SPARE_0 16 UINT "Spare"
+    APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_FAULT_PADDING_0 16 UINT "Spare"
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_Q_SIZE_PEND 16 UINT "Queue Size PEND"
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_Q_SIZE_TX 16 UINT "Queue Size TX"
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_Q_SIZE_RX 16 UINT "Queue Size RX"
@@ -35,8 +35,7 @@
     APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_FROZEN 8 UINT "Frozen state"
         STATE THAWED 0
         STATE FROZEN 1
-    APPEND_ARRAY_ITEM CHANNEL_HK_<%= chan_idx %>_SPARE_0 8 UINT 56 "Explicit Spare array"
-    APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_SPARE_1 16 UINT "Implicit Spare for 64-bit align"
+    APPEND_ITEM CHANNEL_HK_<%= chan_idx %>_PADDING 8 UINT "Implicit Spare for 64-bit align"
 <% end %>
 
 <%= cfs_tlm_hdr(target_name, 'CF_EOT', "CF EOT Tlm Packet") %>
@@ -46,13 +45,29 @@
         STATE RX 0
         STATE TX 1
     APPEND_ITEM STATE 32 UINT "Transaction state"
-        STATE IDELE      0
-        STATE RX_CLASS_1 1
-        STATE TX_CLASS_1 2
-        STATE RX_CLASS_2 3
-        STATE TX_CLASS_2 4
-        STATE DROPPED    5
+        STATE INIT       1
+        STATE RX_CLASS_1 2
+        STATE TX_CLASS_1 3
+        STATE RX_CLASS_2 4
+        STATE TX_CLASS_2 5
+        STATE DROPPED    6
+        STATE HOLD       7
+        STATE INVALID    8
     APPEND_ITEM TXN_STAT 32 UINT "Final status code of transaction"
+        STATE NO_ERROR                  0
+        STATE POS_ACK_LIMIT_REACHED     1
+        STATE KEEP_ALIVE_LIMIT_REACHED  2
+        STATE INVALID_TRANSMISSION_MODE 3
+        STATE FILESTORE_REJECTION       4
+        STATE FILE_CHECKSUM_FAILURE     5
+        STATE FILE_SIZE_ERROR           6
+        STATE NAK_LIMIT_REACHED         7
+        STATE INACTIVITY_DETECTED       8
+        STATE INVALID_FILE_STRUCTURE    9
+        STATE CHECK_LIMIT_REACHED       10
+        STATE UNSUPPORTED_CHECKSUM_TYPE 11
+        STATE SUSPEND_REQUEST_RECEIVED  14
+        STATE CANCEL_REQUEST_RECEIVED   15
     APPEND_ITEM SRC_EID 32 UINT "Source eid of the transaction"
     APPEND_ITEM PEER_EID 32 UINT "peer_eid is always the 'other guy', same src_eid for RX"
     APPEND_ITEM FSIZE 32 UINT "File size"

targets/CFS/cmd_tlm/cfe_es_cmd_def.txt

@@ -1,4 +1,4 @@
-<%= cfs_cmd_hdr(target_name, 'CFE_ES_SEND_HK_CMD',     0, "CFE_ES Housekeeping Request Cmd") %>
+<%= cfs_cmd_hdr(target_name, 'CFE_ES_SEND_HK_CMD', 0, 'CFE_ES housekeeping request command') %>
 
 <%= cfs_cmd_hdr(target_name, 'CFE_ES_CMD_NOOP',  0, "Telecommand Message") %>
 
@@ -20,12 +20,10 @@
 <% end %>
    APPEND_PARAMETER EXCEPTION_ACTION 8 UINT 0 1 0 "Identifies action to take if exception occurs"
       STATE RESTART_CPU 0
-      STATE RESTART_APP 1  
-   APPEND_PARAMETER SPARE 8 UINT 0 0 0 "Spare for alignment"
+      STATE RESTART_APP 1
+   APPEND_PARAMETER PADDING1 8 UINT 0 0 0
    APPEND_PARAMETER PRIORITY 16 UINT 0 MAX_UINT16 0 "The new Applications runtime priority."
-<% if $cfs_globals_mem_addr_size == 64 %>
-   APPEND_PARAMETER SPARE_32 32 UINT 0 0 0 "Spare for 64-bit alignment"
-<% end %>
+   APPEND_PARAMETER PADDING2 32 UINT 0 0 0
 
 <%= cfs_cmd_hdr(target_name, 'CFE_ES_CMD_STOP_APP',  5, "Telecommand Message") %>
    APPEND_PARAMETER APPLICATION 160 STRING "" "ASCII text string containing Application Name"

targets/CFS/cmd_tlm/cfe_es_tlm_def.txt

@@ -79,63 +79,66 @@
 <% end %>
 
 <%= cfs_tlm_hdr(target_name, 'CFE_ES_APP', "CFE_ES App Info Tlm") %>
-   APPEND_ITEM APP_INFO_RESOURCE_ID 32 UINT "Application or Libary ID for this resource"
+   APPEND_ITEM RESOURCE_ID 32 UINT "Application or Libary ID for this resource"
       FORMAT_STRING "0x%08X"
-   APPEND_ITEM APP_INFO_TYPE 32 UINT "App Type"
+   APPEND_ITEM TYPE 32 UINT "App Type"
       STATE CORE     1
       STATE EXTERNAL 2
       STATE LIBRARY  3
-   APPEND_ITEM APP_INFO_NAME 160 STRING "The Registered Name of the Application"
-   APPEND_ITEM APP_INFO_ENTRY_POINT 160 STRING "The Entry Point label for the Application"
-   APPEND_ITEM APP_INFO_FILE_NAME 512 STRING "The Filename of the file containing the Application"
+   APPEND_ITEM NAME 160 STRING "The Registered Name of the Application"
+   APPEND_ITEM ENTRY_POINT 160 STRING "The Entry Point label for the Application"
+   APPEND_ITEM FILE_NAME 512 STRING "The Filename of the file containing the Application"
 <% if $cfs_globals_mem_addr_size == 64 %>
-   APPEND_ITEM APP_INFO_STACK_SIZE 64 UINT "The Stack Size of the Application"
+   APPEND_ITEM STACK_SIZE 64 UINT "The Stack Size of the Application"
 <% else %>
-   APPEND_ITEM APP_INFO_STACK_SIZE 32 UINT "The Stack Size of the Application"
+   APPEND_ITEM STACK_SIZE 32 UINT "The Stack Size of the Application"
 <% end %>
-   APPEND_ITEM APP_INFO_ADDRESSES_ARE_VALID 32 UINT "Indicates that the Code, Data, and BSS addresses/sizes are valid"
+   APPEND_ITEM ADDRESSES_ARE_VALID 32 UINT "Indicates that the Code, Data, and BSS addresses/sizes are valid"
       STATE FALSE 0
       STATE TRUE  1
 <% if $cfs_globals_mem_addr_size == 64 %>
-   APPEND_ITEM APP_INFO_CODE_ADDRESS 64 UINT "The Address of the Application Code Segment"
+   APPEND_ITEM PADDING1 32 UINT "Padding for alignment"
+   APPEND_ITEM CODE_ADDRESS 64 UINT "The Address of the Application Code Segment"
       FORMAT_STRING "0x%016X"
-   APPEND_ITEM APP_INFO_CODE_SIZE 64 UINT "The Code Size of the Application"
-   APPEND_ITEM APP_INFO_DATA_ADDRESS 64 UINT "The Address of the Application Data Segment"
+   APPEND_ITEM CODE_SIZE 64 UINT "The Code Size of the Application"
+   APPEND_ITEM DATA_ADDRESS 64 UINT "The Address of the Application Data Segment"
       FORMAT_STRING "0x%016X"
-   APPEND_ITEM APP_INFO_DATA_SIZE 64 UINT "The Data Size of the Application"
-   APPEND_ITEM APP_INFO_BSS_ADDRESS 64 UINT "The Address of the Application BSS Segment"
+   APPEND_ITEM DATA_SIZE 64 UINT "The Data Size of the Application"
+   APPEND_ITEM BSS_ADDRESS 64 UINT "The Address of the Application BSS Segment"
       FORMAT_STRING "0x%016X"
-   APPEND_ITEM APP_INFO_BSS_SIZE 64 UINT "The BSS Size of the Application"
-   APPEND_ITEM APP_INFO_START_ADDRESS 64 UINT "The Start Address of the Application"
+   APPEND_ITEM BSS_SIZE 64 UINT "The BSS Size of the Application"
+   APPEND_ITEM START_ADDRESS 64 UINT "The Start Address of the Application"
       FORMAT_STRING "0x%016X"
 <% else %>
-   APPEND_ITEM APP_INFO_CODE_ADDRESS 32 UINT "The Address of the Application Code Segment"
+   APPEND_ITEM CODE_ADDRESS 32 UINT "The Address of the Application Code Segment"
       FORMAT_STRING "0x%08X"
-   APPEND_ITEM APP_INFO_CODE_SIZE 32 UINT "The Code Size of the Application"
-   APPEND_ITEM APP_INFO_DATA_ADDRESS 32 UINT "The Address of the Application Data Segment"
+   APPEND_ITEM CODE_SIZE 32 UINT "The Code Size of the Application"
+   APPEND_ITEM DATA_ADDRESS 32 UINT "The Address of the Application Data Segment"
       FORMAT_STRING "0x%08X"
-   APPEND_ITEM APP_INFO_DATA_SIZE 32 UINT "The Data Size of the Application"
-   APPEND_ITEM APP_INFO_BSS_ADDRESS 32 UINT "The Address of the Application BSS Segment"
+   APPEND_ITEM DATA_SIZE 32 UINT "The Data Size of the Application"
+   APPEND_ITEM BSS_ADDRESS 32 UINT "The Address of the Application BSS Segment"
       FORMAT_STRING "0x%08X"
-   APPEND_ITEM APP_INFO_BSS_SIZE 32 UINT "The BSS Size of the Application"
-   APPEND_ITEM APP_INFO_START_ADDRESS 32 UINT "The Start Address of the Application"
+   APPEND_ITEM BSS_SIZE 32 UINT "The BSS Size of the Application"
+   APPEND_ITEM START_ADDRESS 32 UINT "The Start Address of the Application"
       FORMAT_STRING "0x%08X"
 <% end %>
-   APPEND_ITEM APP_INFO_EXCEPTION_ACTION 8 UINT "What should occur if Application has an exception"
+   APPEND_ITEM EXCEPTION_ACTION 8 UINT "What should occur if Application has an exception"
       STATE RESTART_APP 0
       STATE RESTART_CPU 1
-   APPEND_ITEM SPARE 8 UINT "Spare for alignment"
-   APPEND_ITEM APP_INFO_PRIORITY 16 UINT "The Priority of the Application"
-   APPEND_ITEM APP_INFO_MAIN_TASK_ID 32 UINT "The Application's Main Task ID"
+   APPEND_ITEM PADDING2 8 UINT "Padding for alignment"
+   APPEND_ITEM PRIORITY 16 UINT "The Priority of the Application"
+   APPEND_ITEM MAIN_TASK_ID 32 UINT "The Application's Main Task ID"
       FORMAT_STRING "0x%08X"
-   APPEND_ITEM APP_INFO_EXECUTION_COUNTER 32 UINT "The Application's Main Task Execution Counter"
-   APPEND_ITEM APP_INFO_MAIN_TASK_NAME 160 STRING "The Application's Main Task Name"
-   APPEND_ITEM APP_INFO_NUM_OF_CHILD_TASKS 32 UINT "Number of Child tasks for an App"
+   APPEND_ITEM EXECUTION_COUNTER 32 UINT "The Application's Main Task Execution Counter"
+   APPEND_ITEM MAIN_TASK_NAME 160 STRING "The Application's Main Task Name"
+   APPEND_ITEM NUM_OF_CHILD_TASKS 32 UINT "Number of Child tasks for an App"
+   APPEND_ITEM PADDING3 32 UINT "Padding for 64-bit alignment"
 
 <%= cfs_tlm_hdr(target_name, 'CFE_ES_MEMSTATS', "CFE_ES Mem Stats Tlm") %>
    APPEND_ITEM POOL_HANDLE 32 UINT "Handle of memory pool whose stats are being telemetered"
       FORMAT_STRING "0x%08X"
 <% if $cfs_globals_mem_addr_size == 64 %>
+   APPEND_ITEM PADDING   32 UINT
    APPEND_ITEM POOL_SIZE 64 UINT "Size of Memory Pool (in bytes)"
 <% else %>
    APPEND_ITEM POOL_SIZE 32 UINT "Size of Memory Pool (in bytes)"