Commit Graph

13526 Commits

Author SHA1 Message Date
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 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
Roman Bapst fbedd3ed20 removed whitespaces removed small unused code block 2014-12-04 14:23:19 +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 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
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
Thomas Gubler 05a87a706a move px4_defines file 2014-12-02 16:17:17 +01:00
Lorenz Meier d5debc2f42 Merge master into attitude EKF update 2014-12-02 15:12:11 +01:00
Lorenz Meier 8d1a0700f2 Merge pull request #1475 from hsteinhaus/gps_time
Corrected time_gps_usec values description.
2014-12-02 12:30:46 +01:00
Thomas Gubler 7328cc4a19 Merge remote-tracking branch 'upstream/master' into dev_ros 2014-12-02 12:25:03 +01:00
Thomas Gubler e28e8c11bb make default apps compatible with autogenerated attitude and rc_channels message 2014-12-02 12:19:24 +01:00
Thomas Gubler fbc4974525 remove rc_channels, vehicle_attitude topic header files 2014-12-02 10:50:31 +01:00
Roman Bapst 887ed69099 added VTOL attitude control module 2014-12-02 10:50:25 +01:00
Roman Bapst 0dc202502d added VTOL geometries to determine number of motors 2014-12-02 10:49:19 +01:00
Roman Bapst 9a64004d7f let commander know if VTOL is in fw or in mc mode (important because of external_override) 2014-12-02 10:47:07 +01:00
Roman Bapst 15ad9e441e compute secondary attitude with reference frame rotated -90 degress around pitch axis of original reference frame (used for VTOL) 2014-12-02 10:38:39 +01:00
Roman Bapst 285a0e7be9 added more mixer geometries and took v-mixer out of multi_tables script 2014-12-02 10:36:30 +01:00
Roman Bapst ff55652f9a adapted attitude controllers to support VTOL 2014-12-02 10:34:39 +01:00
Roman Bapst ad204bbb5d log secondary attitude and fixed wing controls for VTOL 2014-12-02 10:33:43 +01:00
Roman Bapst 35c985e523 extended uORB structs with VTOL specific control topics 2014-12-02 10:32:13 +01:00
Andreas Antener 45c52b51ee move natural position to the front of the pending list for QGC 2014-12-02 01:42:12 +01:00
Andreas Antener b1bd813978 swap fron/back > the "side" being measured is facing downwards 2014-12-02 01:37:54 +01:00
Andreas Antener 3ce7abe9d8 use consistent orientation naming in messages 2014-12-02 01:01:35 +01:00
Friedemann Ludwig 6efc63d709 fixed somereview comments 2014-11-30 20:51:01 +01:00
Holger Steinhaus f619dba6f9 Corrected time_gps_usec values description.
Fixes #1474
2014-11-28 15:36:30 +01:00
Thomas Gubler b0cfc2d122 uORB::SubscriptionNode stores interval 2014-11-28 13:59:32 +01:00
Thomas Gubler 2760d64a00 Merge remote-tracking branch 'upstream/master' into dev_ros 2014-11-28 09:47:29 +01:00
Friedemann Ludwig 8e8b622f4f Implemented altitude and velocity hold mode 2014-11-28 04:11:39 +01:00
Thomas Gubler e7c1e5b1ff wip, working on the nuttx wrapper 2014-11-26 11:36:23 +01:00
Lorenz Meier cbcd1ea1d1 Merged PX4Flow driver changes 2014-11-26 07:43:19 +01:00
Lorenz Meier ef76a7cf27 Merge branch 'pullrequest-px4io' of github.com:tridge/Firmware 2014-11-26 07:32:06 +01:00
Andrew Tridgell c0b47d6a74 px4io: only check SAFETY_OFF for allowing RC config changes and reboot
If we check OUTPUTS_ARMED then we can't update trim values and scaling
in flight, as there is no way to clear OUTPUTS_ARMED.

If safety is on then it should be perfectly safe to update the mixer
and RC config or reboot for fw update
2014-11-26 11:39:41 +11:00
Andrew Tridgell 7ae4f6d97e uavcan: added add_poll_fd() helper function
this makes the code clearer and avoids repeated code
2014-11-26 08:41:32 +11:00