Commit Graph

10305 Commits

Author SHA1 Message Date
tumbili 945c8df18b added scaling of mc pitch control with airspeed 2014-12-06 17:37:46 +01:00
Thomas Gubler 042be3d49a Merge branch 'dev_ros' into dev_ros_rossharedlib 2014-12-06 15:37:27 +01:00
Thomas Gubler 52c35a8e20 solve conflict for definiton of FILE 2014-12-06 15:36:58 +01:00
Thomas Gubler 72d5f2b245 Merge pull request #1476 from friekopter/vel_alt_hold
Implemented altitude and velocity hold mode
2014-12-05 19:36:27 +01:00
Thomas Gubler b9de4d0e14 Merge branch 'ROS_shared_lib_base_class' into dev_ros_rossharedlib 2014-12-05 10:35:05 +01:00
Thomas Gubler 996438aafe fix base and sim file descriptions 2014-12-05 10:33:14 +01:00
Thomas Gubler 9c4fc14f23 fix base and sim file descriptions 2014-12-05 10:32:52 +01:00
Thomas Gubler 041aea7532 Merge branch 'ROS_shared_lib_base_class' into dev_ros_rossharedlib 2014-12-05 09:43:40 +01:00
Thomas Gubler c64c184948 whitespace 2014-12-05 09:43:35 +01:00
Thomas Gubler 92135d155d Merge remote-tracking branch 'upstream/master' into ROS_shared_lib_base_class 2014-12-05 09:34:22 +01:00
Thomas Gubler 0f1a7e7b5b whitespace 2014-12-05 09:33:26 +01:00
Thomas Gubler ebcad32e37 mc att: more cleanup between base and main class 2014-12-05 09:30:34 +01:00
Thomas Gubler dfd2098e04 re-add hardcoded parameters for euroc 2014-12-05 09:30:28 +01:00
Thomas Gubler 417bc91363 mc att: more cleanup between base and main class 2014-12-05 09:29:57 +01:00
Thomas Gubler 85aa6554ad re-add hardcoded parameters for euroc 2014-12-05 09:29:20 +01:00
Thomas Gubler 1c19d75cf4 mc att control: ran fix code style script 2014-12-05 09:03:49 +01:00
Thomas Gubler eafc4b5f9e mc att control: make the main app use the base class, move euroc functions into own class 2014-12-05 09:03:41 +01:00
Thomas Gubler 2f646e7082 mc att control: ran fix code style script 2014-12-05 09:02:06 +01:00
Thomas Gubler 4c950eb76b mc att control: make the main app use the base class, move euroc functions into own class 2014-12-05 09:00:21 +01:00
Roman Bapst 590489d498 make sure vtol attitude control module is started with idle speed set for multicopter mode 2014-12-04 17:36:16 +01:00
Roman Bapst 692af62885 set vtol motor count- and idle pwm parameter 2014-12-04 16:58:43 +01:00
Roman Bapst bed53e810b introduced vtol_motor_count and idle_pwm_mc parameter 2014-12-04 16:57:06 +01:00
Roman Bapst 7ea4d10bc9 added parameter file to makefile 2014-12-04 16:56:08 +01:00
Roman Bapst 4fd3e0720f added parameter file for vtol attitude control module 2014-12-04 16:55:12 +01:00
Thomas Gubler 33647c494e Merge branch 'dev_ros' into dev_ros_rossharedlib 2014-12-04 16:41:43 +01:00
Thomas Gubler 6f9cbd9751 add genmsg and gencpp python modules, ros not required anymore for message generation 2014-12-04 16:40:46 +01:00
Roman Bapst fbedd3ed20 removed whitespaces removed small unused code block 2014-12-04 14:23:19 +01:00
Thomas Gubler 0b9ef53ac1 Merge branch 'dev_ros' into dev_ros_rossharedlib 2014-12-04 13:36:16 +01:00
Thomas Gubler 9b680ebeb6 Merge remote-tracking branch 'upstream/ros' into dev_ros 2014-12-04 13:24:11 +01:00
Thomas Gubler 690dc7c6ab Merge remote-tracking branch 'upstream/master' into ros 2014-12-04 13:21:01 +01:00
Thomas Gubler f4a326c2bf platform headers: fix code style 2014-12-04 13:20:12 +01:00
Thomas Gubler e0bb713bb0 more documentation comments 2014-12-04 13:06:38 +01:00
Thomas Gubler 0f094d35d5 nodehandle: add documentation comments 2014-12-04 12:22:21 +01:00
Thomas Gubler befe4c399e comments for px4 defines 2014-12-04 11:50:59 +01:00
Thomas Gubler 8e8f84bde0 uorb topic header generator: only create new files if the file content really changed 2014-12-04 10:39:24 +01:00
Thomas Gubler 83d97fd1c2 better support for param default values on ros and px4 2014-12-04 09:53:37 +01:00
Thomas Gubler c2e2b3d52f make param wrapper macros compatible for px4 and ros, needs cleanup 2014-12-03 17:04:15 +01:00
Thomas Gubler 924350a5de bring up param wrapper for px4, moved global include file 2014-12-03 15:11:27 +01:00
Thomas Gubler 1c79f0cef1 improve param wrapper for ros, prepare for px4 2014-12-03 14:43:03 +01:00
Thomas Gubler 6a99b04fb7 add parameter wrapper macros for ros 2014-12-03 12:31:37 +01:00
Lorenz Meier 6bd586c837 Merge pull request #1482 from sjwilks/uavcan_debug
Display ESC data in the status output
2014-12-03 11:16:34 +01:00
Simon Wilks f3fb32bc47 Unsubscribe from the topic. 2014-12-03 10:43:17 +01:00
Simon Wilks 7a344b9337 Display ESC data in the status output 2014-12-03 10:30:49 +01:00
tumbili 21465bc287 added missing newline 2014-12-03 09:59:18 +01:00
tumbili 34cf39e1ec added vtol attitude control module to FMU makefile 2014-12-03 09:52:29 +01:00
tumbili 563de3b49c in fw mode, publish also yaw and throttle on control group 1 for logging 2014-12-03 09:47:56 +01:00
tumbili f7ca1d36d2 renamed FWC to ATC1 2014-12-03 09:46:52 +01:00
tumbili 0e33e52d4a use uORB ID to determine the correct rate_sp- and actuator topic to publish on 2014-12-03 09:44:34 +01:00
tumbili fa8ca2fc10 set correct number of PWM outputs and PWM Rate for caipirinha VTOL 2014-12-03 09:42:12 +01:00
Thomas Gubler 905913986a update comments 2014-12-03 07:43:08 +01:00