Skip to content

Commit f5efb99

Browse files
dzbakerdzbaker
authored
Merge pull request #247 from nasa/integration-candidate
cFS-GroundSystem Integration candidate: Equuleus-rc1+dev21
2 parents e22282c + b9900f2 commit f5efb99

File tree

9 files changed

+43
-32
lines changed

9 files changed

+43
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Development Build: equuleus-rc1+dev14
4+
- Update LogOverflowCounter Description
5+
- Update incorrect variable descriptions in tlm.txt
6+
- Add missing description fields to cfe-es-hk-tlm.txt
7+
- 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>
8+
39
## Development Build: equuleus-rc1+dev6
410
- making version string PEP 440-compliant
511
- See <https://github.com/nasa/cFS-GroundSystem/pull/245>

‎Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ aS'Local Event Log full flag.'
3737
p18
3838
aS'Local Event Logging mode (overwrite/discard).'
3939
p19
40-
aS'Local Event Log overflow counter. CFE_EVS_Packet_t LogEntry [CFE_EVS_LOG_MAX] The actual Local Event Log entry.'
40+
aS'Local Event Log overflow counter.'
4141
p20
4242
aa(lp21
4343
S'--half'

‎Subsystems/tlmGUI/cfe-es-app-tlm.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Name, 20, 20, s, Str, NULL, NULL, NULL, NULL
2-
EntryPoint, 40, 20, s, Str, NULL, NULL, NULL, NULL
3-
FileName, 60, 64, s, Str, NULL, NULL, NULL, NULL
1+
Name, 20, 20, s, Str, NULL, NULL, NULL, NULL
2+
EntryPoint, 40, 20, s, Str, NULL, NULL, NULL, NULL
3+
FileName, 60, 64, s, Str, NULL, NULL, NULL, NULL
44
StackSize, 124, 4, I, Dec, NULL, NULL, NULL, NULL
55
ModuleId, 128, 4, I, Dec, NULL, NULL, NULL, NULL
66
AddressesAreValid, 132, 4, I, Dec, NULL, NULL, NULL, NULL

‎Subsystems/tlmGUI/cfe-es-hk-tlm.txt‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@ OSAL Major Version, 20, 1, B, Dec, NULL, NULL, NULL, NU
4141
OSAL Minor Version, 21, 1, B, Dec, NULL, NULL, NULL, NULL
4242
OSAL Revision, 22, 1, B, Dec, NULL, NULL, NULL, NULL
4343
OSAL Mission Rev, 23, 1, B, Dec, NULL, NULL, NULL, NULL
44-
Syslog Bytes Used, 24, 4, I, Dec, NULL, NULL, NULL, NULL
45-
Syslog Size, 28, 4, I, Dec, NULL, NULL, NULL, NULL
46-
Syslog Entries, 32, 4, I, Dec, NULL, NULL, NULL, NULL
47-
Syslog Mode, 36, 4, I, Enm, LogMode0, LogMode1, LogMode2, LogMode3
48-
ERlog Index, 40, 4, I, Dec, NULL, NULL, NULL, NULL
49-
ERlog Entries, 44, 4, I, Dec, NULL, NULL, NULL, NULL
44+
PSPMajorVersion, 24, 1, B, Dec, NULL, NULL, NULL, NULL
45+
PSPMinorVersion, 25, 1, B, Dec, NULL, NULL, NULL, NULL
46+
PSPRevision, 26, 1, B, Dec, NULL, NULL, NULL, NULL
47+
PSPMissionRevision, 27, 1, B, Dec, NULL, NULL, NULL, NULL
48+
Syslog Bytes Used, 28, 4, I, Dec, NULL, NULL, NULL, NULL
49+
Syslog Size, 32, 4, I, Dec, NULL, NULL, NULL, NULL
50+
Syslog Entries, 36, 4, I, Dec, NULL, NULL, NULL, NULL
51+
Syslog Mode, 40, 4, I, Enm, LogMode0, LogMode1, LogMode2, LogMode3
52+
ERlog Index, 44, 4, I, Dec, NULL, NULL, NULL, NULL
53+
ERlog Entries, 48, 4, I, Dec, NULL, NULL, NULL, NULL

‎Subsystems/tlmGUI/cfe-sb-hk-tlm.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#
22
Command Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
3-
Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
4-
NoSubscribersCounter, 14, 1, B, Dec, NULL, NULL, NULL, NULL
3+
Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
4+
NoSubscribersCounter, 14, 1, B, Dec, NULL, NULL, NULL, NULL
55
MsgSendErrorCounter, 15, 1, B, Dec, NULL, NULL, NULL, NULL
66
MsgReceiveErrorCounter, 16, 1, B, Dec, NULL, NULL, NULL, NULL
77
InternalErrorCounter, 17, 1, B, Dec, NULL, NULL, NULL, NULL
88
CreatePipeErrorCounter, 18, 1, B, Dec, NULL, NULL, NULL, NULL
99
SubscribeErrorCounter, 19, 1, B, Dec, NULL, NULL, NULL, NULL
1010
PipeOptsErrorCounter, 20, 1, B, Dec, NULL, NULL, NULL, NULL
1111
DuplicateSubscriptionsCounter, 21, 1, B, Dec, NULL, NULL, NULL, NULL
12-
Spare2Align, 22, 2, H, Dec, NULL, NULL, NULL, NULL
12+
GetPipeIdByNameErrorCounter, 22, 1, B, Dec, NULL, NULL, NULL, NULL
13+
Spare2Align, 23, 1, B, Dec, NULL, NULL, NULL, NULL
1314
PipeOverflowErrorCounter, 24, 2, H, Dec, NULL, NULL, NULL, NULL
1415
MsgLimitErrorCounter, 36, 2, H, Dec, NULL, NULL, NULL, NULL
1516
MemPoolHandle, 28, 4, I, Dec, NULL, NULL, NULL, NULL

‎Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Size, 4, 4, I, Dec, NULL, NULL, NULL, NULL
2-
Crc, 8, 4, I, Dec, NULL, NULL, NULL, NULL
1+
Size, 4, 4, I, Dec, NULL, NULL, NULL, NULL
2+
Crc, 8, 4, I, Dec, NULL, NULL, NULL, NULL
33
ActiveBufferAddr, 12, 4, I, Dec, NULL, NULL, NULL, NULL
44
InactiveBufferAddr, 16, 4, I, Dec, NULL, NULL, NULL, NULL
55
ValidationFuncPtr, 20, 4, I, Dec, NULL, NULL, NULL, NULL
66
TimeOfLastUpdate.seconds, 24, 4, I, Dec, NULL, NULL, NULL, NULL
77
TimeOfLastUpdate.subsecs, 28, 4, I, Dec, NULL, NULL, NULL, NULL
88
FileCreateTimeSecs, 32, 4, I, Dec, NULL, NULL, NULL, NULL
9-
FileCreateTimeSecs, 36, 4, I, Dec, NULL, NULL, NULL, NULL
9+
FileCreateTimeSubSecs, 36, 4, I, Dec, NULL, NULL, NULL, NULL

‎Subsystems/tlmGUI/cfs-ful-hk-tlm.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Error Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
1+
Error Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL
22
Command Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL
3-
Transfer in progress?, 14, 2, H, Dec, NULL, NULL, NULL, NULL
4-
Last Segment Accepted, 16, 2, H, Dec, NULL, NULL, NULL, NULL
5-
Segments Rejected, 18, 2, H, Dec, NULL, NULL, NULL, NULL
6-
Bytes Transferred, 20, 4, I, Dec, NULL, NULL, NULL, NULL
7-
Current File Name, 24, 64, 64s, Str, NULL, NULL, NULL, NULL
8-
Current File Size, 88, 4, I, Dec, NULL, NULL, NULL, NULL
9-
Current File Crc, 92, 4, I, Dec, NULL, NULL, NULL, NULL
10-
Current File Fd, 96, 4, i, Dec, NULL, NULL, NULL, NULL
3+
Transfer in progress?, 14, 2, H, Dec, NULL, NULL, NULL, NULL
4+
Last Segment Accepted, 16, 2, H, Dec, NULL, NULL, NULL, NULL
5+
Segments Rejected, 18, 2, H, Dec, NULL, NULL, NULL, NULL
6+
Bytes Transferred, 20, 4, I, Dec, NULL, NULL, NULL, NULL
7+
Current File Name, 24, 64, 64s, Str, NULL, NULL, NULL, NULL
8+
Current File Size, 88, 4, I, Dec, NULL, NULL, NULL, NULL
9+
Current File Crc, 92, 4, I, Dec, NULL, NULL, NULL, NULL
10+
Current File Fd, 96, 4, i, Dec, NULL, NULL, NULL, NULL

‎Subsystems/tlmGUI/cfs-nav-hk-tlm.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Longitude, 48, 8, d, Dec, NULL, NULL, NULL,
88
Longitude Direction, 56, 4, 4s, Str, NULL, NULL, NULL, NULL
99
Speed, 64, 8, d, Dec, NULL, NULL, NULL, NULL
1010
Direction, 72, 8, d, Dec, NULL, NULL, NULL, NULL
11-
Mag X, 80, 2, h, Dec, NULL, NULL, NULL, NULL
12-
Mag Y, 82, 2, h, Dec, NULL, NULL, NULL, NULL
13-
Mag Z, 84, 2, h, Dec, NULL, NULL, NULL, NULL
14-
Accel X, 86, 2, h, Dec, NULL, NULL, NULL, NULL
15-
Accel Y, 88, 2, h, Dec, NULL, NULL, NULL, NULL
16-
Accel Z, 90, 2, h, Dec, NULL, NULL, NULL, NULL
11+
Mag X, 80, 2, h, Dec, NULL, NULL, NULL, NULL
12+
Mag Y, 82, 2, h, Dec, NULL, NULL, NULL, NULL
13+
Mag Z, 84, 2, h, Dec, NULL, NULL, NULL, NULL
14+
Accel X, 86, 2, h, Dec, NULL, NULL, NULL, NULL
15+
Accel Y, 88, 2, h, Dec, NULL, NULL, NULL, NULL
16+
Accel Z, 90, 2, h, Dec, NULL, NULL, NULL, NULL

‎_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818

1919
# Development Build Macro Definitions
20-
_cFS_GrndSys_build_number = 6
20+
_cFS_GrndSys_build_number = 14
2121
_cFS_GrndSys_build_baseline = "7.2"
2222
_cFS_GrndSys_build_dev_baseline = "equuleus-rc1"
2323
_cFS_GrndSys_build_dev_cycle = "equuleus-rc2"

0 commit comments

Comments
 (0)