Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Jenkins archive nuttx bin file

Browse Source
This commit is contained in:
Daniel Agar
2018-05-30 19:58:19 -07:00
committed by Lorenz Meier
parent 35963abddd
commit 6ca078425e
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+2 -2
View File
@@ -713,7 +713,7 @@ def createBuildNode(String docker_repo, String target) {
sh('make ' + target) sh('make ' + target)
sh('ccache -s') sh('ccache -s')
sh('make sizes') sh('make sizes')
archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/**/*.px4, build/**/*.elf', fingerprint: true, onlyIfSuccessful: true) archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/**/*.px4, build/**/*.elf, build/**/*.bin', fingerprint: true, onlyIfSuccessful: true)
sh('make distclean') sh('make distclean')
} }
} }
@@ -735,7 +735,7 @@ def createBuildNodeDockerLogin(String docker_repo, String docker_credentials, St
sh('make ' + target) sh('make ' + target)
sh('ccache -s') sh('ccache -s')
sh('make sizes') sh('make sizes')
archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/**/*.px4, build/**/*.elf', fingerprint: true, onlyIfSuccessful: true) archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/**/*.px4, build/**/*.elf, build/**/*.bin', fingerprint: true, onlyIfSuccessful: true)
sh('make distclean') sh('make distclean')
} }
} }
cmake/configs/nuttx_esc35-v1_default.cmake
+1 -1
View File
@@ -27,7 +27,7 @@ add_definitions(
) )
px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD}
BIN ${PX4_BINARY_DIR}/platforms/nuttx/esc35-v1.bin BIN ${PX4_BINARY_DIR}/esc35-v1.bin
HWNAME ${uavcanblid_name} HWNAME ${uavcanblid_name}
HW_MAJOR ${uavcanblid_hw_version_major} HW_MAJOR ${uavcanblid_hw_version_major}
HW_MINOR ${uavcanblid_hw_version_minor} HW_MINOR ${uavcanblid_hw_version_minor}
cmake/configs/nuttx_px4cannode-v1_default.cmake
+1 -1
View File
@@ -25,7 +25,7 @@ add_definitions(
) )
px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD}
BIN ${PX4_BINARY_DIR}/platforms/nuttx/px4cannode-v1.bin BIN ${PX4_BINARY_DIR}/px4cannode-v1.bin
HWNAME ${uavcanblid_name} HWNAME ${uavcanblid_name}
HW_MAJOR ${uavcanblid_hw_version_major} HW_MAJOR ${uavcanblid_hw_version_major}
HW_MINOR ${uavcanblid_hw_version_minor} HW_MINOR ${uavcanblid_hw_version_minor}
cmake/configs/nuttx_px4esc-v1_default.cmake
+1 -1
View File
@@ -27,7 +27,7 @@ add_definitions(
) )
px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD}
BIN ${PX4_BINARY_DIR}/platforms/nuttx/px4esc-v1.bin BIN ${PX4_BINARY_DIR}/px4esc-v1.bin
HWNAME ${uavcanblid_name} HWNAME ${uavcanblid_name}
HW_MAJOR ${uavcanblid_hw_version_major} HW_MAJOR ${uavcanblid_hw_version_major}
HW_MINOR ${uavcanblid_hw_version_minor} HW_MINOR ${uavcanblid_hw_version_minor}
cmake/configs/nuttx_s2740vc-v1_default.cmake
+1 -1
View File
@@ -21,7 +21,7 @@ include(configs/uavcan_board_ident/s2740vc-v1)
# N.B. this would be uncommented when there is an APP # N.B. this would be uncommented when there is an APP
#px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} #px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD}
# BIN ${PX4_BINARY_DIR}/platforms/nuttx/s2740vc-v1.bin # BIN ${PX4_BINARY_DIR}/s2740vc-v1.bin
# HWNAME ${uavcanblid_name} # HWNAME ${uavcanblid_name}
# HW_MAJOR ${uavcanblid_hw_version_major} # HW_MAJOR ${uavcanblid_hw_version_major}
# HW_MINOR ${uavcanblid_hw_version_minor} # HW_MINOR ${uavcanblid_hw_version_minor}
platforms/nuttx/CMakeLists.txt
+4 -5
View File
@@ -52,7 +52,6 @@ list(APPEND nuttx_libs
nuttx_apps nuttx_apps
nuttx_arch nuttx_arch
nuttx_binfmt nuttx_binfmt
nuttx_binfmt
nuttx_c nuttx_c
nuttx_configs nuttx_configs
nuttx_cxx nuttx_cxx
@@ -120,8 +119,8 @@ set(fw_file ${PX4_BINARY_DIR}/${FW_NAME})
string(REPLACE ".elf" ".px4" fw_file ${fw_file}) string(REPLACE ".elf" ".px4" fw_file ${fw_file})
string(REPLACE "nuttx_" "" fw_file ${fw_file}) string(REPLACE "nuttx_" "" fw_file ${fw_file})
add_custom_command(OUTPUT ${BOARD}.bin add_custom_command(OUTPUT ${PX4_BINARY_DIR_REL}/${BOARD}.bin
COMMAND ${OBJCOPY} -O binary ${PX4_BINARY_DIR_REL}/${FW_NAME} ${BOARD}.bin COMMAND ${OBJCOPY} -O binary ${PX4_BINARY_DIR_REL}/${FW_NAME} ${PX4_BINARY_DIR_REL}/${BOARD}.bin
DEPENDS ${FW_NAME} DEPENDS ${FW_NAME}
) )
@@ -136,8 +135,8 @@ if (TARGET parameters_xml AND TARGET airframes_xml)
--git_identity ${PX4_SOURCE_DIR} --git_identity ${PX4_SOURCE_DIR}
--parameter_xml ${PX4_BINARY_DIR}/parameters.xml --parameter_xml ${PX4_BINARY_DIR}/parameters.xml
--airframe_xml ${PX4_BINARY_DIR}/airframes.xml --airframe_xml ${PX4_BINARY_DIR}/airframes.xml
--image ${BOARD}.bin > ${fw_file} --image ${PX4_BINARY_DIR}/${BOARD}.bin > ${fw_file}
DEPENDS ${BOARD}.bin parameters_xml airframes_xml DEPENDS ${PX4_BINARY_DIR}/${BOARD}.bin parameters_xml airframes_xml
COMMENT "Creating ${fw_file}" COMMENT "Creating ${fw_file}"
) )