From c04a21e42df2c005fec722bdb88c1b5032b802d6 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Wed, 22 Mar 2023 16:22:35 +1000 Subject: [PATCH 1/4] Fix #218, Update LogOverflowCounter Description --- Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t b/Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t index 37ddf22..0ba3a91 100644 --- a/Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t +++ b/Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t @@ -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' From 1614cc47fbee3b29777ebbb61596a0ce12425c95 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Wed, 22 Mar 2023 20:48:22 +1000 Subject: [PATCH 2/4] Fix #234, Update incorrect variable descriptions in tlm.txt --- Subsystems/tlmGUI/cfe-es-app-tlm.txt | 6 +++--- Subsystems/tlmGUI/cfe-sb-hk-tlm.txt | 7 ++++--- Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt | 6 +++--- Subsystems/tlmGUI/cfs-ful-hk-tlm.txt | 18 +++++++++--------- Subsystems/tlmGUI/cfs-nav-hk-tlm.txt | 12 ++++++------ 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Subsystems/tlmGUI/cfe-es-app-tlm.txt b/Subsystems/tlmGUI/cfe-es-app-tlm.txt index 56fedba..d6e18ab 100644 --- a/Subsystems/tlmGUI/cfe-es-app-tlm.txt +++ b/Subsystems/tlmGUI/cfe-es-app-tlm.txt @@ -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 diff --git a/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt b/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt index bf4c145..6199e82 100644 --- a/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt @@ -1,7 +1,7 @@ # 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 @@ -9,7 +9,8 @@ CreatePipeErrorCounter, 18, 1, B, Dec, 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 diff --git a/Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt b/Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt index 7226fcd..bfe060e 100644 --- a/Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt +++ b/Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt @@ -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 diff --git a/Subsystems/tlmGUI/cfs-ful-hk-tlm.txt b/Subsystems/tlmGUI/cfs-ful-hk-tlm.txt index 932b58d..db9388c 100644 --- a/Subsystems/tlmGUI/cfs-ful-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfs-ful-hk-tlm.txt @@ -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 diff --git a/Subsystems/tlmGUI/cfs-nav-hk-tlm.txt b/Subsystems/tlmGUI/cfs-nav-hk-tlm.txt index f7dc106..5c17d42 100644 --- a/Subsystems/tlmGUI/cfs-nav-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfs-nav-hk-tlm.txt @@ -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 From f8b1bfa120c1a619eb71da1ddc7310df891db8f6 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Wed, 22 Mar 2023 22:16:04 +1000 Subject: [PATCH 3/4] Fix #220, Add missing description fields to cfe-es-hk-tlm.txt --- Subsystems/tlmGUI/cfe-es-hk-tlm.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Subsystems/tlmGUI/cfe-es-hk-tlm.txt b/Subsystems/tlmGUI/cfe-es-hk-tlm.txt index 7f328f5..28a3355 100644 --- a/Subsystems/tlmGUI/cfe-es-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfe-es-hk-tlm.txt @@ -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 From b9900f2661c098421c76492d125208e9ed67b31b Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 10 Dec 2024 10:55:55 -0500 Subject: [PATCH 4/4] Updating documentation and version numbers for equuleus-rc1+dev14 --- CHANGELOG.md | 6 ++++++ _version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 333c288..3888e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 , , and + ## Development Build: equuleus-rc1+dev6 - making version string PEP 440-compliant - See diff --git a/_version.py b/_version.py index 4c18d55..b8c06ec 100644 --- a/_version.py +++ b/_version.py @@ -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"