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

..

attitude_estimator_ekf

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

attitude_estimator_so3

Fix compiler warnings

2014-06-29 17:47:24 -07:00

bottle_drop

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

commander

Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge

2014-12-15 22:34:01 +01:00

controllib

Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge

2014-11-25 10:49:29 +01:00

dataman

dataman: less verbose, fix code style

2014-11-22 16:34:47 +01:00

ekf_att_pos_estimator

move px4_defines file

2014-12-02 16:17:17 +01:00

fixedwing_backside

ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL

2014-05-11 13:35:05 +02:00

fw_att_control

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

fw_pos_control_l1

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

gpio_led

Hotfix: Optimize shell commands for size - we do not need massive performance there

2014-08-13 10:33:46 +02:00

mavlink

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

mc_att_control

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

mc_pos_control

move vehicle_attitude_setpoint to msg format

2014-12-08 10:37:01 +01:00

navigator

made invalid setpoints publish once every time it enters an invalid state

2014-11-18 08:40:52 -05:00

position_estimator_inav

move px4_defines file

2014-12-02 16:17:17 +01:00

px4iofirmware

px4io: only check SAFETY_OFF for allowing RC config changes and reboot

2014-11-26 11:39:41 +11:00

sdlog2

renamed FWC to ATC1

2014-12-03 09:46:52 +01:00

segway

ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL

2014-05-11 13:35:05 +02:00

sensors

manual_control_setpoint as msg

2014-12-08 11:06:56 +01:00

systemlib

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

uavcan

Unsubscribe from the topic.

2014-12-03 10:43:17 +01:00

unit_test

Upgraded unit test framework

2014-09-13 19:59:44 -07:00

uORB

Merge remote-tracking branch 'upstream/master' into dev_ros

2014-12-18 12:11:05 +01:00

vtol_att_control

removed white space noise

2014-12-15 22:47:10 +01:00