Merge pull request #231 from nasa/integration-candidate

cFS-GroundSystem Integration candidate: Caelum-rc4+dev28
nasa · Nov 14, 2022 · 73935ac · 73935ac
2 parents 89d90e3 + b060b2a
commit 73935ac
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git 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 <https://github.com/nasa/cFS-GroundSystem/pull/230> and <https://github.com/nasa/cFS-GroundSystem/pull/217>
+
 ## Development Build: v3.0.0-rc4+dev33
 - Update TO_LAB commands in GroundSystem Tool
 - Create CHANGELOG.md

diff --git a/Subsystems/cmdGui/CommandFiles/CI_LAB_CMD b/Subsystems/cmdGui/CommandFiles/CI_LAB_CMD
diff --git 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/.../cmdGui/ParameterFiles/CI_CAPTURE_PDUS_CC → ...Gui/ParameterFiles/CI_LAB_CAPTURE_PDUS_CC b/.../cmdGui/ParameterFiles/CI_CAPTURE_PDUS_CC → ...Gui/ParameterFiles/CI_LAB_CAPTURE_PDUS_CC
diff --git a/...ems/cmdGui/ParameterFiles/CI_DROP_PDUS_CC → ...cmdGui/ParameterFiles/CI_LAB_DROP_PDUS_CC b/...ems/cmdGui/ParameterFiles/CI_DROP_PDUS_CC → ...cmdGui/ParameterFiles/CI_LAB_DROP_PDUS_CC
diff --git a/.../ParameterFiles/CI_MODIFY_PDU_FILESIZE_CC → ...ameterFiles/CI_LAB_MODIFY_PDU_FILESIZE_CC b/.../ParameterFiles/CI_MODIFY_PDU_FILESIZE_CC → ...ameterFiles/CI_LAB_MODIFY_PDU_FILESIZE_CC
diff --git a/Subsystems/tlmGUI/GenericTelemetry.py b/Subsystems/tlmGUI/GenericTelemetry.py
@@ -66,26 +66,26 @@ 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':
                     value_field.setText(str(tlm_field[0]))
                 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))
 
     # Start the telemetry receiver (see GTTlmReceiver class)
     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
 

diff --git 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