369 Commits

Author SHA1 Message Date
Thomas Gubler
c37ff71e62 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	makefiles/config_px4fmu-v2_test.mk
2014-11-24 07:41:26 +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
Lorenz Meier
f36f54c621 Restructuring of generic middleware support files, wrapping of the main ROS calls, skeletons for publishers / subscribers 2014-11-09 11:57:34 +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 503ded05394767d58359834e73bc63672b701dbe.

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
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
Thomas Gubler
7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Lorenz Meier
e78d496e92 Enable new lookup lib 2014-06-28 12:51:22 +02:00
Lorenz Meier
503ded0539 Remove old TECS implementation - we can really only decently flight-test and support one. 2014-06-28 12:35:04 +02:00
Lorenz Meier
474de62ebb Enable matlab bridge in test setup 2014-06-10 15:12:23 +02:00
Lorenz Meier
436cefd88c make launch detector more flash efficient 2014-06-01 12:13:48 +02:00
Lorenz Meier
6341737384 Merge branch 'master' of github.com:PX4/Firmware into pca8574 2014-05-29 11:26:18 +02:00
Lorenz Meier
e710e2a2d1 Allow any GCC 4.7 subversion 2014-05-23 12:38:29 +02:00
Julian Oes
04a25fcf14 makefiles: check for correct arm-none-eabi-gcc version 2014-05-22 13:58:12 +02:00
Lorenz Meier
19ebe076cd Fix aerocore config 2014-05-15 14:38:16 +02:00
Lorenz Meier
ba51ab2545 Merge branch 'ekf_params' of github.com:PX4/Firmware 2014-05-15 13:14:25 +02:00
Ash Charles
e5508a1aa0 Add Gumstix AeroCore device
Based on the work of Andrew Smith [1], add board configuration and device
drivers to support the Gumstix AeroCore (previously Aerodroid) board [2]. The
AeroCore is an autopilot board based on a STM32F427 similar to the FMUv2.

[1] https://github.com/smithandrewc/Firmware
[2] https://store.gumstix.com/index.php/products/585/

Signed-off-by: Ash Charles <ashcharles@gmail.com>
2014-05-13 09:41:41 -07:00
Lorenz Meier
de5bdbb863 Merged master into uavcan 2014-05-07 14:28:23 +02:00
Lorenz Meier
6a6feaf96c Merged master 2014-05-07 14:14:31 +02:00
Pavel Kirienko
7d7a375dd1 Fixed hardcoded include path 2014-05-06 19:42:40 +04:00
Pavel Kirienko
7813566e66 Initial UAVCAN integration. The library compiles successfully, CAN driver appears to be working properly. There is one hardcoded path in the module makefile that needs to be fixed; plus the compilation will likely fail unless arch/math.h contains log2l() 2014-05-06 19:30:45 +04:00