Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #81, Update tlm pages definitions to correct 64-bit alignment #82

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions Subsystems/tlmGUI/cfe-es-app-tlm.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
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
#
APID, 16, 4, I, Dec, NULL, NULL, NULL, NUL
Type, 20, 4, I, Dec, NULL, NULL, NULL, NUL
Name, 24, 20, s, Str, NULL, NULL, NULL, NULL
EntryPoint, 44, 20, s, Str, NULL, NULL, NULL, NULL
FileName, 64, 64, s, Str, NULL, NULL, NULL, NULL
StackSize, 128, 4, I, Dec, NULL, NULL, NULL, NULL
ModuleId, 132, 4, I, Dec, NULL, NULL, NULL, NULL
AddressesAreValid, 136, 4, I, Dec, NULL, NULL, NULL, NULL
CodeAddress, 140, 4, I, Dec, NULL, NULL, NULL, NULL
CodeSize, 144, 4, I, Dec, NULL, NULL, NULL, NULL
DataAddress, 148, 4, I, Dec, NULL, NULL, NULL, NULL
DataSize, 152, 4, I, Dec, NULL, NULL, NULL, NULL
BSSAddress, 156, 4, I, Dec, NULL, NULL, NULL, NULL
BSSSize, 160, 4, I, Dec, NULL, NULL, NULL, NULL
StartAddress, 164, 4, I, Hex, NULL, NULL, NULL, NULL
ExceptionAction, 168, 2, H, Dec, NULL, NULL, NULL, NULL
Priority, 170, 2, H, Dec, NULL, NULL, NULL, NULL
MainTaskId, 172, 4, I, Dec, NULL, NULL, NULL, NULL
ExecutionCounter, 176, 4, I, Dec, NULL, NULL, NULL, NULL
MainTaskName, 180, 20, s, Str, NULL, NULL, NULL, NULL
NumOfChildTasks, 200, 4, I, Dec, NULL, NULL, NULL, NULL
14 changes: 7 additions & 7 deletions Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt
Original file line number Diff line number Diff line change
@@ -1,9 +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
NumFree, 48, 4, I, Dec, NULL, NULL, NULL, NULL
BlockSize, 52, 4, I, Dec, NULL, NULL, NULL, NULL
NumCreated, 56, 4, I, Dec, NULL, NULL, NULL, NULL
NumFree, 60, 4, I, Dec, NULL, NULL, NULL, NULL
BlockSize, 64, 4, I, Dec, NULL, NULL, NULL, NULL
NumCreated, 68, 4, I, Dec, NULL, NULL, NULL, NULL
NumFree, 72, 4, I, Dec, NULL, NULL, NULL, NULL
64 changes: 32 additions & 32 deletions Subsystems/tlmGUI/cfe-es-hk-tlm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@
# Note(1): A line that begins with # is a comment
# Note(2): Remove any blank lines from the end of the file
#
Command Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
Registered Core Apps, 48, 4, I, Dec, NULL, NULL, NULL, NULL
Registered CFS Apps, 52, 4, I, Dec, NULL, NULL, NULL, NULL
Registered Tasks, 56, 4, I, Dec, NULL, NULL, NULL, NULL
Registered Libs, 60, 4, I, Dec, NULL, NULL, NULL, NULL
Reset Type, 64, 4, I, Enm, ResetType0, ResetType1, ResetType2, ResetType3
Reset Subtype, 68, 4, I, Enm, ResetSub0, ResetSub1, ResetSub2, ResetSub3
Processor Resets, 72, 4, I, Dec, NULL, NULL, NULL, NULL
Max Proc Resets, 76, 4, I, Dec, NULL, NULL, NULL, NULL
Boot Source, 80, 4, I, Enm, BootSrc0, BootSrc1, BootSrc2, BootSrc3
Perf Mon State, 84, 4, I, Enm, PerfState0, PerfState1, PerfState2, PerfState3
Perf Mon Mode, 88, 4, I, Enm, PerfMode0, PerfMode1, PerMode2, PerfMode3
Perf Trigger Count, 92, 4, I, Dec, NULL, NULL, NULL, NULL
Heap Bytes Free, 144, 4, I, Dec, NULL, NULL, NULL, NULL
Heap Blocks Free, 148, 4, I, Dec, NULL, NULL, NULL, NULL
Heap Max Blk Size, 152, 4, I, Dec, NULL, NULL, NULL, NULL
cFE Core Checksum, 14, 2, H, Hex, NULL, NULL, NULL, NULL
cFE Major Version, 16, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Minor Version, 17, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Revision, 18, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Mission Revision, 19, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Major Version, 20, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Minor Version, 21, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Revision, 22, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Mission Rev, 23, 1, B, Dec, NULL, NULL, NULL, NULL
Syslog Bytes Used, 24, 4, I, Dec, NULL, NULL, NULL, NULL
Syslog Size, 28, 4, I, Dec, NULL, NULL, NULL, NULL
Syslog Entries, 32, 4, I, Dec, NULL, NULL, NULL, NULL
Syslog Mode, 36, 4, I, Enm, LogMode0, LogMode1, LogMode2, LogMode3
ERlog Index, 40, 4, I, Dec, NULL, NULL, NULL, NULL
ERlog Entries, 44, 4, I, Dec, NULL, NULL, NULL, NULL
Command Counter, 16, 1, B, Dec, NULL, NULL, NULL, NULL
Error Counter, 17, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Core Checksum, 18, 2, H, Hex, NULL, NULL, NULL, NULL
cFE Major Version, 20, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Minor Version, 21, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Revision, 22, 1, B, Dec, NULL, NULL, NULL, NULL
cFE Mission Revision, 23, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Major Version, 24, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Minor Version, 25, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Revision, 26, 1, B, Dec, NULL, NULL, NULL, NULL
OSAL Mission Rev, 27, 1, B, Dec, NULL, NULL, NULL, NULL
Syslog Bytes Used, 28, 4, I, Dec, NULL, NULL, NULL, NULL
Syslog Size, 32, 4, I, Dec, NULL, NULL, NULL, NULL
Syslog Entries, 36, 4, I, Dec, NULL, NULL, NULL, NULL
Syslog Mode, 40, 4, I, Enm, LogMode0, LogMode1, LogMode2, LogMode3
ERlog Index, 44, 4, I, Dec, NULL, NULL, NULL, NULL
ERlog Entries, 48, 4, I, Dec, NULL, NULL, NULL, NULL
Registered Core Apps, 52, 4, I, Dec, NULL, NULL, NULL, NULL
Registered CFS Apps, 56, 4, I, Dec, NULL, NULL, NULL, NULL
Registered Tasks, 60, 4, I, Dec, NULL, NULL, NULL, NULL
Registered Libs, 64, 4, I, Dec, NULL, NULL, NULL, NULL
Reset Type, 68, 4, I, Enm, ResetType0, ResetType1, ResetType2, ResetType3
Reset Subtype, 72, 4, I, Enm, ResetSub0, ResetSub1, ResetSub2, ResetSub3
Processor Resets, 76, 4, I, Dec, NULL, NULL, NULL, NULL
Max Proc Resets, 80, 4, I, Dec, NULL, NULL, NULL, NULL
Boot Source, 84, 4, I, Enm, BootSrc0, BootSrc1, BootSrc2, BootSrc3
Perf Mon State, 88, 4, I, Enm, PerfState0, PerfState1, PerfState2, PerfState3
Perf Mon Mode, 92, 4, I, Enm, PerfMode0, PerfMode1, PerMode2, PerfMode3
Perf Trigger Count, 96, 4, I, Dec, NULL, NULL, NULL, NULL
Heap Bytes Free, 148, 4, I, Dec, NULL, NULL, NULL, NULL
Heap Blocks Free, 152, 4, I, Dec, NULL, NULL, NULL, NULL
Heap Max Blk Size, 156, 4, I, Dec, NULL, NULL, NULL, NULL
3 changes: 2 additions & 1 deletion Subsystems/tlmGUI/cfe-es-memstats-tlm.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PoolHandle, 20, 4, I, Dec, NULL, NULL, NULL, NULL
PoolHandle1, 16, 4, I, Hex, NULL, NULL, NULL, NULL
PoolHandle2, 20, 4, I, Hex, 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
Expand Down
28 changes: 14 additions & 14 deletions Subsystems/tlmGUI/cfe-evs-hk-tlm.txt
Original file line number Diff line number Diff line change
@@ -1,15 +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
Command Counter, 16, 1, B, Dec, NULL, NULL, NULL, NULL
CommandErrorCounter, 17, 1, B, Dec, NULL, NULL, NULL, NULL
MessageFormatMode, 18, 1, B, Dec, NULL, NULL, NULL, NULL
MessageTruncCounter, 19, 1, B, Dec, NULL, NULL, NULL, NULL
UnregisteredAppCounter, 20, 1, B, Dec, NULL, NULL, NULL, NULL
OutputPort, 21, 1, B, Dec, NULL, NULL, NULL, NULL
LogFullFlag, 22, 1, B, Dec, NULL, NULL, NULL, NULL
LogMode, 23, 1, B, Dec, NULL, NULL, NULL, NULL
MessageSendCounter, 24, 2, H, Dec, NULL, NULL, NULL, NULL
LogOverflowCounter, 26, 2, H, Dec, NULL, NULL, NULL, NULL
LogEnabled, 28, 1, B, Dec, NULL, NULL, NULL, NULL
Spare1, 29, 1, B, Dec, NULL, NULL, NULL, NULL
Spare2, 30, 1, B, Dec, NULL, NULL, NULL, NULL
Spare3, 31, 1, B, Dec, NULL, NULL, NULL, NULL
7 changes: 4 additions & 3 deletions Subsystems/tlmGUI/cfe-sb-hk-tlm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ DuplicateSubscriptionsCounter, 25, 1, B, Dec, 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
MemPoolHandle2, 36, 4, I, Hex, NULL, NULL, NULL, NULL
MemPoolHandle1, 32, 4, I, Hex, NULL, NULL, NULL, NULL
MemInUse, 40, 4, I, Dec, NULL, NULL, NULL, NULL
UnmarkedMem, 44, 4, I, Dec, NULL, NULL, NULL, NULL
10 changes: 5 additions & 5 deletions Subsystems/tlmGUI/cfe-sb-onesub-tlm.txt
Original file line number Diff line number Diff line change
@@ -1,5 +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
SubType, 16, 1, B, Dec, NULL, NULL, NULL, NULL
MsgId, 17, 2, H, Dec, NULL, NULL, NULL, NULL
QOS.Priority, 19, 1, B, Dec, NULL, NULL, NULL, NULL
QOS.Reliability, 20, 1, B, Dec, NULL, NULL, NULL, NULL
Pipe ID, 21, 1, B, Dec, NULL, NULL, NULL, NULL
Loading