aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* move vehicle_attitude_setpoint to msg formatThomas Gubler2014-12-0811-64/+66
* add mc att to cmakelistThomas Gubler2014-12-081-0/+10
* set NuttX submoduleThomas Gubler2014-12-061-0/+0
* Merge branch 'dev_ros' into dev_ros_rossharedlibThomas Gubler2014-12-063-1/+2
|\
| * solve conflict for definiton of FILEThomas Gubler2014-12-063-1/+2
* | Merge branch 'ROS_shared_lib_base_class' into dev_ros_rossharedlibThomas Gubler2014-12-050-0/+0
|\ \
| * | fix base and sim file descriptionsThomas Gubler2014-12-054-3/+11
* | | fix base and sim file descriptionsThomas Gubler2014-12-054-3/+11
* | | Merge branch 'ROS_shared_lib_base_class' into dev_ros_rossharedlibThomas Gubler2014-12-0536-2676/+2606
|\| |
| * | Merge remote-tracking branch 'upstream/master' into ROS_shared_lib_base_classThomas Gubler2014-12-05181-3582/+5770
| |\ \
| | * \ Merge pull request #1482 from sjwilks/uavcan_debugLorenz Meier2014-12-031-0/+24
| | |\ \
| | | * | Unsubscribe from the topic.Simon Wilks2014-12-031-0/+2
| | | * | Display ESC data in the status outputSimon Wilks2014-12-031-0/+22
| | |/ /
| | * | Merge master into attitude EKF updateLorenz Meier2014-12-02293-3006/+14696
| | |\ \
| | | * \ Merge pull request #1475 from hsteinhaus/gps_timeLorenz Meier2014-12-021-1/+1
| | | |\ \
| | | | * | Corrected time_gps_usec values description.Holger Steinhaus2014-11-281-1/+1
| | * | | | update attitude estimator ekf to latest versionThomas Gubler2014-08-217-393/+287
| | * | | | Merge remote-tracking branch 'upstream/master' into attitudeekfThomas Gubler2014-08-2119-94/+908
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into attitudeekfThomas Gubler2014-08-1425-83/+764
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into attitudeekfThomas Gubler2014-08-1170-1819/+2820
| | |\ \ \ \ \ \
| | * | | | | | | att ekf: add descriptions for paramsThomas Gubler2014-07-251-9/+45
| | * | | | | | | att ekf: add param to enable/disable JThomas Gubler2014-07-253-5/+18
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into attitudeekfThomas Gubler2014-07-255-3/+6
| | |\ \ \ \ \ \ \
| | * | | | | | | | update attitude_estimator_ekf, includes matlabThomas Gubler2014-07-2534-2669/+2632
| * | | | | | | | | whitespaceThomas Gubler2014-12-054-8/+8
| * | | | | | | | | mc att: more cleanup between base and main classThomas Gubler2014-12-053-12/+20
| * | | | | | | | | re-add hardcoded parameters for eurocThomas Gubler2014-12-051-0/+29
| * | | | | | | | | mc att control: ran fix code style scriptThomas Gubler2014-12-055-53/+71
| * | | | | | | | | mc att control: make the main app use the base class, move euroc functions in...Thomas Gubler2014-12-056-401/+241
* | | | | | | | | | whitespaceThomas Gubler2014-12-054-8/+8
* | | | | | | | | | mc att: more cleanup between base and main classThomas Gubler2014-12-053-12/+20
* | | | | | | | | | re-add hardcoded parameters for eurocThomas Gubler2014-12-051-0/+29
* | | | | | | | | | mc att control: ran fix code style scriptThomas Gubler2014-12-055-53/+71
* | | | | | | | | | mc att control: make the main app use the base class, move euroc functions in...Thomas Gubler2014-12-056-401/+241
* | | | | | | | | | Merge branch 'dev_ros' into dev_ros_rossharedlibThomas Gubler2014-12-044-2/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | add genmsg and gencpp python modules, ros not required anymore for message ge...Thomas Gubler2014-12-044-2/+11
* | | | | | | | | | Merge branch 'dev_ros' into dev_ros_rossharedlibThomas Gubler2014-12-0414-100/+483
|\| | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/ros' into dev_rosThomas Gubler2014-12-040-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rosThomas Gubler2014-12-0435-357/+1737
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| * | | | | | | | | | platform headers: fix code styleThomas Gubler2014-12-044-30/+45
| * | | | | | | | | | more documentation commentsThomas Gubler2014-12-043-7/+66
| * | | | | | | | | | nodehandle: add documentation commentsThomas Gubler2014-12-041-8/+44
| * | | | | | | | | | comments for px4 definesThomas Gubler2014-12-041-11/+42
| * | | | | | | | | | uorb topic header generator: only create new files if the file content really...Thomas Gubler2014-12-042-36/+90
| * | | | | | | | | | better support for param default values on ros and px4Thomas Gubler2014-12-043-5/+7
| * | | | | | | | | | make param wrapper macros compatible for px4 and ros, needs cleanupThomas Gubler2014-12-035-12/+70
| * | | | | | | | | | bring up param wrapper for px4, moved global include fileThomas Gubler2014-12-036-24/+123
| * | | | | | | | | | improve param wrapper for ros, prepare for px4Thomas Gubler2014-12-034-6/+25
| * | | | | | | | | | add parameter wrapper macros for rosThomas Gubler2014-12-032-0/+10
| * | | | | | | | | | update commentsThomas Gubler2014-12-031-3/+3