From 970c336e58b5fe4af17465d7ac67ea58f9d70f38 Mon Sep 17 00:00:00 2001
From: Andre Kjellstrup <andre.kjellstrup@gmail.com>
Date: Wed, 6 Mar 2024 20:30:23 +0100
Subject: [PATCH] fixes after merge conflict

---
 MAVProxy/modules/mavproxy_console.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/MAVProxy/modules/mavproxy_console.py b/MAVProxy/modules/mavproxy_console.py
index e7ca638961..1faad09863 100644
--- a/MAVProxy/modules/mavproxy_console.py
+++ b/MAVProxy/modules/mavproxy_console.py
@@ -325,6 +325,7 @@ def mavlink_packet(self, msg):
             return
         type = msg.get_type()
         sysid = msg.get_srcSystem()
+        compid = msg.get_srcComponent()
 
         if type in frozenset(['HEARTBEAT', 'HIGH_LATENCY2']):
             if type == 'HEARTBEAT':
@@ -342,6 +343,7 @@ def mavlink_packet(self, msg):
             self.update_vehicle_menu()
 
         if type in ['RADIO', 'RADIO_STATUS']:
+            # handle RADIO msgs from all vehicles
             if msg.rssi < msg.noise+10 or msg.remrssi < msg.remnoise+10:
                 fg = 'red'
                 if self.last_link_state != 1:
@@ -435,7 +437,7 @@ def mavlink_packet(self, msg):
             self.console.set_status('Alt', 'Alt %s' % self.height_string(rel_alt))
             self.console.set_status('AirSpeed', 'AirSpeed %s' % self.speed_string(msg.airspeed))
             self.console.set_status('GPSSpeed', 'GPSSpeed %s' % self.speed_string(msg.groundspeed))
-            self.console.set_status('Thr', 'Thr %u%%' % msg.throttle)
+            self.console.set_status('Thr', 'Thr %u' % msg.throttle)
             t = time.localtime(msg._timestamp)
             flying = False
             if self.mpstate.vehicle_type == 'copter':
@@ -630,7 +632,7 @@ def mavlink_packet(self, msg):
                 fg = 'dark green'
                 if m.linkerror:
                     linkline += "down"
-                    fg = 'red' 
+                    fg = 'red'
                     self.say("Warning: Link Down")
                 else:
                     packets_rcvd_percentage = 100
@@ -712,7 +714,6 @@ def mavlink_packet(self, msg):
 
             self.console.set_status('AltError', 'AltError %s' % alt_error, fg=fg)
             self.console.set_status('AspdError', 'AspdError %s%s' % (self.speed_string(msg.aspd_error*0.01), aspd_error_sign))
-            #self.console.set_status('AspdError', 'AspdError %.1f%s' % (msg.aspd_error*0.01, aspd_error_sign))
             self.console.set_status('XtrackError', 'XtrackError %d' % (msg.xtrack_error))
         elif type == 'VIBRATION':
             if msg.clipping_0 >= 20: