fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-26 15:50:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,825 Commits 852 Branches 161 Tags
dcdde8ea88bf57b0432d2b64ed3ce606795c8d00
Commit Graph

289 Commits

Author SHA1 Message Date
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
Thomas Gubler 96db9e8188 Merge remote-tracking branch 'upstream/master' into ros 
Conflicts:
	src/platforms/px4_middleware.h
 2015-01-15 12:42:28 +01:00
Mark Whitehorn 3c98c7119e use non-uniform 1st order IIR lowpass filters for baro_gps_offset estimation 2015-01-13 09:06:00 -07:00
Pavel Kirienko c51b73c196 UAVCAN update - fixes https://github.com/UAVCAN/uavcan/issues/8 2015-01-10 10:25:05 +01:00
Thomas Gubler f13f41f704 point uavcan submodule to same commit as master 2015-01-08 09:08:50 +01:00
Thomas Gubler 74af4807a1 Matrix.hpp: remove wrong and correct formatting changes which are not on master for clarity 2015-01-08 08:26:04 +01:00
Thomas Gubler fe279d340d Merge remote-tracking branch 'upstream/master' into dev_ros 
Conflicts:
	Makefile
 2015-01-07 16:00:59 +01:00
Thomas Gubler f37fdd95af add and use PX4_ROS preprocessor define 2015-01-06 19:45:57 +01:00
Thomas Gubler 5056b03ab0 geo: fix include 2015-01-06 19:14:01 +01:00
Thomas Gubler c6722fce0b fw att control: cleanup, create base class for ECL 
Adding a new base class to remove a lot of boilerplate code, no
functionality changes
 2015-01-06 16:11:31 +01:00
Thomas Gubler ef485177ac make Matrix.hpp more consistent with upstream 2015-01-05 10:25:39 +01:00
Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros 
Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h
 2015-01-05 10:02:07 +01:00
Lorenz Meier 96a8003826 Merge pull request #1517 from rowoflo/patch-1 
Fixed loop limit errors in Matrix.h
 2015-01-04 01:34:01 +01:00
Thomas Gubler 16c66669c2 dummy attitude estimator copies attitude from gazebo 2014-12-30 14:53:53 +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 6fae021a00 Merge pull request #1527 from dagar/Werror 
turn on -Werror and fix resulting errors
 2014-12-25 17:44:44 +01:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros 
Conflicts:
	.gitignore
	src/lib/uavcan
 2014-12-25 09:48:15 +01:00
Daniel Agar d14fdf896b rotate_3f() implement missing ROTATION_ROLL_270_YAW_270 2014-12-23 11:18:30 -05:00
Lorenz Meier 84d744707d UAVCAN: Move into lib directory 2014-12-23 14:34:53 +01:00
Daniel Agar d511e39ea7 turn on -Werror and fix resulting errors 2014-12-22 17:56:59 -05:00
Rowland O'Flaherty 4d0d6f09ce Fixed loop limit errors in Matrix.h 
In few of the overloaded operators the loop limits (i.e. M and N) were swapped.
 2014-12-18 16:56:28 -08: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 ad499a5944 Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into dev_ros_rossharedlib 
Conflicts:
	src/modules/uORB/topics/vehicle_attitude.h
	src/platforms/px4_defines.h
 2014-12-02 16:52:38 +01:00
Roman Bapst efe0938e99 removed comment 2014-11-13 13:48:40 +01:00
Roman Bapst d931465382 added ifdef guard 2014-11-13 13:48:18 +01:00
Roman Bapst 003b326c77 applied fix_code_style.sh 2014-11-13 11:16:22 +01:00
Roman Bapst 794a89e711 added more digits to pi/2 2014-11-13 10:51:54 +01:00
Roman Bapst 076c1e6238 removed unused include 2014-11-11 15:43:47 +01:00
Roman Bapst 284787e02c removed platform specific included, they are not needed 2014-11-11 15:41:07 +01:00
Roman Bapst 19bc137cf3 removed unnecessary diff content 2014-11-11 15:34:31 +01:00
Roman Bapst 02175f4a67 removed unnecessary diff content 2014-11-11 15:32:20 +01:00
Roman Bapst ed409fd537 use px4_defines header to distinguish platform 2014-11-11 14:55:33 +01:00
Roman Bapst 3bfc4a5a52 removed platform specific includes 2014-11-11 13:10:36 +01:00
Lorenz Meier 122de6c762 Merge pull request #1414 from philipoe/PR2 
TECS: Cleared up integrator-design on throttle, corrected rate-limiting (WIP)
 2014-11-11 10:35:48 +01:00
Roman Bapst 31238516b5 pulled from PX4 master 2014-11-10 17:16:30 +01:00
Roman Bapst c9a7850b93 do not include eigen lib from local source 2014-11-10 16:10:01 +01:00
philipoe f414eef042 TECS: Modify absolute-value limiting of throttle demand 2014-11-06 11:00:14 +01:00
Thomas Gubler 25df841118 Merge pull request #1429 from tumbili/board_rot 
new_sensor_rotation_option
 2014-11-04 22:50:33 +01:00
tumbili cbd20f48d6 fixed style 2014-11-04 20:57:09 +01:00
tumbili f5dbfe63b3 added new sensor board rotation option (roll 270, yaw 270) 2014-11-04 20:52:29 +01:00
philipoe 02e35991d5 TECS: Also deleted the _throttle_dem_unc variable from TECS.h 2014-10-30 09:54:27 +01:00
philipoe 47367aeed5 TECS: Fix bug (underspeed-condition did not have any effect on throttle) 2014-10-29 23:13:51 +01:00
Roman Bapst 4fdf8e1ff2 updated from remote 2014-10-23 16:59:21 +02:00
Lorenz Meier b7b4804791 GEO: fix compile warnings 2014-10-11 00:28:48 +02:00
Lorenz Meier 4a8d20e2e5 Merged master into st24 2014-10-07 22:49:27 +02:00
Lorenz Meier 8c6c08dcb5 Limit channel count effectively 2014-10-07 22:46:07 +02:00
Lorenz Meier 726b10651a ST24: Fix parser return values, update docs 2014-10-07 22:25:03 +02:00
Lorenz Meier 3fc064882f ST24 lib: formatting 2014-10-07 09:28:14 +02:00
Lorenz Meier cb0cbe479a Finalizing ST24 lib 2014-10-07 08:05:32 +02:00
Lorenz Meier 9c89499696 Fix up ST24 lib 2014-10-07 07:14:28 +02:00