Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed motor arming

This commit is contained in:
Andrew Tridgell 2011-11-13 21:14:58 +11:00
parent 47fe0f9c75
commit 91f0722e22
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/autotest/arducopter.py
View File

@ -14,7 +14,7 @@ HOME_LOCATION='-35.362938,149.165085,584,270'
homeloc = None homeloc = None
num_wp = 0 num_wp = 0
def arm_motors(mavproxy): def arm_motors(mavproxy, mav):
'''arm motors''' '''arm motors'''
print("Arming motors") print("Arming motors")
mavproxy.send('switch 6\n') # stabilize mode mavproxy.send('switch 6\n') # stabilize mode
@ -26,7 +26,7 @@ def arm_motors(mavproxy):
print("MOTORS ARMED OK") print("MOTORS ARMED OK")
return True return True
def disarm_motors(mavproxy): def disarm_motors(mavproxy, mav):
'''disarm motors''' '''disarm motors'''
print("Disarming motors") print("Disarming motors")
mavproxy.send('switch 6\n') # stabilize mode mavproxy.send('switch 6\n') # stabilize mode
@ -285,7 +285,7 @@ def fly_ArduCopter(viewerip=None):
mav.recv_match(type='GPS_RAW', blocking=True) mav.recv_match(type='GPS_RAW', blocking=True)
setup_rc(mavproxy) setup_rc(mavproxy)
homeloc = current_location(mav) homeloc = current_location(mav)
if not arm_motors(mavproxy): if not arm_motors(mavproxy, mav):
failed = True failed = True
if not takeoff(mavproxy, mav): if not takeoff(mavproxy, mav):
@ -316,7 +316,7 @@ def fly_ArduCopter(viewerip=None):
if not land(mavproxy, mav): if not land(mavproxy, mav):
failed = True failed = True
if not disarm_motors(mavproxy): if not disarm_motors(mavproxy, mav):
failed = True failed = True
except pexpect.TIMEOUT, e: except pexpect.TIMEOUT, e:
failed = True failed = True