Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2015-02-01 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | ros_messagelayer_merge2_attctrl_posctrl Conflicts: src/drivers/px4fmu/fmu.cpp | ||||
| * | Move FW att control to multi pub sub API | Lorenz Meier | 2015-01-29 | 1 | -2/+2 |
| | | |||||
* | | missing headers for fmu2 target | Thomas Gubler | 2015-01-25 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into ros | Thomas Gubler | 2015-01-15 | 1 | -0/+2 |
|\| | | | | | | | | | Conflicts: src/platforms/px4_middleware.h | ||||
| * | Latency measurements: Estimate latency based on sensor timestamp through ↵ | Lorenz Meier | 2015-01-11 | 1 | -0/+2 |
| | | | | | | | | full system | ||||
* | | remove fw_att_control base classes: as long as they are not integrated into ↵ | Thomas Gubler | 2015-01-08 | 2 | -476/+0 |
| | | | | | | | | fw_att_control_main they are useless | ||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2015-01-07 | 1 | -17/+30 |
|\| | | | | | | | | | Conflicts: Makefile | ||||
| * | fw att control: cleanup, create base class for ECL | Thomas Gubler | 2015-01-06 | 1 | -17/+30 |
| | | | | | | | | | | Adding a new base class to remove a lot of boilerplate code, no functionality changes | ||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2015-01-05 | 2 | -15/+27 |
|\| | | | | | | | | | | | | | | | 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 | ||||
| * | FW attitude control: Build with space optimization | Lorenz Meier | 2015-01-04 | 1 | -0/+2 |
| | | |||||
| * | Merged master | Lorenz Meier | 2014-12-30 | 1 | -15/+25 |
| |\ | |||||
| | * | fw att: fix comment style | Thomas Gubler | 2014-12-29 | 1 | -9/+13 |
| | | | |||||
| | * | add yaw_manual override variable, effective only in ALTCTL and do not ↵ | Mark Whitehorn | 2014-12-29 | 1 | -0/+5 |
| | | | | | | | | | | | | publish it in attitude rates | ||||
* | | | Merge remote-tracking branch 'upstream/isvtol' into dev_ros | Thomas Gubler | 2014-12-25 | 1 | -21/+16 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_status.h | ||||
| * | | fw att ctl: remove autostart id param | Thomas Gubler | 2014-12-22 | 1 | -7/+0 |
| | | | |||||
| * | | is_vtol flag in vehicle_status | Thomas Gubler | 2014-12-18 | 1 | -15/+17 |
| |/ | | | | | | | | | Getting rid of the autostart based checks if the system is a vtol Fixes #1503 | ||||
* | | fix small compile error after merge | Thomas Gubler | 2014-12-19 | 1 | -10/+10 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-18 | 1 | -41/+112 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge | tumbili | 2014-12-15 | 1 | -2/+20 |
| |\ | |||||
| * | | removed whitespaces removed small unused code block | Roman Bapst | 2014-12-04 | 1 | -2/+1 |
| | | | |||||
| * | | use uORB ID to determine the correct rate_sp- and actuator topic to publish on | tumbili | 2014-12-03 | 1 | -27/+21 |
| | | | |||||
| * | | adapted attitude controllers to support VTOL | Roman Bapst | 2014-12-02 | 1 | -41/+119 |
| | | | |||||
* | | | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt | Thomas Gubler | 2014-12-16 | 1 | -2/+20 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk | ||||
| * | | fixed somereview comments | Friedemann Ludwig | 2014-11-30 | 1 | -2/+1 |
| | | | |||||
| * | | Implemented altitude and velocity hold mode | Friedemann Ludwig | 2014-11-28 | 1 | -2/+21 |
| |/ | |||||
* | | move vehicle_attitude_setpoint to msg format | Thomas Gubler | 2014-12-08 | 1 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into ↵ | Thomas Gubler | 2014-12-02 | 2 | -0/+477 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | dev_ros_rossharedlib Conflicts: src/modules/uORB/topics/vehicle_attitude.h src/platforms/px4_defines.h | ||||
| * | | added setter and getter functions for use with euroc-gazebo simulator | Roman Bapst | 2014-11-12 | 2 | -0/+63 |
| | | | |||||
| * | | pixhawk specific files | Roman Bapst | 2014-11-11 | 2 | -3/+0 |
| | | | |||||
| * | | checked out from PX4 master to avoid eclipse formatting which happened in ↵ | Roman Bapst | 2014-11-11 | 1 | -211/+203 |
| | | | | | | | | | | | | the past | ||||
| * | | pulled from PX4 master | Roman Bapst | 2014-11-10 | 1 | -5/+15 |
| |\| | |||||
| * | | cleaned up | Roman Bapst | 2014-11-10 | 2 | -23/+75 |
| | | | |||||
| * | | Adapted for shared library use with ROS | Roman Bapst | 2014-09-27 | 1 | -205/+214 |
| | | | |||||
| * | | Added control_attitude function | Roman Bapst | 2014-09-25 | 1 | -0/+2 |
| | | | |||||
| * | | Added control_attitude function and cleaned up | Roman Bapst | 2014-09-25 | 1 | -17/+206 |
| | | | |||||
| * | | Added base class for fixed wing attitude controller -> still working on it | Roman Bapst | 2014-09-24 | 2 | -0/+174 |
| | | | |||||
* | | | move px4_defines file | Thomas Gubler | 2014-12-02 | 1 | -1/+1 |
| | | | |||||
* | | | make default apps compatible with autogenerated attitude and rc_channels message | Thomas Gubler | 2014-12-02 | 1 | -3/+4 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'upstream/master' into HEAD | Thomas Gubler | 2014-09-28 | 1 | -0/+33 |
|\| | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/navigator/geofence.cpp src/modules/navigator/mission.cpp | ||||
| * | FW: in seatbelt/althold on ground reset integrators | Thomas Gubler | 2014-09-06 | 1 | -0/+33 |
| | | |||||
* | | gps failure has priority over engine falure, in case both fail make sure | Thomas Gubler | 2014-09-22 | 1 | -2/+6 |
| | | | | | | | | that the gps failure mode does not turn on the engine | ||||
* | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-08-25 | 1 | -8/+11 |
|\| | |||||
| * | Deal with zero airspeed measurements | Lorenz Meier | 2014-08-24 | 1 | -8/+11 |
| | | |||||
* | | fw att control: use RC only if in manual | Thomas Gubler | 2014-08-22 | 1 | -1/+8 |
|/ | |||||
* | Merged master | Lorenz Meier | 2014-07-15 | 2 | -6/+35 |
|\ | |||||
| * | fw att ctrl: Only return from start handler with all allocations done | Lorenz Meier | 2014-07-14 | 1 | -4/+24 |
| | | |||||
| * | Fix up RAM usage of fixed wing apps | Lorenz Meier | 2014-07-12 | 1 | -0/+2 |
| | | |||||
| * | fw att control: reset integrators when requested via attitude setpoint topic | Thomas Gubler | 2014-06-24 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'master' of github.com:PX4/Firmware into logging | Lorenz Meier | 2014-06-11 | 1 | -97/+270 |
|\| | |||||
| * | Converted style to work with wiki. Cleaned up bad fields. | Andrew Chambers | 2014-06-09 | 1 | -97/+270 |
| | |