Mark Charlebois 190814bc97 Merge remote-tracking branch 'upstream/master' into linux ...

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/drivers/rgbled/rgbled.cpp
	src/modules/commander/PreflightCheck.cpp
	src/modules/commander/airspeed_calibration.cpp
	src/modules/commander/calibration_routines.cpp
	src/modules/commander/gyro_calibration.cpp
	src/modules/commander/mag_calibration.cpp
	src/modules/mc_att_control/mc_att_control_main.cpp

2015-04-28 11:48:26 -07:00

..

i2c_frame.h

Simplified i2c handling for flow.

2015-01-24 14:25:58 -05:00

module.mk

turn on -Werror and fix resulting errors

2014-12-22 17:56:59 -05:00

px4flow.cpp

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

2015-04-28 11:48:26 -07:00