Skip to content

Commit 29bd176

Browse files
committed
mavutil.py: work with minimal.xml
tested with from pymavlink import mavutil connection_str = "localhost:9876" mavutil.mavlink_connection(connection_str, dialect="minimal")
1 parent dc77277 commit 29bd176

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

mavutil.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,22 @@ def __init__(self):
159159
self.armed = False # canonical arm state for the vehicle as a whole
160160

161161
if float(mavlink.WIRE_PROTOCOL_VERSION) >= 1:
162-
self.messages['HOME'] = mavlink.MAVLink_gps_raw_int_message(0,0,0,0,0,0,0,0,0,0)
163-
mavlink.MAVLink_waypoint_message = mavlink.MAVLink_mission_item_message
162+
try:
163+
self.messages['HOME'] = mavlink.MAVLink_gps_raw_int_message(0,0,0,0,0,0,0,0,0,0)
164+
except AttributeError:
165+
# may be using a minimal dialect
166+
pass
167+
try:
168+
mavlink.MAVLink_waypoint_message = mavlink.MAVLink_mission_item_message
169+
except AttributeError:
170+
# may be using a minimal dialect
171+
pass
164172
else:
165-
self.messages['HOME'] = mavlink.MAVLink_gps_raw_message(0,0,0,0,0,0,0,0,0)
173+
try:
174+
self.messages['HOME'] = mavlink.MAVLink_gps_raw_message(0,0,0,0,0,0,0,0,0)
175+
except AttributeError:
176+
# may be using a minimal dialect
177+
pass
166178

167179
class param_state(object):
168180
'''state for a particular system id/component id pair'''

0 commit comments

Comments
 (0)