cmake consolidate px4 executable builds and upload

This commit is contained in:
Daniel Agar
2018-01-31 18:49:09 -05:00
parent 2ff81393bc
commit 102c0ead53
9 changed files with 120 additions and 480 deletions

View File

@@ -31,7 +31,6 @@
#
############################################################################
include(common/px4_upload)
include(cygwin_cygpath)
add_subdirectory(src)
@@ -130,9 +129,43 @@ if (TARGET parameters_xml AND TARGET airframes_xml)
# upload helper
if (${BOARD} STREQUAL "aerofc-v1")
px4_add_upload_aero(OUT upload OS ${OS} BOARD ${BOARD} BUNDLE ${fw_file})
add_custom_target(upload
COMMAND ${PX4_SOURCE_DIR}/Tools/aero_upload.sh ${fw_file}
DEPENDS ${fw_file}
COMMENT "uploading px4"
USES_TERMINAL
)
else()
px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD} BUNDLE ${fw_file})
set(serial_ports)
if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
list(APPEND serial_ports
/dev/serial/by-id/*_PX4_*
/dev/serial/by-id/usb-3D_Robotics*
/dev/serial/by-id/usb-The_Autopilot*
/dev/serial/by-id/usb-Bitcraze*
/dev/serial/by-id/pci-3D_Robotics*
/dev/serial/by-id/pci-Bitcraze*
/dev/serial/by-id/usb-Gumstix*
)
elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")
list(APPEND serial_ports
/dev/tty.usbmodemPX*,/dev/tty.usbmodem*
)
elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
foreach(port RANGE 32 0)
list(APPEND serial_ports
"COM${port}")
endforeach()
endif()
px4_join(OUT serial_ports LIST "${serial_ports}" GLUE ",")
add_custom_target(upload
COMMAND ${PYTHON_EXECUTABLE}
${PX4_SOURCE_DIR}/Tools/px_uploader.py --port ${serial_ports} ${fw_file}
DEPENDS ${fw_file}
COMMENT "uploading px4"
USES_TERMINAL
)
endif()
endif()