Skip to content

Commit

Permalink
Makefile add travis-ci vectorcontrol build
Browse files Browse the repository at this point in the history
  • Loading branch information
dagar authored and LorenzMeier committed Mar 14, 2016
1 parent c37236e commit e029ad4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,7 @@ CMakeLists.txt.user
GPATH
GRTAGS
GTAGS

# uavcan firmware
ROMFS/px4fmu_common/uavcan/
vectorcontrol/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ script:
&& arm-none-eabi-gcc --version
&& echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default
&& echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default
&& echo 'Building UAVCAN node firmware..' && (git clone https://github.com/thiemar/vectorcontrol && cd vectorcontrol && BOARD=s2740vc_1_0 make -s && BOARD=px4esc_1_6 make -s && ../Tools/uavcan_copy.sh)
&& echo 'Building UAVCAN node firmware..' && make uavcan_firmware
&& echo 'Building NuttX px4fmu-v4 Firmware..' && make px4fmu-v4_default
&& echo 'Building NuttX px4-stm32f4discovery Firmware..' && make px4-stm32f4discovery_default
&& echo 'Running Tests..' && make tests
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ run_sitl_ros: sitl_deprecation

# Other targets
# --------------------------------------------------------------------

uavcan_firmware:
@(rm -rf vectorcontrol && git clone https://github.com/thiemar/vectorcontrol && cd vectorcontrol && BOARD=s2740vc_1_0 make --no-print-directory -s && BOARD=px4esc_1_6 make --no-print-directory -s && ../Tools/uavcan_copy.sh)

check_format:
@./Tools/check_code_style.sh

Expand Down

0 comments on commit e029ad4

Please sign in to comment.