chore(cpn): refactor firmware flashing to use edgetx rs_dfu (#6521)
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
raphaelcoeffic
parent
23830197b3
commit
dbce54dec6
@@ -5,7 +5,7 @@ include(FetchContent)
|
||||
FetchContent_Declare(
|
||||
maxLibQt
|
||||
GIT_REPOSITORY https://github.com/edgetx/maxLibQt
|
||||
GIT_TAG 98f5482fb8b836f48a6a5ee199911882fa420f2b
|
||||
GIT_TAG 7e433da60d3f2e975d46afc91804a88029cd1b78
|
||||
)
|
||||
|
||||
FetchContent_MakeAvailable(maxLibQt)
|
||||
|
||||
@@ -17,4 +17,4 @@ include_directories(
|
||||
)
|
||||
|
||||
# suppress compiler warnings for this add-in only
|
||||
target_compile_options(miniz PRIVATE -Wno-unused-function)
|
||||
target_compile_options(miniz PRIVATE -Wno-unused-function -Wno-newline-eof)
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# Fetch rs_dfu
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
include(FetchContent)
|
||||
|
||||
# Determine platform and architecture
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(RS_DFU_PLATFORM "unknown-linux-gnu")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
set(RS_DFU_PLATFORM "apple-darwin")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
set(RS_DFU_PLATFORM "pc-windows-msvc")
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
|
||||
set(RS_DFU_ARCH "x86_64")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
|
||||
set(RS_DFU_ARCH "aarch64")
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
|
||||
endif()
|
||||
|
||||
set(RS_DFU_BASE_URL "https://github.com/EdgeTX/rs-dfu/releases/latest/download")
|
||||
set(RS_DFU_FILENAME "rs_dfu-${RS_DFU_ARCH}-${RS_DFU_PLATFORM}")
|
||||
set(RS_DFU_URL "${RS_DFU_BASE_URL}/${RS_DFU_FILENAME}.tar.gz")
|
||||
|
||||
FetchContent_Declare(
|
||||
RsDfu
|
||||
URL ${RS_DFU_URL}
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP true
|
||||
FIND_PACKAGE_ARGS
|
||||
)
|
||||
|
||||
FetchContent_MakeAvailable(RsDfu)
|
||||
|
||||
set(rs_dfu_DIR "${rsdfu_SOURCE_DIR}/cmake")
|
||||
|
||||
message("Fetched rsdfu source code from Github: ${rsdfu_SOURCE_DIR}")
|
||||
@@ -1,25 +0,0 @@
|
||||
# - try to find program dfu-util
|
||||
|
||||
set(DFU_UTIL_ROOT_DIR
|
||||
"${DFU_UTIL_ROOT_DIR}"
|
||||
CACHE
|
||||
PATH
|
||||
"Root directory to search for dfu-util")
|
||||
|
||||
find_program(DFU_UTIL_PROGRAM
|
||||
NAMES
|
||||
dfu-util
|
||||
HINTS
|
||||
"${DFU_UTIL_ROOT_DIR}")
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(DFU_UTIL
|
||||
DEFAULT_MSG
|
||||
DFU_UTIL_PROGRAM)
|
||||
|
||||
if(DFU_UTIL_FOUND)
|
||||
set(DFU_UTIL_PATH "${DFU_UTIL_PROGRAM}")
|
||||
mark_as_advanced(DFU_UTIL_ROOT_DIR)
|
||||
endif()
|
||||
|
||||
mark_as_advanced(DFU_UTIL_PROGRAM)
|
||||
@@ -1,24 +0,0 @@
|
||||
# - try to find libusb-1 library
|
||||
|
||||
set(LIBUSB1_ROOT_DIR
|
||||
"${LIBUSB1_ROOT_DIR}"
|
||||
CACHE
|
||||
PATH
|
||||
"Root directory to search for libusb-1")
|
||||
|
||||
find_library(LIBUSB1_LIBRARY
|
||||
NAMES
|
||||
libusb-1.0
|
||||
libusb-1.0.so
|
||||
libusb-1.0.so.0
|
||||
libusb-1.0.dll
|
||||
libusb-1.0.dylib
|
||||
HINTS
|
||||
"${LIBUSB1_ROOT_DIR}")
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(LIBUSB1
|
||||
DEFAULT_MSG
|
||||
LIBUSB1_LIBRARY)
|
||||
|
||||
mark_as_advanced(LIBUSB1_LIBRARY)
|
||||
@@ -13,27 +13,15 @@ else()
|
||||
endif()
|
||||
|
||||
if(Qt6Core_FOUND AND NOT DISABLE_COMPANION)
|
||||
# environment variable set in github workflows and build-edgetx Dockerfile
|
||||
if(DEFINED ENV{LIBUSB1_ROOT_DIR})
|
||||
set(LIBUSB1_ROOT_DIR "$ENV{LIBUSB1_ROOT_DIR}")
|
||||
endif()
|
||||
|
||||
find_package(Libusb1)
|
||||
|
||||
if(LIBUSB1_FOUND)
|
||||
if(DEFINED ENV{DFU_UTIL_ROOT_DIR})
|
||||
set(DFU_UTIL_ROOT_DIR "$ENV{DFU_UTIL_ROOT_DIR}")
|
||||
endif()
|
||||
|
||||
find_package(Dfuutil)
|
||||
endif()
|
||||
|
||||
# environment variable set in github workflows and build-edgetx Dockerfile
|
||||
if(DEFINED ENV{OPENSSL_ROOT_DIR})
|
||||
set(OPENSSL_ROOT_DIR "$ENV{OPENSSL_ROOT_DIR}")
|
||||
endif()
|
||||
|
||||
find_package(OpenSSL)
|
||||
|
||||
include(FetchRsDfu)
|
||||
find_package(rs_dfu REQUIRED)
|
||||
endif()
|
||||
|
||||
# Windows-specific includes and libs shared by sub-projects
|
||||
|
||||
Reference in New Issue
Block a user