Skip to content

Commit dbf311c

Browse files
committed
RADIO_STATUS - corrected indent errors and fixed printing
Appears fully functional
1 parent d147cea commit dbf311c

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

dronekit/lib/__init__.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ def __init__(self, distance, voltage):
209209
def __str__(self):
210210
return "Rangefinder: distance={}, voltage={}".format(self.distance, self.voltage)
211211

212-
class Radio_RSSI(object):
212+
class RadioStatus(object):
213213
"""
214214
Radio RSSI reported values.
215215
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
217217
218218
:param rssi uint8_t Local signal strength
219219
:param remrssi uint8_t Remote signal strength
@@ -226,9 +226,9 @@ class Radio_RSSI(object):
226226
"""
227227

228228
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+
"""
232232
self.rssi = rssi
233233
self.remrssi = remrssi
234234
self.txbuf = txbuf
@@ -238,7 +238,7 @@ def __init__(self=None, rssi=None, remrssi=None, txbuf=None, noise=None, remnois
238238
self.fixed = fixed
239239

240240
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)
242242

243243

244244

@@ -682,7 +682,7 @@ def listener(self, name, m):
682682
self._rngfnd_voltage = m.voltage
683683
self._notify_attribute_listeners('rangefinder')
684684

685-
self.radio_status=RadioStatus()
685+
self.radio_status=RadioStatus()
686686
""" Temporary
687687
self._rssi = None
688688
self._remrssi = None
@@ -693,17 +693,17 @@ def listener(self, name, m):
693693
self._fixed = None
694694
"""
695695

696-
@self.message_listener('RADIO_STATUS')
696+
@self.message_listener('RADIO_STATUS')
697697
def listener(self, name, m):
698698
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')
707707

708708
self._mount_pitch = None
709709
self._mount_yaw = None

0 commit comments

Comments
 (0)