Merge remote-tracking branch 'px4/master' into pwm_ioctls

Conflicts:
	src/drivers/px4io/px4io.cpp
This commit is contained in:
Julian Oes
2013-10-19 11:39:31 +02:00
57 changed files with 1914 additions and 864 deletions
@@ -61,7 +61,6 @@
*/
struct vehicle_control_mode_s
{
uint16_t counter; /**< incremented by the writing thread every time new data is stored */
uint64_t timestamp; /**< in microseconds since system start, is set whenever the writing thread stores new data */
bool flag_armed;