Commit Graph

384 Commits

Author SHA1 Message Date
Lorenz Meier e8e4a3b5da Allow GCC 4.9.3 2015-01-21 11:04:56 +01:00
Johan Jansen 9ea086bf2d Astyle: Run astyle to fix code formatting 2015-01-15 14:37:51 +01:00
Johan Jansen 10a2dd8a34 LandDetector: Merged fixedwing and multicopter into one module handling both algorithms 2015-01-15 14:37:51 +01:00
Johan Jansen 642063c3b8 LandDetector: Added crude land detectors for multicopter and fixedwing 2015-01-15 14:37:50 +01:00
Lorenz Meier adbe7246b7 Temporarily disable HoTT support 2015-01-09 07:09:58 +01:00
Andrew Tridgell c9e795156f makefiles: make it easier to use ccache for build on windows 2014-12-31 11:43:32 +01:00
Andrew Tridgell 6bc6739676 makefiles: removed stray spaces 2014-12-31 11:43:21 +01:00
Lorenz Meier e952324fbf Rework HoTT into a proper library, which fixes parallel build breakage 2014-12-26 20:25:31 +01:00
Daniel Agar d511e39ea7 turn on -Werror and fix resulting errors 2014-12-22 17:56:59 -05:00
James Goppert 97fdc69473 Added aerocore upload target. 2014-12-18 15:21:29 -05:00
tumbili 736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
Lorenz Meier ef450cc447 Enable examples by default to ensure they get maintained on API changes 2014-12-12 14:08:41 +01:00
tumbili 34cf39e1ec added vtol attitude control module to FMU makefile 2014-12-03 09:52:29 +01:00
Lorenz Meier 22a247ca67 Disable the BlinkM driver, code style fixes for other disabled drivers 2014-11-27 23:19:53 +01:00
Lorenz Meier 32835757de Remove uncommon modules from FMU-v2 build 2014-11-26 08:24:11 +01:00
Lorenz Meier 6200a3e3a5 Added TeraRanger one sensor 2014-11-26 07:56:54 +01:00
Don Gagne f3f7f08e0d Parameter xml metadata in .px4 2014-11-18 17:20:50 -08:00
Lorenz Meier 97a1410ec9 Toolchain: Allow GCC 4.7 and 4.8 variants 2014-11-17 15:14:17 +01:00
Lorenz Meier d4a5f345aa Remove unneeded apps from build 2014-11-15 13:50:38 +01:00
Thomas Gubler b64e675d53 Merge remote-tracking branch 'upstream/master' into swissfang 2014-10-07 10:02:01 +02:00
Lorenz Meier 3239ba1570 Merge pull request #1360 from DonLakeFlyer/UnitTestFramework
Upgraded unit test framework
2014-10-05 12:33:21 +02:00
Thomas Gubler c5a1ddd8f2 re-enable MC apps on FMUV1 2014-09-30 15:42:56 +02:00
Thomas Gubler e7313683cd Merge remote-tracking branch 'upstream/master' into swissfang 2014-09-30 15:40:11 +02:00
Thomas Gubler cc05f0f185 Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
2014-09-30 15:38:27 +02:00
Lorenz Meier 47f151d4ce Deactivate FrSky telem by default 2014-09-30 15:19:06 +02:00
Lorenz Meier 47dcf88271 Flash optimization 2014-09-30 15:18:30 +02:00
Lorenz Meier 772c5f745c Make space on FMUv1 2014-09-17 16:37:10 -05:00
Don Gagne deda5d0a04 Upgraded unit test framework 2014-09-13 19:59:44 -07:00
Thomas Gubler cf601c09bf swissfang: don't build MC apps on FMU1 2014-09-07 12:21:49 +02:00
Don Gagne 81275e624e Added mavlink_ftp unit test 2014-09-02 15:32:33 -07:00
Lorenz Meier 47e39841df Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang 2014-08-26 09:37:56 +02:00
Julian Oes 73ecbbe13d config_px4fmu-v2_default: include px4flow driver by default 2014-08-25 11:12:01 +02:00
Lorenz Meier e5f5f5e2cc Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul 2014-08-21 15:05:48 +02:00
Lorenz Meier 01f1c90c26 Make some space on FMUv1 2014-08-17 20:48:51 +02:00
Lorenz Meier b0b2f34992 Merged master 2014-08-09 12:22:28 +02:00
Lorenz Meier ae2de67501 Revert "Remove old TECS implementation - we can really only decently flight-test and support one."
This reverts commit 503ded0539.

Conflicts:
	mavlink/include/mavlink/v1.0
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-07-29 11:24:11 +02:00
Luis Rodrigues 034d0a6a61 driver for the TeraRangerOne I2C ranger finder 2014-07-23 18:19:49 +02:00
Lorenz Meier a7d2963e2b Enable UAVCAN 2014-07-23 08:27:45 +02:00
Lorenz Meier 1b5d4e5bd4 Comment out uavcan due to build breakage, will go back in ASAP 2014-07-22 17:42:34 +02:00
Lorenz Meier 086fc7f758 Merge pull request #1128 from PX4/uavcan
Basic UAVCAN support
2014-07-22 06:48:49 +02:00
Lorenz Meier e696ed5509 Merged master 2014-07-15 22:07:03 +02:00
Pavel Kirienko 56649bd10a Merge branch 'master' into uavcan 2014-07-08 19:51:19 +04:00
Lorenz Meier 369c7d277f Board config cleanup for external bus support 2014-07-08 13:50:00 +02:00
akdslr 1b555f2d2e LL40LS driver: Added new driver to the config make files 2014-07-08 12:03:18 +02:00
Lorenz Meier 512584ed75 Merge pull request #1145 from DonLakeFlyer/MoreWarnings
Fix compiler warnings
2014-07-08 07:32:36 +02:00
Don Gagne 680ebf29c3 Fix compiler warnings 2014-07-07 15:11:46 -07:00
Lorenz Meier 6a8990b3ba Merged master 2014-07-07 18:49:36 +02:00
Lorenz Meier 4c2cc65ca6 Cleaning up sub modules 2014-07-07 17:18:54 +02:00
Lorenz Meier 1492323f03 Merged master into uavcan 2014-07-06 15:47:34 +02:00
Lorenz Meier 4f06e9bdc9 Move a seldomly used module to test config 2014-07-06 15:16:39 +02:00