Commit Graph

139 Commits

Author SHA1 Message Date
Anton Matosov 72274062c1 Renamed servo_gimbal to simply 'gimbal' as HW is behind the scene and doesn't really matter here 2015-03-06 18:57:37 -08:00
Lorenz Meier 8a6698b6e6 drivers/servo_gimbal: Added servo gimbal 2015-03-06 18:57:37 -08:00
Randy Mackay 9a3ea61569 build: add oreoled to px4fmu-v2_default 2015-02-25 15:10:11 +01:00
Lorenz Meier e59aaa771c Rover: Add simple steering controller. 2015-02-19 21:51:53 +01:00
James Goppert d736311982 Added flow position estimator to default apps. 2015-02-11 21:11:23 -05:00
Lorenz Meier d441d38677 Merged master into ros 2015-02-02 21:21:51 +01:00
Lorenz Meier a3f577e642 FMUv2: Re-enable missing sensors 2015-02-01 13:11:05 +01:00
Thomas Gubler 0dc511a76b remove unintended/leftover changes in fmu2 default makefile 2015-02-01 12:20:54 +01:00
Lorenz Meier 1cc4c808a8 Upgrade UAVCAN to multi pub/sub A API 2015-01-29 16:33:53 +01:00
Lorenz Meier cc7a00b96e Disable UAVCAN build until sensors use all new-style API and UAVCAN sensors base class can be reworked to use it consistently 2015-01-29 16:33:53 +01:00
David Sidrane 6606b56364 Updated NuttX submodule with memcpy fix, disabled run time stack checking and added modules back in 2015-01-29 04:49:39 -10:00
Thomas Gubler 856b10cc1a Revert "temporarily re-enable stack checking, disable some modules to make firmware fit"
This reverts commit 27b2701340.
2015-01-28 16:29:25 +01:00
Thomas Gubler 2728889f78 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge_attctlposctl 2015-01-28 16:29:14 +01:00
Thomas Gubler 27b2701340 temporarily re-enable stack checking, disable some modules to make firmware fit 2015-01-28 10:21:42 +01:00
Thomas Gubler 52a2a23cc7 Merge remote-tracking branch 'upstream/ros' into ros_messagelayer_merge 2015-01-21 15:50:54 +01:00
Thomas Gubler dcdde8ea88 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts:
	src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
2015-01-21 14:41:03 +01:00
Lorenz Meier d1eac3510b DELETE DURING REBASE: Remove some apps to make space 2015-01-21 13:40:10 +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
Thomas Gubler b2366aaa22 Merge remote-tracking branch 'upstream/master' into ros 2015-01-09 08:07:00 +01:00
Lorenz Meier adbe7246b7 Temporarily disable HoTT support 2015-01-09 07:09:58 +01:00
Thomas Gubler 3436abdf0b add multiplatform makefile to work around flash size issues 2015-01-06 11:10:52 +01:00
Thomas Gubler 683b06321c Revert "uavcan gives compile errors, disable for now"
This reverts commit 941ff05720.
2015-01-05 16:33:57 +01:00
Thomas Gubler 5876ff11ec mc att control multiplatform alongside normal mc att control 2015-01-05 16:12:22 +01:00
Thomas Gubler 941ff05720 uavcan gives compile errors, disable for now 2015-01-05 15:58:38 +01:00
Thomas Gubler f4e0dc2857 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitmodules
2014-12-29 08:00:12 +01:00
Lorenz Meier e952324fbf Rework HoTT into a proper library, which fixes parallel build breakage 2014-12-26 20:25:31 +01:00
Thomas Gubler 16618f1ada Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/examples/subscriber/subscriber_params.c
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
	src/modules/uORB/topics/vehicle_attitude_setpoint.h
	src/platforms/px4_middleware.h
2014-12-18 12:11:05 +01:00
Thomas Gubler 9520983e08 lots' of header juggling and small changes to make mc att control compile for NuttX and ROS 2014-12-16 08:24:51 +01:00
Thomas Gubler 76457e63c5 add nuttx platform to default makefile 2014-12-10 12:38:54 +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 d4a5f345aa Remove unneeded apps from build 2014-11-15 13:50:38 +01: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 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
Pavel Kirienko 56649bd10a Merge branch 'master' into uavcan 2014-07-08 19:51:19 +04:00
akdslr 1b555f2d2e LL40LS driver: Added new driver to the config make files 2014-07-08 12:03:18 +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