Skip to content

Commit 4cb33a8

Browse files
committed
mavproxy_misc.py: factor out a _cmd_changealt
for use by the relative-alt and abs-alt variants
1 parent b7d20f7 commit 4cb33a8

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

Diff for: MAVProxy/modules/mavproxy_misc.py

+12-16
Original file line numberDiff line numberDiff line change
@@ -284,35 +284,31 @@ def cmd_time(self, args):
284284
return
285285
print("%s (%s)\n" % (time.ctime(tusec * 1.0e-6), time.ctime()))
286286

287+
def _cmd_changealt(self, alt, frame):
288+
self.master.mav.mission_item_send(self.settings.target_system,
289+
self.settings.target_component,
290+
0,
291+
frame,
292+
mavutil.mavlink.MAV_CMD_NAV_WAYPOINT,
293+
3, 1, 0, 0, 0, 0,
294+
0, 0, alt)
295+
print("Sent change altitude command for %.1f meters" % alt)
296+
287297
def cmd_changealt(self, args):
288298
'''change target altitude'''
289299
if len(args) < 1:
290300
print("usage: changealt <relaltitude>")
291301
return
292302
relalt = float(args[0])
293-
self.master.mav.mission_item_send(self.settings.target_system,
294-
self.settings.target_component,
295-
0,
296-
3,
297-
mavutil.mavlink.MAV_CMD_NAV_WAYPOINT,
298-
3, 1, 0, 0, 0, 0,
299-
0, 0, relalt)
300-
print("Sent change altitude command for %.1f meters" % relalt)
303+
self._cmd_changealt(relalt, mavutil.mavlink.MAV_FRAME_GLOBAL_RELATIVE_ALT)
301304

302305
def cmd_changealt_abs(self, args):
303306
'''change target altitude'''
304307
if len(args) < 1:
305308
print("usage: changealt_abs <absaltitude>")
306309
return
307310
absalt = float(args[0])
308-
self.master.mav.mission_item_send(self.settings.target_system,
309-
self.settings.target_component,
310-
0,
311-
0,
312-
mavutil.mavlink.MAV_CMD_NAV_WAYPOINT,
313-
3, 1, 0, 0, 0, 0,
314-
0, 0, absalt)
315-
print("Sent change altitude command for %.1f meters" % absalt)
311+
self._cmd_changealt(absalt, mavutil.mavlink.MAV_FRAME_GLOBAL)
316312

317313
def cmd_land(self, args):
318314
'''auto land commands'''

0 commit comments

Comments
 (0)