Ran Astyle

This commit is contained in:
David Sidrane
2015-11-28 09:13:15 +01:00
committed by Lorenz Meier
parent f3b7585a89
commit 30bc968ed6
2 changed files with 6 additions and 0 deletions
+4
View File
@@ -232,11 +232,14 @@ void start(const bool use_i2c, const int bus)
fail: fail:
#ifdef PX4_I2C_BUS_ONBOARD #ifdef PX4_I2C_BUS_ONBOARD
if (g_dev_int != nullptr && (bus == -1 || bus == PX4_I2C_BUS_ONBOARD)) { if (g_dev_int != nullptr && (bus == -1 || bus == PX4_I2C_BUS_ONBOARD)) {
delete g_dev_int; delete g_dev_int;
g_dev_int = nullptr; g_dev_int = nullptr;
} }
#endif #endif
if (g_dev_ext != nullptr && (bus == -1 || bus == PX4_I2C_BUS_EXPANSION)) { if (g_dev_ext != nullptr && (bus == -1 || bus == PX4_I2C_BUS_EXPANSION)) {
delete g_dev_ext; delete g_dev_ext;
g_dev_ext = nullptr; g_dev_ext = nullptr;
@@ -261,6 +264,7 @@ void stop(const bool use_i2c, const int bus)
delete g_dev_ext; delete g_dev_ext;
g_dev_ext = nullptr; g_dev_ext = nullptr;
} }
} else { } else {
if (g_dev_int != nullptr) { if (g_dev_int != nullptr) {
delete g_dev_int; delete g_dev_int;
+2
View File
@@ -208,12 +208,14 @@ void gpio_led_start(FAR void *arg)
char *gpio_dev; char *gpio_dev;
#if defined(PX4IO_DEVICE_PATH) #if defined(PX4IO_DEVICE_PATH)
if (priv->use_io) { if (priv->use_io) {
gpio_dev = PX4IO_DEVICE_PATH; gpio_dev = PX4IO_DEVICE_PATH;
} else { } else {
gpio_dev = PX4FMU_DEVICE_PATH; gpio_dev = PX4FMU_DEVICE_PATH;
} }
#else #else
gpio_dev = PX4FMU_DEVICE_PATH; gpio_dev = PX4FMU_DEVICE_PATH;
#endif #endif