From 09fcbde52b7b75d13ecec16358f1890e2ed4b6a7 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 24 Oct 2015 11:58:30 +0200 Subject: [PATCH 1/5] Make some space in flash --- cmake/configs/nuttx_px4fmu-v2_default.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index f3638c5749..0c6458cad1 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -37,7 +37,7 @@ set(config_module_list drivers/meas_airspeed drivers/frsky_telemetry modules/sensors - drivers/mkblctrl + #drivers/mkblctrl drivers/px4flow drivers/oreoled drivers/gimbal @@ -54,7 +54,7 @@ set(config_module_list systemcmds/pwm systemcmds/esc_calib systemcmds/reboot - systemcmds/topic_listener + #systemcmds/topic_listener systemcmds/top systemcmds/config systemcmds/nshterm From 9239a93a71681bca31d6fcbfd6436906b9e9f17e Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 24 Oct 2015 11:59:00 +0200 Subject: [PATCH 2/5] Include both ESC images in standard binary --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3786602b09..9d89caca85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,14 @@ script: - echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default - echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default - echo 'Running Tests..' && make px4fmu-v2_default test + - echo 'Building UAVCAN node firmware..' && git clone https://github.com/thiemar/vectorcontrol + - cd vectorcontrol + - BOARD=s2740vc_1_0 make && BOARD=px4esc_1_6 make + - cd .. + - mkdir -p ROMFS/px4fmu_common/uavcan/fw/com.thiemar.s2740vc-v1/1.0/ + - mkdir -p ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/ + - cp vectorcontrol/firmware/com.thiemar.s2740vc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/com.thiemar.s2740vc-v1/1.0/00000000.uavcan.bin + - cp vectorcontrol/firmware/org.pixhawk.px4esc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/00000000.uavcan.bin after_success: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then From 96968911e4a246a2d5e700de7132d3a404069a15 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 24 Oct 2015 12:12:18 +0200 Subject: [PATCH 3/5] Keep size command in ccache path env --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d89caca85..e0d40aebae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,6 +73,7 @@ before_script: - mkdir -p ~/bin - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-g++ - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-gcc + - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-size - ln -s /usr/bin/ccache ~/bin/clang++ - ln -s /usr/bin/ccache ~/bin/clang++-3.4 - ln -s /usr/bin/ccache ~/bin/clang++-3.5 @@ -96,10 +97,7 @@ script: - make check_format - arm-none-eabi-gcc --version - echo 'Building POSIX Firmware..' && make posix_sitl_simple - - echo 'Running Tests..' && make posix_sitl_simple test && cat build_posix_sitl_simple/src/modules/systemlib/mixer/mixer_multirotor.generated.h - - echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default - - echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default - - echo 'Running Tests..' && make px4fmu-v2_default test + - echo 'Running Tests..' && make posix_sitl_simple test - echo 'Building UAVCAN node firmware..' && git clone https://github.com/thiemar/vectorcontrol - cd vectorcontrol - BOARD=s2740vc_1_0 make && BOARD=px4esc_1_6 make @@ -108,6 +106,9 @@ script: - mkdir -p ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/ - cp vectorcontrol/firmware/com.thiemar.s2740vc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/com.thiemar.s2740vc-v1/1.0/00000000.uavcan.bin - cp vectorcontrol/firmware/org.pixhawk.px4esc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/00000000.uavcan.bin + - echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default + - echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default + - echo 'Running Tests..' && make px4fmu-v2_default test after_success: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then From 4d6094cf70d2c4b959187bec824945fd2429aa45 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 24 Oct 2015 12:22:45 +0200 Subject: [PATCH 4/5] Add objcopy --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e0d40aebae..70342e4ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ before_script: - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-g++ - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-gcc - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-size + - ln -s /usr/bin/ccache ~/bin/arm-none-eabi-objcopy - ln -s /usr/bin/ccache ~/bin/clang++ - ln -s /usr/bin/ccache ~/bin/clang++-3.4 - ln -s /usr/bin/ccache ~/bin/clang++-3.5 From 89e6a80fd6b8fc6bc3279a2367b5b5eeb837f9dc Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 26 Oct 2015 09:43:21 +0100 Subject: [PATCH 5/5] Fix path according to Ben's instructions --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 70342e4ef3..d9b5b4e75a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,8 +105,8 @@ script: - cd .. - mkdir -p ROMFS/px4fmu_common/uavcan/fw/com.thiemar.s2740vc-v1/1.0/ - mkdir -p ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/ - - cp vectorcontrol/firmware/com.thiemar.s2740vc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/com.thiemar.s2740vc-v1/1.0/00000000.uavcan.bin - - cp vectorcontrol/firmware/org.pixhawk.px4esc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/00000000.uavcan.bin + - cp vectorcontrol/firmware/com.thiemar.s2740vc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/com.thiemar.s2740vc-v1/1.0/00000000.bin + - cp vectorcontrol/firmware/org.pixhawk.px4esc-v1-1.0.00000000.uavcan.bin ROMFS/px4fmu_common/uavcan/fw/org.pixhawk.px4esc-v1/1.0/00000000.bin - echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default - echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default - echo 'Running Tests..' && make px4fmu-v2_default test