fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-27 07:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Mark Charlebois
2015-04-28 11:48:26 -07:00
parent c832f4c55c 2a46e0f0b6
commit 190814bc97
47 changed files with 935 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/rgbled/rgbled.cpp
+2 -2
View File
@@ -638,7 +638,7 @@ rgbled_main(int argc, char *argv[])
if (g_rgbled == nullptr) {
// fall back to default bus
if (PX4_I2C_BUS_LED == PX4_I2C_BUS_EXPANSION) {
warnx("init failed");
warnx("no RGB led on bus #%d", i2cdevice);
return 1;
}
i2cdevice = PX4_I2C_BUS_LED;
@@ -656,7 +656,7 @@ rgbled_main(int argc, char *argv[])
if (OK != g_rgbled->init()) {
delete g_rgbled;
g_rgbled = nullptr;
warnx("init failed");
warnx("no RGB led on bus #%d", i2cdevice);
return 1;
}
}