Skip to content

Commit 8947768

Browse files
tridgepeterbarker
authored andcommitted
ucenter: fix for python3
need to use bytes() objects
1 parent a39a541 commit 8947768

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

MAVProxy/modules/mavproxy_ucenter.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,13 @@ def debug(self, s):
8080

8181
def write(self, b):
8282
'''write some bytes to remove port'''
83-
if len(b) > 0:
84-
self.debug("sending '%s' (0x%02x) of len %u" % (b, ord(b[0]), len(b)))
85-
elif self.ucenter_settings.debug > 1:
86-
self.debug("sending empty request")
8783
while True:
8884
# note that we send a single empty buffer on len(b)==0
8985
n = len(b)
9086
if n > 70:
9187
n = 70
92-
buf = [ord(x) for x in b[:n]]
93-
buf.extend([0]*(70-len(buf)))
88+
buf = bytes(b[:n])
89+
buf += b'\x00' * (70-len(buf))
9490

9591
if self.last_baudrate != self.ucenter_settings.baudrate or self.last_devnum != self.ucenter_settings.devnum:
9692
baudrate = self.ucenter_settings.baudrate
@@ -140,7 +136,7 @@ def idle_task(self):
140136
self.sock = None
141137
return
142138
# send empty packet if idle
143-
pkt = ''
139+
pkt = bytes()
144140
if len(pkt) == 0 and now - self.last_write < self.ucenter_settings.delay:
145141
return
146142
self.write(pkt)
@@ -155,7 +151,7 @@ def mavlink_packet(self, m):
155151
return
156152
data = m.data
157153
data = m.data[:m.count]
158-
buf = ''.join(str(chr(x)) for x in data)
154+
buf = bytes(data)
159155
self.debug("got reply len %u" % len(buf))
160156
try:
161157
self.sock.send(buf)

0 commit comments

Comments
 (0)