mirror of https://github.com/ArduPilot/ardupilot
Tools: ardupilotwaf: adjust for new location of uploader.py
This commit is contained in:
parent
072195ad99
commit
1d2f8555c0
|
@ -739,8 +739,8 @@ class px4(Board):
|
||||||
|
|
||||||
self.ROMFS_EXCLUDE = []
|
self.ROMFS_EXCLUDE = []
|
||||||
|
|
||||||
# use ardupilot version of px_uploader.py
|
# use ardupilot version of uploader.py
|
||||||
os.environ['UPLOADER'] = os.path.realpath(os.path.join(os.path.dirname(__file__), 'px_uploader.py'))
|
os.environ['UPLOADER'] = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'script', 'uploader.py'))
|
||||||
|
|
||||||
def configure(self, cfg):
|
def configure(self, cfg):
|
||||||
if not self.bootloader_name:
|
if not self.bootloader_name:
|
||||||
|
|
|
@ -54,7 +54,7 @@ class upload_fw(Task.Task):
|
||||||
def run(self):
|
def run(self):
|
||||||
upload_tools = self.env.get_flat('UPLOAD_TOOLS')
|
upload_tools = self.env.get_flat('UPLOAD_TOOLS')
|
||||||
src = self.inputs[0]
|
src = self.inputs[0]
|
||||||
return self.exec_command("{} '{}/px_uploader.py' '{}'".format(self.env.get_flat('PYTHON'), upload_tools, src))
|
return self.exec_command("{} '{}/uploader.py' '{}'".format(self.env.get_flat('PYTHON'), upload_tools, src))
|
||||||
|
|
||||||
def exec_command(self, cmd, **kw):
|
def exec_command(self, cmd, **kw):
|
||||||
kw['stdout'] = sys.stdout
|
kw['stdout'] = sys.stdout
|
||||||
|
@ -93,7 +93,7 @@ class generate_bin(Task.Task):
|
||||||
|
|
||||||
class generate_apj(Task.Task):
|
class generate_apj(Task.Task):
|
||||||
color='CYAN'
|
color='CYAN'
|
||||||
run_str="${PYTHON} '${UPLOAD_TOOLS}/px_mkfw.py' --image '${SRC}' --prototype '${BUILDROOT}/apj.prototype' > '${TGT}'"
|
run_str="${PYTHON} '${MKFW_TOOLS}/px_mkfw.py' --image '${SRC}' --prototype '${BUILDROOT}/apj.prototype' > '${TGT}'"
|
||||||
always_run = True
|
always_run = True
|
||||||
def keyword(self):
|
def keyword(self):
|
||||||
return "Generating"
|
return "Generating"
|
||||||
|
@ -240,7 +240,8 @@ def configure(cfg):
|
||||||
env.BUILDROOT = bldpath('')
|
env.BUILDROOT = bldpath('')
|
||||||
env.SRCROOT = srcpath('')
|
env.SRCROOT = srcpath('')
|
||||||
env.PT_DIR = srcpath('Tools/ardupilotwaf/chibios/image')
|
env.PT_DIR = srcpath('Tools/ardupilotwaf/chibios/image')
|
||||||
env.UPLOAD_TOOLS = srcpath('Tools/ardupilotwaf')
|
env.MKFW_TOOLS = srcpath('Tools/ardupilotwaf')
|
||||||
|
env.UPLOAD_TOOLS = srcpath('Tools/scripts')
|
||||||
env.CHIBIOS_SCRIPTS = srcpath('libraries/AP_HAL_ChibiOS/hwdef/scripts')
|
env.CHIBIOS_SCRIPTS = srcpath('libraries/AP_HAL_ChibiOS/hwdef/scripts')
|
||||||
env.TOOLS_SCRIPTS = srcpath('Tools/scripts')
|
env.TOOLS_SCRIPTS = srcpath('Tools/scripts')
|
||||||
env.APJ_TOOL = srcpath('Tools/scripts/apj_tool.py')
|
env.APJ_TOOL = srcpath('Tools/scripts/apj_tool.py')
|
||||||
|
|
|
@ -1847,7 +1847,7 @@ class AutoTestCopter(AutoTest):
|
||||||
self.mavproxy.expect("Gripper Grabbed")
|
self.mavproxy.expect("Gripper Grabbed")
|
||||||
self.mavproxy.expect("Gripper Released")
|
self.mavproxy.expect("Gripper Released")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.progress("Exception caught")
|
self.progress("Exception caught: %s" % str(e))
|
||||||
self.mavproxy.send('mode land\n')
|
self.mavproxy.send('mode land\n')
|
||||||
ex = e
|
ex = e
|
||||||
self.context_pop()
|
self.context_pop()
|
||||||
|
|
Loading…
Reference in New Issue