@@ -209,11 +209,11 @@ def __init__(self, distance, voltage):
209
209
def __str__ (self ):
210
210
return "Rangefinder: distance={}, voltage={}" .format (self .distance , self .voltage )
211
211
212
- class Radio_RSSI (object ):
212
+ class RadioStatus (object ):
213
213
"""
214
214
Radio RSSI reported values.
215
215
216
- The message definition is here: http://mavlink.org/messages/common#RADIO_STATUS
216
+ The message definition is here: http://mavlink.org/messages/common#RADIO_STATUS
217
217
218
218
:param rssi uint8_t Local signal strength
219
219
:param remrssi uint8_t Remote signal strength
@@ -226,9 +226,9 @@ class Radio_RSSI(object):
226
226
"""
227
227
228
228
def __init__ (self = None , rssi = None , remrssi = None , txbuf = None , noise = None , remnoise = None , rxerrors = None , fixed = None ):
229
- """
230
- Radio_RSSI object constructor
231
- """
229
+ """
230
+ RadioStatus object constructor
231
+ """
232
232
self .rssi = rssi
233
233
self .remrssi = remrssi
234
234
self .txbuf = txbuf
@@ -238,7 +238,7 @@ def __init__(self=None, rssi=None, remrssi=None, txbuf=None, noise=None, remnois
238
238
self .fixed = fixed
239
239
240
240
def __str__ (self ):
241
- return "RSSI:" , self .rssi , self .remrssi , self .txbuf , self .noise , self .remnoise , self .rxerrors , self .fixed
241
+ return "RSSI:local=%s,remote=%s,txbuf=%s,noise=%s,remnoise=%s,rxerrors=%s,fixed=%s" % ( self .rssi , self .remrssi , self .txbuf , self .noise , self .remnoise , self .rxerrors , self .fixed )
242
242
243
243
244
244
@@ -682,7 +682,7 @@ def listener(self, name, m):
682
682
self ._rngfnd_voltage = m .voltage
683
683
self ._notify_attribute_listeners ('rangefinder' )
684
684
685
- self .radio_status = RadioStatus ()
685
+ self .radio_status = RadioStatus ()
686
686
""" Temporary
687
687
self._rssi = None
688
688
self._remrssi = None
@@ -693,17 +693,17 @@ def listener(self, name, m):
693
693
self._fixed = None
694
694
"""
695
695
696
- @self .message_listener ('RADIO_STATUS' )
696
+ @self .message_listener ('RADIO_STATUS' )
697
697
def listener (self , name , m ):
698
698
self .radio_status .rssi = m .rssi
699
- self .radio_status .remrssi = m .remrssi
700
- self .radio_status .txbuf = m .txbuf
701
- self .radio_status .noise = m .noise
702
- self .radio_status .remnoise = m .remnoise
703
- self .radio_status .rxerrors = m .rxerrors
704
- self .radio_status .fixed = m .fixed
705
- # Notify all observers of new message.
706
- self ._notify_attribute_listeners ('radio status' )
699
+ self .radio_status .remrssi = m .remrssi
700
+ self .radio_status .txbuf = m .txbuf
701
+ self .radio_status .noise = m .noise
702
+ self .radio_status .remnoise = m .remnoise
703
+ self .radio_status .rxerrors = m .rxerrors
704
+ self .radio_status .fixed = m .fixed
705
+ # Notify all observers of new message.
706
+ self ._notify_attribute_listeners ('radio status' )
707
707
708
708
self ._mount_pitch = None
709
709
self ._mount_yaw = None
0 commit comments