dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
10,991 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

128 Commits

Author SHA1 Message Date
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
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 6341737384 Merge branch 'master' of github.com:PX4/Firmware into pca8574 2014-05-29 11:26:18 +02: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 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
Lorenz Meier af1af1e22d Port expander driver first hacky version 2014-04-29 18:38:30 +02:00
ufoncz bd5a0cef1a ver command ready including hwcmp which replaces hw_ver, removed hw_ver 
updated all scripts to use new ver hwcmp command
q
 2014-04-27 17:42:45 +02:00
ufoncz 5ea1105451 changed dir from version to ver to keep it shorter 
added "hw_ver compare" as command option so we can replace hw_ver in future
 2014-04-27 15:12:05 +02:00
ufoncz 08e5ed5a1d added version nsh command, it can replace hw_ver 
sss
 2014-04-25 21:14:12 +02:00
Lorenz Meier 7b61c927f0 Renamed FW filter to EKF to express its generic properties, switched multicopters over to this filter for first tests. 2014-04-19 16:13:13 +02:00