From 86914b7a37a5c6ba4c7560beff3688c12b9022c1 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Wed, 7 Sep 2022 13:12:12 +0200 Subject: [PATCH 1/3] Fix #202, naming error Sorry for that Fixed other error --- Subsystems/tlmGUI/GenericTelemetry.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Subsystems/tlmGUI/GenericTelemetry.py b/Subsystems/tlmGUI/GenericTelemetry.py index 315f1cc..a72c0d5 100644 --- a/Subsystems/tlmGUI/GenericTelemetry.py +++ b/Subsystems/tlmGUI/GenericTelemetry.py @@ -66,7 +66,7 @@ def display_telemetry_item(self, datagram, tlm_index, label_field, value_field): except UnboundLocalError: pass tlm_field2 = datagram[item_start:item_start + - int(tlmItemSize[tlm_index])] + int(tlm_item_size[tlm_index])] if tlm_field2: tlm_field = unpack(tlm_field1, tlm_field2) if tlm_item_display_type[tlm_index] == 'Dec': @@ -74,10 +74,10 @@ def display_telemetry_item(self, datagram, tlm_index, label_field, value_field): elif tlm_item_display_type[tlm_index] == 'Hex': value_field.setText(hex(tlm_field[0])) elif tlm_item_display_type[tlm_index] == 'Enm': - value_field.setText(tlmItemEnum[tlm_index][int(tlm_field[0])]) + value_field.setText(tlm_item_enum[tlm_index][int(tlm_field[0])]) elif tlm_item_display_type[tlm_index] == 'Str': value_field.setText(tlm_field[0].decode('utf-8', 'ignore')) - label_field.setText(tlmItemDesc[tlm_index]) + label_field.setText(tlm_item_desc[tlm_index]) else: print("ERROR: Can't unpack buffer of length", len(tlm_field2)) @@ -85,7 +85,7 @@ def display_telemetry_item(self, datagram, tlm_index, label_field, value_field): def init_gt_tlm_receiver(self, subscr): self.setWindowTitle(f"{page_title} for: {subscr}") self.thread = GTTlmReceiver(subscr) - self.thread.gtSignalTlmDatagram.connect(self.process_pending_datagrams) + self.thread.gt_signal_tlm_datagram.connect(self.process_pending_datagrams) self.thread.finished.connect(self.thread.deleteLater) self.thread.start() @@ -215,9 +215,9 @@ def usage(): # # Read in the contents of the telemetry packet definition # - tlm_item_is_valid, tlmItemDesc, \ - tlm_item_start, tlmItemSize, \ - tlm_item_display_type, tlmItemFormat = ([] for _ in range(6)) + tlm_item_is_valid, tlm_item_desc, \ + tlm_item_start, tlm_item_size, \ + tlm_item_display_type, tlm_item_format = ([] for _ in range(6)) tlm_item_enum = [None] * 40 From 188fee7f90845456c5983ea0032d0dd71981b0ed Mon Sep 17 00:00:00 2001 From: Avi Date: Mon, 17 Oct 2022 12:57:00 +1000 Subject: [PATCH 2/3] Fix #229, Update CI_LAB commands in GroundSystem Tool --- Subsystems/cmdGui/CommandFiles/CI_LAB_CMD | Bin 261 -> 239 bytes Subsystems/cmdGui/CommandFiles/ci_lab_msg | 14 +++++++------- ...I_CAPTURE_PDUS_CC => CI_LAB_CAPTURE_PDUS_CC} | Bin .../{CI_DROP_PDUS_CC => CI_LAB_DROP_PDUS_CC} | Bin ...ILESIZE_CC => CI_LAB_MODIFY_PDU_FILESIZE_CC} | Bin 5 files changed, 7 insertions(+), 7 deletions(-) rename Subsystems/cmdGui/ParameterFiles/{CI_CAPTURE_PDUS_CC => CI_LAB_CAPTURE_PDUS_CC} (100%) rename Subsystems/cmdGui/ParameterFiles/{CI_DROP_PDUS_CC => CI_LAB_DROP_PDUS_CC} (100%) rename Subsystems/cmdGui/ParameterFiles/{CI_MODIFY_PDU_FILESIZE_CC => CI_LAB_MODIFY_PDU_FILESIZE_CC} (100%) diff --git a/Subsystems/cmdGui/CommandFiles/CI_LAB_CMD b/Subsystems/cmdGui/CommandFiles/CI_LAB_CMD index 7f858b65af365c3b2b6b815264a4e2e5bf9ce16f..bd5d21f0033c81e891932a6893401461fc0e2af5 100644 GIT binary patch literal 239 zcmYL@I|>3Z5QYs{+Xy0p)>h)XUuS1AxVs5?6bdrcg2(UxTgDrD5XU6qFn^Qpo5?(f zulFF;JuJEV5lE_w6SYcd0to#yKNz&=2$XLf8XM6(qehjox{@wERkB7aZy5O^b5O>3 z?Vyl284ZgGc9xv9R7aPu&v*YYJ2hK5c H57DhYPb*5* literal 261 zcmX|)$qK?S5I|GwT9=B5pkL6FxZfpBF=(5R1)@-LDtMhg@Y78b@$_Kco0(5s1IlWM zGLs;LFtrt9++qwJvkU`4BvBSKT`3}Dt75Ybs$@AWo|fm@7W6?ReUa98%_exvgwS01 z0N)6{OI@}>&!i#9g?r}K{n@@*{MN2qX+i#CU{*m$6>^Jzg}XIuY8YiEa>Wi3&pnJi Y4>0jO!qoEwGtV=mo)?%m@2J^+0T)I*S^xk5 diff --git a/Subsystems/cmdGui/CommandFiles/ci_lab_msg b/Subsystems/cmdGui/CommandFiles/ci_lab_msg index 003dea8..1192bd9 100644 --- a/Subsystems/cmdGui/CommandFiles/ci_lab_msg +++ b/Subsystems/cmdGui/CommandFiles/ci_lab_msg @@ -1,18 +1,18 @@ (lp0 (lp1 -S'CI_NOOP_CC' +S'CI_LAB_NOOP_CC' p2 -aS'CI_RESET_COUNTERS_CC' +aS'CI_LAB_RESET_COUNTERS_CC' p3 -aS'CI_MODIFY_PDU_FILESIZE_CC' +aS'CI_LAB_MODIFY_PDU_FILESIZE_CC' p4 -aS'CI_CORRUPT_PDU_CHECKSUM_CC' +aS'CI_LAB_CORRUPT_PDU_CHECKSUM_CC' p5 -aS'CI_DROP_PDUS_CC' +aS'CI_LAB_DROP_PDUS_CC' p6 -aS'CI_CAPTURE_PDUS_CC' +aS'CI_LAB_CAPTURE_PDUS_CC' p7 -aS'CI_STOP_PDU_CAPTURE_CC' +aS'CI_LAB_STOP_PDU_CAPTURE_CC' p8 aa(lp9 S'0' diff --git a/Subsystems/cmdGui/ParameterFiles/CI_CAPTURE_PDUS_CC b/Subsystems/cmdGui/ParameterFiles/CI_LAB_CAPTURE_PDUS_CC similarity index 100% rename from Subsystems/cmdGui/ParameterFiles/CI_CAPTURE_PDUS_CC rename to Subsystems/cmdGui/ParameterFiles/CI_LAB_CAPTURE_PDUS_CC diff --git a/Subsystems/cmdGui/ParameterFiles/CI_DROP_PDUS_CC b/Subsystems/cmdGui/ParameterFiles/CI_LAB_DROP_PDUS_CC similarity index 100% rename from Subsystems/cmdGui/ParameterFiles/CI_DROP_PDUS_CC rename to Subsystems/cmdGui/ParameterFiles/CI_LAB_DROP_PDUS_CC diff --git a/Subsystems/cmdGui/ParameterFiles/CI_MODIFY_PDU_FILESIZE_CC b/Subsystems/cmdGui/ParameterFiles/CI_LAB_MODIFY_PDU_FILESIZE_CC similarity index 100% rename from Subsystems/cmdGui/ParameterFiles/CI_MODIFY_PDU_FILESIZE_CC rename to Subsystems/cmdGui/ParameterFiles/CI_LAB_MODIFY_PDU_FILESIZE_CC From b060b2a8b2fb48ba35a2b9e356e23106271546cc Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 14 Nov 2022 07:31:30 -0500 Subject: [PATCH 3/3] Bump to v3.0.0-rc4+dev39 --- CHANGELOG.md | 5 +++++ _version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c18a110..5fdcada 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Development Build: v3.0.0-rc4+dev39 +- Update CI_LAB commands in GroundSystem Tool +- naming error +- See and + ## Development Build: v3.0.0-rc4+dev33 - Update TO_LAB commands in GroundSystem Tool - Create CHANGELOG.md diff --git a/_version.py b/_version.py index 7d2a46f..7f7c17f 100644 --- a/_version.py +++ b/_version.py @@ -17,7 +17,7 @@ # # Development Build Macro Definitions -_cFS_GrndSys_build_number = 33 +_cFS_GrndSys_build_number = 39 _cFS_GrndSys_build_baseline = "v3.0.0-rc4" # Version Number Definitions see doxygen docs for definitions