From 0066d716d167b7eb7903df96c49a7b9b3087dffe Mon Sep 17 00:00:00 2001 From: Mat Roscoe <1327963+badrobit@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:56:35 -0800 Subject: [PATCH 1/4] fix(packets): correct dict iteration syntax in Telemetry.identify_packet The method was attempting to iterate over target_packets using tuple unpacking, but `.items()` was missing from the dict iteration. This would cause a TypeError since Python dictionaries require `.items()` for key-value pair iteration. Changed: `for _, packet in target_packets:` to: `for _, packet in target_packets.items():` This ensures proper dictionary key-value pair iteration when identifying packets in tlm_unique_id_mode. --- openc3/python/openc3/packets/telemetry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openc3/python/openc3/packets/telemetry.py b/openc3/python/openc3/packets/telemetry.py index c9d74542ed..1da294e44e 100644 --- a/openc3/python/openc3/packets/telemetry.py +++ b/openc3/python/openc3/packets/telemetry.py @@ -266,7 +266,7 @@ def identify(self, packet_data, target_names=None): target = self.system.targets[target_name] if target and target.tlm_unique_id_mode: # Iterate through the packets and see if any represent the buffer - for _, packet in target_packets: + for _, packet in target_packets.items(): if packet.identify(packet_data): return packet else: From fcc93774e9740968aa8355736080a4d5722ad9db Mon Sep 17 00:00:00 2001 From: Ryan Pratt Date: Thu, 6 Feb 2025 13:00:45 -0700 Subject: [PATCH 2/4] Add command description to hazardous dialog --- .../src/tools/CommandSender/CommandSender.vue | 4 ++++ .../src/components/TargetPacketItemChooser.vue | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/src/tools/CommandSender/CommandSender.vue b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/src/tools/CommandSender/CommandSender.vue index 21d41c45e7..f3a0f09e7a 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/src/tools/CommandSender/CommandSender.vue +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/src/tools/CommandSender/CommandSender.vue @@ -183,6 +183,8 @@ Warning: Command {{ hazardousCommand }} is Hazardous. Send? +
+ Description: {{ commandDescription }}
@@ -281,6 +283,7 @@ export default { editor: null, targetName: '', commandName: '', + commandDescription: '', paramList: '', lastTargetName: '', lastCommandName: '', @@ -617,6 +620,7 @@ export default { } this.screenCount += 1 } + this.commandDescription = command.description this.sendDisabled = false this.status = '' }, diff --git a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/TargetPacketItemChooser.vue b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/TargetPacketItemChooser.vue index 9f676e3f39..e41b7936f6 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/TargetPacketItemChooser.vue +++ b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/TargetPacketItemChooser.vue @@ -136,10 +136,10 @@ - Description: {{ description }} (HAZARDOUS) - Description: {{ description }} + + Description: {{ description }} + + From ad965bdda69024db679fb431ab1ff2e280d21ccc Mon Sep 17 00:00:00 2001 From: Ryan Pratt Date: Thu, 6 Feb 2025 16:52:34 -0700 Subject: [PATCH 3/4] Fix import-map-overrides dialog style (again) --- .../public/index-allow-http.html | 1 + .../openc3-tool-base/public/index.html | 1 + .../openc3-tool-base/public/js/fixImoStyle.js | 32 +++++++++++++++++++ .../assets/stylesheets/layout/_overrides.scss | 9 ------ 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 openc3-cosmos-init/plugins/packages/openc3-tool-base/public/js/fixImoStyle.js diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-base/public/index-allow-http.html b/openc3-cosmos-init/plugins/packages/openc3-tool-base/public/index-allow-http.html index f4c8bef89b..ea3a863374 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-tool-base/public/index-allow-http.html +++ b/openc3-cosmos-init/plugins/packages/openc3-tool-base/public/index-allow-http.html @@ -79,6 +79,7 @@ +