Skip to content

Commit

Permalink
Merge branch 'master' into pr-ratectrl_torque_accel_inertia
Browse files Browse the repository at this point in the history
  • Loading branch information
jlecoeur authored Oct 26, 2019
2 parents 1603b4d + 8bf6066 commit 6e0e577
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/fixedwing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ px4_add_board(
ROMFSROOT px4fmu_common
IO px4_io-v2_default
#TESTING
CONSTRAINED_FLASH
#UAVCAN_INTERFACES 2

SERIAL_PORTS
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/lpe.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ px4_add_board(
BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
IO px4_io-v2_default
#TESTING
CONSTRAINED_FLASH
#UAVCAN_INTERFACES 2

SERIAL_PORTS
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/rover.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ px4_add_board(
ARCHITECTURE cortex-m4
ROMFSROOT px4fmu_common
IO px4_io-v2_default
CONSTRAINED_FLASH

SERIAL_PORTS
GPS1:/dev/ttyS3
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/test.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ px4_add_board(
IO px4_io-v2_default
TESTING
#UAVCAN_INTERFACES 2
CONSTRAINED_FLASH

SERIAL_PORTS
GPS1:/dev/ttyS0
Expand Down

0 comments on commit 6e0e577

Please sign in to comment.