fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 08:38:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,394 Commits 852 Branches 161 Tags
a0260b6f6ebe7a4709a55818c324145f17937145
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Gubler a0260b6f6e use joystick launch file (joystick will not be used actually from euroc directly) 2014-12-30 16:56:03 +01:00
Thomas Gubler dbaf6af257 scale dummy mixer output 2014-12-30 16:55:34 +01:00
Thomas Gubler 60b02477e5 fix mixed motor commands publication 2014-12-30 16:01:52 +01:00
Thomas Gubler 0ea60f56e9 attitude estimator: fix readin of pose 2014-12-30 15:55:39 +01:00
Thomas Gubler 133842e89d fix launch files 2014-12-30 15:43:23 +01:00
Thomas Gubler 6f446d9abc add first version of simulator launch file 2014-12-30 15:31:44 +01:00
Thomas Gubler 481f18cb3e include commander and mixer in launch file 2014-12-30 14:58:00 +01:00
Thomas Gubler 16c66669c2 dummy attitude estimator copies attitude from gazebo 2014-12-30 14:53:53 +01:00
Thomas Gubler 2623ec156f Merge branch 'dev_ros_commander' into dev_ros 
Conflicts:
	CMakeLists.txt
 2014-12-30 12:34:18 +01:00
Thomas Gubler f968e7355d fix mixer path 2014-12-30 12:31:24 +01:00
Thomas Gubler 838f860347 variable rename 2014-12-30 12:27:45 +01:00
Thomas Gubler 6f425ca7fc commander dummy node 2014-12-30 12:27:29 +01:00
Thomas Gubler 664a240779 Merge pull request #5 from thomasgubler/PR_mixer 
Pr mixer
 2014-12-30 11:46:46 +01:00
Thomas Gubler 502952e034 make clear that switches are hardcoded to manual mode 2014-12-30 11:25:27 +01:00
Thomas Gubler c016804594 manual input: map axes 2014-12-30 11:16:53 +01:00
Thomas Gubler 824446bf2f typo 2014-12-30 11:15:46 +01:00
Thomas Gubler 4c51121079 add example ROS_INFO 2014-12-30 10:19:33 +01:00
Thomas Gubler 27203beaa7 add some info in README about joystick 2014-12-30 09:58:45 +01:00
Thomas Gubler 4debf45e06 add joystick to launch file 2014-12-30 09:58:30 +01:00
Thomas Gubler 1f8fd5d120 new dummy attitude estimator skeleton 2014-12-30 09:13:20 +01:00
Thomas Gubler b632d128aa add ros helper nodes readme 2014-12-30 08:22:18 +01:00
Thomas Gubler c9b0dfaaa1 skeleton code for manual input node 2014-12-30 08:17:59 +01:00
Thomas Gubler 1c6da49e3f add gazebo_msgs 2014-12-29 14:11:33 +01:00
Thomas Gubler 2c12a524de dummy estimator skeleton code 2014-12-29 11:57:45 +01:00
Thomas Gubler b04c80aec7 mc att: fix init call 2014-12-29 10:35:46 +01:00
Thomas Gubler 9d30c297f4 add ros launch files 2014-12-29 10:17:25 +01:00
Thomas Gubler ac8b47b0c3 add missing msg and includes 2014-12-29 09:49: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
Thomas Gubler ca97d0156c -Wno-attributes -Wno-packed for mavlink 2014-12-28 23:22:34 +01:00
Thomas Gubler c583f1fe8b increase commander framesize 2014-12-28 23:22:02 +01:00
Thomas Gubler acb4844939 don't publish att sp in altctl because it can mask the setpoint from the pos controller 2014-12-25 18:21:24 +01:00
Thomas Gubler 195472fddf fix init of published structs 2014-12-25 13:40:14 +01:00
Thomas Gubler a93362c700 re-add accidentally removed parameter init 2014-12-25 11:50:41 +01:00
Thomas Gubler ef61ba5454 fix compile/merge error in mc_att_control 2014-12-25 10:43:25 +01:00
Thomas Gubler 382158d87b fix merge error in .gitmodules 2014-12-25 10:03:46 +01:00
Thomas Gubler 4567512d7a add actuator_controls_virtual_mc as msg, fix msg setup in CMakeList 2014-12-25 10:01:20 +01:00
Thomas Gubler e31e143047 fix include 2014-12-25 10:00:09 +01:00
Thomas Gubler b376316fb1 Merge remote-tracking branch 'upstream/isvtol' into dev_ros 
Conflicts:
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
 2014-12-25 09:59:58 +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
Thomas Gubler ba4b8c8e00 Merge pull request #1523 from bansiesta/geofence_parse_fix 
Geofence parse fix
 2014-12-23 09:20:00 +01:00
Thomas Gubler 6a8ebc8afd Merge pull request #1518 from bansiesta/do_jump_feedback 
DO_JUMP feedback in QGC
 2014-12-23 09:19:10 +01:00
Thomas Gubler 6dd98cb311 mc att ctl: remove autostart id param 2014-12-22 15:18:20 +01:00
Thomas Gubler 6f83f77bf4 fw att ctl: remove autostart id param 2014-12-22 15:18:09 +01:00
Thomas Gubler ad189cf7d6 fix small compile error after merge 2014-12-19 16:02:13 +01:00
Thomas Gubler 19d5383c56 Merge pull request #1493 from PX4/fwposcontrolmode 
Fw pos control: small mode cleanup
 2014-12-19 11:04:56 +01:00
Thomas Gubler 5becd2227a Merge pull request #1509 from PX4/VTOL_startup_and_parameter_fix 
Vtol startup and parameter fix
 2014-12-18 22:18:08 +01:00
Thomas Gubler 32675ff1c1 fix flag_external_manual_override_ok 
The flag should not depend on the vtol state anymore. The intended
functionality of this is by now handled via the is_rotary_wing flag
 2014-12-18 15:05:33 +01:00
Thomas Gubler e18065081a is_vtol flag in vehicle_status 
Getting rid of the autostart based checks if the system is a vtol
Fixes #1503
 2014-12-18 14:46:31 +01:00
Thomas Gubler e697413667 multiplatform subscription: uorb: separate class for no callback case 2014-12-18 12:11:35 +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 8fdd694f12 fw pos ctl: compile with -Os 2014-12-17 21:13:50 +01:00
Thomas Gubler 262b9fc754 fw pos ctl: make loop performance counter more meaningful 2014-12-17 21:13:13 +01:00
Thomas Gubler 4402d7106b improve and fix multiplatform param by name macro 2014-12-17 16:31:40 +01:00
Thomas Gubler 1faab673b2 Merge pull request #1506 from sjwilks/tbs_endurance 
Airframe config and autostart for the TBS Discovery Long Range
 2014-12-17 16:14:34 +01:00
Thomas Gubler 0a1e94d504 circuit breaker: move to cpp, all platforms use the same file 2014-12-17 15:50:01 +01:00
Thomas Gubler 7ad3b03353 multi platform interface: macro to get param by name 2014-12-17 15:49:03 +01:00
Thomas Gubler 2d0f11783c fix header for cpp perf_counter dummy 2014-12-17 15:47:18 +01:00
Thomas Gubler bbfe78e4f6 mc att ctl: fix subscription handlers, fix parameters 2014-12-17 13:50:29 +01:00
Thomas Gubler 9bad23e418 add explicit non-callback contructor for nuttx/uorb subscriber to work around linker issues 2014-12-17 08:22:38 +01:00
Thomas Gubler be26952038 px4 nodehandle: nuttx: call spin once also after timeout 2014-12-17 08:03:22 +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 71f6a34367 mc att: increase stack size 2014-12-16 10:12:50 +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
Thomas Gubler 9980e44821 moved msg files 2014-12-16 08:22:58 +01:00
Thomas Gubler e38d0c27bd Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into dev_ros_mcatt 2014-12-15 10:46:51 +01:00
Thomas Gubler b6b80dcac1 ll40ls: write min and max to report 2014-12-14 12:10:29 +01:00
Thomas Gubler 0575f67300 ll40ls: fix whitespace 2014-12-14 12:10:29 +01:00
Thomas Gubler cc2dae23f9 trone: write min and max to report 2014-12-14 12:10:29 +01:00
Thomas Gubler 834ff85930 trone: fix whitespace 2014-12-14 12:10:28 +01:00
Thomas Gubler 8fd9f98904 sf0x: write min and max to report 2014-12-14 12:10:28 +01:00
Thomas Gubler 8ebe463f16 sf0x: fix whitespace 2014-12-14 12:10:28 +01:00
Thomas Gubler 682f30afe6 mb12xx: write min and max to report 2014-12-14 12:10:28 +01:00
Thomas Gubler 642b2088c3 autostart ll40ls 2014-12-14 11:43:25 +01:00
Thomas Gubler 29eab8ebd4 change [init] to [i] 
This change was introduced in pull #1461. This fixes some missed
occurrences.
 2014-12-14 11:28:25 +01:00
Thomas Gubler 4a70da5c2c ll40ls: max distance according to datasheet 
Datasheet:
http://pulsedlight3d.com/pl3d/wp-content/uploads/2014/11/LIDAR-Lite.pdf
 2014-12-13 19:01:00 +01:00
Thomas Gubler 046ca1f8e3 ll40ls: fix whitespace 2014-12-13 19:00:35 +01:00
Thomas Gubler ea4876da38 mavlink: distance sensor: fix max value 2014-12-13 18:19:12 +01:00
Thomas Gubler 6f89514beb fix comment style and type 2014-12-13 17:20:53 +01:00
Thomas Gubler d0325f2b12 fw pos ctrl: takeoff special case only in takeoff 2014-12-13 17:20:42 +01:00
Thomas Gubler a78264507e Merge remote-tracking branch 'upstream/master' into fwposcontrolmode 2014-12-13 15:59:40 +01:00
Thomas Gubler 7b7c85dc96 Merge remote-tracking branch 'upstream/master' into fwposcontrolmode 2014-12-13 15:38:54 +01:00
Thomas Gubler 02bc680a9f Merge pull request #1461 from PX4/romfs_clean 
Romfs clean
 2014-12-13 15:09:47 +01:00
Thomas Gubler 58d69052e2 Merge remote-tracking branch 'upstream/master' into romfs_clean 
Conflicts:
	ROMFS/px4fmu_common/init.d/rc.interface
	ROMFS/px4fmu_common/init.d/rcS
 2014-12-13 15:05:56 +01:00
Thomas Gubler 5cd2ee8342 fw pos control: improve mode logic slightly 2014-12-13 12:36:33 +01:00
Thomas Gubler 59ec2401b6 fw pos control: better check for control mode 2014-12-13 00:48:27 +01:00
Thomas Gubler 75a8701537 mc att: correctly handle topics which are simultaneously subscribed and published 2014-12-12 11:21:43 +01:00
Thomas Gubler c0d386bce0 mc att: use multiplatform subscriptions type 2014-12-12 10:15:33 +01:00
Thomas Gubler 59d26f5c30 mc att: remove subscriber handles 2014-12-12 07:34:23 +01:00
Thomas Gubler ab35b6470c mc att: use multiplatform publisher 2014-12-11 19:02:14 +01:00
Thomas Gubler b755312a1e mc att: use PX4 macros to init and get params 2014-12-11 17:12:03 +01:00
Thomas Gubler 9d0ecc77bb mc att: convert param definitions to be compatible with multiplatform build 2014-12-11 17:05:12 +01:00
Thomas Gubler ce73a81602 WIP remove unnecessary functions 2014-12-11 16:41:04 +01:00
Thomas Gubler 9c09a9e8d5 mc att control: prepare for ros integration, move class into spearate file 2014-12-11 16:11:04 +01:00
Thomas Gubler 12df129da2 Merge branch 'dev_ros' into dev_ros_mcatt 
Conflicts:
	CMakeLists.txt
 2014-12-11 15:56:32 +01:00
Thomas Gubler 998646f03b add base class and template subscriber class as well to improve interface to get last msg value 2014-12-11 15:33:32 +01:00
Thomas Gubler c68c277c94 subscription class for ros now stores last message to avoid manual copy and support subscription with no callbacks 2014-12-11 15:04:37 +01:00
Thomas Gubler fd6a5fd38b move px4::init call 2014-12-11 10:58:47 +01:00
Thomas Gubler 173b1b2a8b WIP, make class based and extended subscriber/publisher example compile for ros 2014-12-11 10:51:19 +01:00
Thomas Gubler a1685ed6d0 change definition of px4 main function 2014-12-11 09:27:11 +01:00