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.

Sign up for GitHub

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

cFS-GroundSystem Integration candidate: Equuleus-rc1+dev21 #247

Merged
merged 7 commits into from
Dec 10, 2024
Merged

cFS-GroundSystem Integration candidate: Equuleus-rc1+dev21 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c04a21e
Fix #218, Update LogOverflowCounter Description
thnkslprpt Mar 22, 2023
1614cc4
Fix #234, Update incorrect variable descriptions in tlm.txt
thnkslprpt Mar 22, 2023
f8b1bfa
Fix #220, Add missing description fields to cfe-es-hk-tlm.txt
thnkslprpt Mar 22, 2023
b10afb6
Merge pull request #233 from thnkslprpt:fix-218-update-LogOverflowCou…
dzbaker Dec 10, 2024
e492624
Merge pull request #235 from thnkslprpt:fix-234-update-incorrect-tlm-…
dzbaker Dec 10, 2024
29a0d87
Merge pull request #236 from thnkslprpt:fix-220-es-hk-tlm-window
dzbaker Dec 10, 2024
b9900f2
Updating documentation and version numbers for equuleus-rc1+dev14
dzbaker Dec 10, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Development Build: equuleus-rc1+dev14
- Update LogOverflowCounter Description
- Update incorrect variable descriptions in tlm.txt
- Add missing description fields to cfe-es-hk-tlm.txt
- See <https://github.com/nasa/cFS-GroundSystem/pull/233>, <https://github.com/nasa/cFS-GroundSystem/pull/235>, and <https://github.com/nasa/cFS-GroundSystem/pull/236>

## Development Build: equuleus-rc1+dev6
- making version string PEP 440-compliant
- See <https://github.com/nasa/cFS-GroundSystem/pull/245>
Expand Down
2 changes: 1 addition & 1 deletion Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ aS'Local Event Log full flag.'
p18
aS'Local Event Logging mode (overwrite/discard).'
p19
aS'Local Event Log overflow counter. CFE_EVS_Packet_t LogEntry [CFE_EVS_LOG_MAX] The actual Local Event Log entry.'
aS'Local Event Log overflow counter.'
p20
aa(lp21
S'--half'
Expand Down
6 changes: 3 additions & 3 deletions Subsystems/tlmGUI/cfe-es-app-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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
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
Expand Down
16 changes: 10 additions & 6 deletions Subsystems/tlmGUI/cfe-es-hk-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@ OSAL Major Version, 20, 1, B, Dec, NULL, NULL, NULL, NU
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
PSPMajorVersion, 24, 1, B, Dec, NULL, NULL, NULL, NULL
PSPMinorVersion, 25, 1, B, Dec, NULL, NULL, NULL, NULL
PSPRevision, 26, 1, B, Dec, NULL, NULL, NULL, NULL
PSPMissionRevision, 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
7 changes: 4 additions & 3 deletions Subsystems/tlmGUI/cfe-sb-hk-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#
Command Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
NoSubscribersCounter, 14, 1, B, Dec, NULL, NULL, NULL, NULL
Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
NoSubscribersCounter, 14, 1, B, Dec, NULL, NULL, NULL, NULL
MsgSendErrorCounter, 15, 1, B, Dec, NULL, NULL, NULL, NULL
MsgReceiveErrorCounter, 16, 1, B, Dec, NULL, NULL, NULL, NULL
InternalErrorCounter, 17, 1, B, Dec, NULL, NULL, NULL, NULL
CreatePipeErrorCounter, 18, 1, B, Dec, NULL, NULL, NULL, NULL
SubscribeErrorCounter, 19, 1, B, Dec, NULL, NULL, NULL, NULL
PipeOptsErrorCounter, 20, 1, B, Dec, NULL, NULL, NULL, NULL
DuplicateSubscriptionsCounter, 21, 1, B, Dec, NULL, NULL, NULL, NULL
Spare2Align, 22, 2, H, Dec, NULL, NULL, NULL, NULL
GetPipeIdByNameErrorCounter, 22, 1, B, Dec, NULL, NULL, NULL, NULL
Spare2Align, 23, 1, B, Dec, NULL, NULL, NULL, NULL
PipeOverflowErrorCounter, 24, 2, H, Dec, NULL, NULL, NULL, NULL
MsgLimitErrorCounter, 36, 2, H, Dec, NULL, NULL, NULL, NULL
MemPoolHandle, 28, 4, I, Dec, NULL, NULL, NULL, NULL
Expand Down
6 changes: 3 additions & 3 deletions Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Size, 4, 4, I, Dec, NULL, NULL, NULL, NULL
Crc, 8, 4, I, Dec, NULL, NULL, NULL, NULL
Size, 4, 4, I, Dec, NULL, NULL, NULL, NULL
Crc, 8, 4, I, Dec, NULL, NULL, NULL, NULL
ActiveBufferAddr, 12, 4, I, Dec, NULL, NULL, NULL, NULL
InactiveBufferAddr, 16, 4, I, Dec, NULL, NULL, NULL, NULL
ValidationFuncPtr, 20, 4, I, Dec, NULL, NULL, NULL, NULL
TimeOfLastUpdate.seconds, 24, 4, I, Dec, NULL, NULL, NULL, NULL
TimeOfLastUpdate.subsecs, 28, 4, I, Dec, NULL, NULL, NULL, NULL
FileCreateTimeSecs, 32, 4, I, Dec, NULL, NULL, NULL, NULL
FileCreateTimeSecs, 36, 4, I, Dec, NULL, NULL, NULL, NULL
FileCreateTimeSubSecs, 36, 4, I, Dec, NULL, NULL, NULL, NULL
18 changes: 9 additions & 9 deletions Subsystems/tlmGUI/cfs-ful-hk-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Error Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
Error Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
Command Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
Transfer in progress?, 14, 2, H, Dec, NULL, NULL, NULL, NULL
Last Segment Accepted, 16, 2, H, Dec, NULL, NULL, NULL, NULL
Segments Rejected, 18, 2, H, Dec, NULL, NULL, NULL, NULL
Bytes Transferred, 20, 4, I, Dec, NULL, NULL, NULL, NULL
Current File Name, 24, 64, 64s, Str, NULL, NULL, NULL, NULL
Current File Size, 88, 4, I, Dec, NULL, NULL, NULL, NULL
Current File Crc, 92, 4, I, Dec, NULL, NULL, NULL, NULL
Current File Fd, 96, 4, i, Dec, NULL, NULL, NULL, NULL
Transfer in progress?, 14, 2, H, Dec, NULL, NULL, NULL, NULL
Last Segment Accepted, 16, 2, H, Dec, NULL, NULL, NULL, NULL
Segments Rejected, 18, 2, H, Dec, NULL, NULL, NULL, NULL
Bytes Transferred, 20, 4, I, Dec, NULL, NULL, NULL, NULL
Current File Name, 24, 64, 64s, Str, NULL, NULL, NULL, NULL
Current File Size, 88, 4, I, Dec, NULL, NULL, NULL, NULL
Current File Crc, 92, 4, I, Dec, NULL, NULL, NULL, NULL
Current File Fd, 96, 4, i, Dec, NULL, NULL, NULL, NULL
12 changes: 6 additions & 6 deletions Subsystems/tlmGUI/cfs-nav-hk-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Longitude, 48, 8, d, Dec, NULL, NULL, NULL,
Longitude Direction, 56, 4, 4s, Str, NULL, NULL, NULL, NULL
Speed, 64, 8, d, Dec, NULL, NULL, NULL, NULL
Direction, 72, 8, d, Dec, NULL, NULL, NULL, NULL
Mag X, 80, 2, h, Dec, NULL, NULL, NULL, NULL
Mag Y, 82, 2, h, Dec, NULL, NULL, NULL, NULL
Mag Z, 84, 2, h, Dec, NULL, NULL, NULL, NULL
Accel X, 86, 2, h, Dec, NULL, NULL, NULL, NULL
Accel Y, 88, 2, h, Dec, NULL, NULL, NULL, NULL
Accel Z, 90, 2, h, Dec, NULL, NULL, NULL, NULL
Mag X, 80, 2, h, Dec, NULL, NULL, NULL, NULL
Mag Y, 82, 2, h, Dec, NULL, NULL, NULL, NULL
Mag Z, 84, 2, h, Dec, NULL, NULL, NULL, NULL
Accel X, 86, 2, h, Dec, NULL, NULL, NULL, NULL
Accel Y, 88, 2, h, Dec, NULL, NULL, NULL, NULL
Accel Z, 90, 2, h, Dec, NULL, NULL, NULL, NULL
2 changes: 1 addition & 1 deletion _version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#

# Development Build Macro Definitions
_cFS_GrndSys_build_number = 6
_cFS_GrndSys_build_number = 14
_cFS_GrndSys_build_baseline = "7.2"
_cFS_GrndSys_build_dev_baseline = "equuleus-rc1"
_cFS_GrndSys_build_dev_cycle = "equuleus-rc2"
Expand Down
Loading