Skip to content

Commit

Permalink
Tools: ardupilotwaf: allow automatic upload to BlueOS
Browse files Browse the repository at this point in the history
  • Loading branch information
Williangalvani authored and tridge committed Aug 27, 2024
1 parent 5bcbf56 commit 4ec023a
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
37 changes: 36 additions & 1 deletion Tools/ardupilotwaf/ardupilotwaf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from waflib.Scripting import run_command
from waflib.TaskGen import before_method, after_method, feature
import os.path, os
from pathlib import Path
from collections import OrderedDict
import subprocess

Expand Down Expand Up @@ -261,6 +262,30 @@ def ap_common_vehicle_libraries(bld):

_grouped_programs = {}


class upload_fw_blueos(Task.Task):
def run(self):
# this is rarely used, so we import requests here to avoid the overhead
import requests
binary_path = self.inputs[0].abspath()
# check if .apj file exists for chibios builds
if Path(binary_path + ".apj").exists():
binary_path = binary_path + ".apj"
bld = self.generator.bld
board = bld.bldnode.name.capitalize()
print(f"Uploading {binary_path} to BlueOS at {bld.options.upload_blueos} for board {board}")
url = f'{bld.options.upload_blueos}/ardupilot-manager/v1.0/install_firmware_from_file?board_name={board}'
files = {
'binary': open(binary_path, 'rb')
}
response = requests.post(url, files=files, verify=False)
if response.status_code != 200:
raise Errors.WafError(f"Failed to upload firmware to BlueOS: {response.status_code}: {response.text}")
print("Upload complete")

def keyword(self):
return "Uploading to BlueOS"

class check_elf_symbols(Task.Task):
color='CYAN'
always_run = True
Expand Down Expand Up @@ -309,7 +334,10 @@ def post_link(self):

check_elf_task = self.create_task('check_elf_symbols', src=link_output)
check_elf_task.set_run_after(self.link_task)

if self.bld.options.upload_blueos and self.env["BOARD_CLASS"] == "LINUX":
_upload_task = self.create_task('upload_fw_blueos', src=link_output)
_upload_task.set_run_after(self.link_task)

@conf
def ap_program(bld,
program_groups='bin',
Expand Down Expand Up @@ -641,6 +669,13 @@ def options(opt):
help='''Specify the port to be used with the --upload option. For example a port of /dev/ttyS10 indicates that serial port 10 shuld be used.
''')

g.add_option('--upload-blueos',
action='store',
dest='upload_blueos',
default=None,
help='''Automatically upload to a BlueOS device. The argument is the url for the device. http://blueos.local for example.
''')

g.add_option('--upload-force',
action='store_true',
help='''Override board type check and continue loading. Same as using uploader.py --force.
Expand Down
4 changes: 4 additions & 0 deletions Tools/ardupilotwaf/chibios.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,10 @@ def chibios_firmware(self):
_upload_task = self.create_task('upload_fw', src=apj_target)
_upload_task.set_run_after(generate_apj_task)

if self.bld.options.upload_blueos:
_upload_task = self.create_task('upload_fw_blueos', src=link_output)
_upload_task.set_run_after(generate_apj_task)

def setup_canmgr_build(cfg):
'''enable CANManager build. By doing this here we can auto-enable CAN in
the build based on the presence of CAN pins in hwdef.dat except for AP_Periph builds'''
Expand Down

0 comments on commit 4ec023a

Please sign in to comment.