fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,742 Commits 852 Branches 161 Tags
Commit Graph

404 Commits

Author SHA1 Message Date
Thomas Gubler
cadcad6ffb messagelayer prototype for nuttx 2015-01-21 14:27:01 +01:00
Thomas Gubler
7c3223b860 added a messageplayer prototype for ros 2015-01-21 14:26:22 +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
0893f9fd96 remove uavcan from multiplatform build, problems with linking 2015-01-06 19:13:39 +01:00
Thomas Gubler
3436abdf0b add multiplatform makefile to work around flash size issues 2015-01-06 11:10:52 +01:00
Thomas Gubler
87650e49e1 Revert "turn off werror for now" 
This reverts commit 1fe70a845ddd5ba9721748ceced81327efa47193.
 2015-01-05 16:50:14 +01:00
Thomas Gubler
683b06321c Revert "uavcan gives compile errors, disable for now" 
This reverts commit 941ff05720b4ba8c282a84e1f8933469ae7fc39e.
 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
1fe70a845d turn off werror for now 2015-01-05 15:22:43 +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
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
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
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
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
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
851415e48e Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt 
Conflicts:
	makefiles/config_px4fmu-v2_test.mk
 2014-12-16 10:23:41 +01:00
Thomas Gubler
e1ff89ad61 add nuttx platform to fmuv1 makefile 2014-12-16 10:11:59 +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
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
Thomas Gubler
76457e63c5 add nuttx platform to default makefile 2014-12-10 12:38:54 +01:00
Thomas Gubler
52c35a8e20 solve conflict for definiton of FILE 2014-12-06 15:36:58 +01:00
Thomas Gubler
c2e2b3d52f make param wrapper macros compatible for px4 and ros, needs cleanup 2014-12-03 17:04:15 +01:00
tumbili
34cf39e1ec added vtol attitude control module to FMU makefile 2014-12-03 09:52:29 +01:00
Thomas Gubler
244c1cb583 enable systemcmds in test build 2014-11-28 11:34:52 +01:00
Thomas Gubler
2760d64a00 Merge remote-tracking branch 'upstream/master' into dev_ros 2014-11-28 09:47: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
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