aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDon Gagne <don@thegagnes.com>2014-06-29 13:55:55 -0700
committerDon Gagne <don@thegagnes.com>2014-06-29 13:55:55 -0700
commit2448e2adbc22af348aa799473c30ac5f1cba9cd0 (patch)
treee001f762e1a39e7fe63e1000686d79ff1718043b /src
parent33c20e15a2246e9249bbb8183758604fdc231183 (diff)
downloadpx4-firmware-2448e2adbc22af348aa799473c30ac5f1cba9cd0.tar.gz
px4-firmware-2448e2adbc22af348aa799473c30ac5f1cba9cd0.tar.bz2
px4-firmware-2448e2adbc22af348aa799473c30ac5f1cba9cd0.zip
More tab fixes
Diffstat (limited to 'src')
-rw-r--r--src/drivers/roboclaw/RoboClaw.cpp8
-rw-r--r--src/modules/commander/commander.cpp2
-rw-r--r--src/modules/gpio_led/gpio_led.c4
-rw-r--r--src/systemcmds/mtd/mtd.c12
-rw-r--r--src/systemcmds/tests/test_mixer.cpp2
5 files changed, 14 insertions, 14 deletions
diff --git a/src/drivers/roboclaw/RoboClaw.cpp b/src/drivers/roboclaw/RoboClaw.cpp
index b0a8527c2..fdaa7f27b 100644
--- a/src/drivers/roboclaw/RoboClaw.cpp
+++ b/src/drivers/roboclaw/RoboClaw.cpp
@@ -183,8 +183,8 @@ float RoboClaw::getMotorPosition(e_motor motor)
} else if (motor == MOTOR_2) {
return _motor2Position;
} else {
- warnx("Unknown motor value passed to RoboClaw::getMotorPosition");
- return NAN;
+ warnx("Unknown motor value passed to RoboClaw::getMotorPosition");
+ return NAN;
}
}
@@ -195,8 +195,8 @@ float RoboClaw::getMotorSpeed(e_motor motor)
} else if (motor == MOTOR_2) {
return _motor2Speed;
} else {
- warnx("Unknown motor value passed to RoboClaw::getMotorPosition");
- return NAN;
+ warnx("Unknown motor value passed to RoboClaw::getMotorPosition");
+ return NAN;
}
}
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 3cd250458..aa243d79b 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -603,7 +603,7 @@ bool handle_command(struct vehicle_status_s *status, const struct safety_s *safe
// XXX TODO
}
- return true;
+ return true;
}
int commander_thread_main(int argc, char *argv[])
diff --git a/src/modules/gpio_led/gpio_led.c b/src/modules/gpio_led/gpio_led.c
index def958c95..7758faed7 100644
--- a/src/modules/gpio_led/gpio_led.c
+++ b/src/modules/gpio_led/gpio_led.c
@@ -181,13 +181,13 @@ int gpio_led_main(int argc, char *argv[])
} else {
gpio_led_started = true;
warnx("start, using pin: %s", pin_name);
- exit(0);
+ exit(0);
}
} else if (!strcmp(argv[1], "stop")) {
if (gpio_led_started) {
gpio_led_started = false;
warnx("stop");
- exit(0);
+ exit(0);
} else {
errx(1, "not running");
}
diff --git a/src/systemcmds/mtd/mtd.c b/src/systemcmds/mtd/mtd.c
index 8b43e54da..fcc9b8366 100644
--- a/src/systemcmds/mtd/mtd.c
+++ b/src/systemcmds/mtd/mtd.c
@@ -193,12 +193,12 @@ ramtron_attach(void)
errx(1, "failed to initialize mtd driver");
int ret = mtd_dev->ioctl(mtd_dev, MTDIOC_SETSPEED, (unsigned long)10*1000*1000);
- if (ret != OK) {
- // FIXME: From the previous warnx call, it looked like this should have been an errx instead. Tried
- // that but setting the bug speed does fail all the time. Which was then exiting and the board would
- // not run correctly. So changed to warnx.
- warnx("failed to set bus speed");
- }
+ if (ret != OK) {
+ // FIXME: From the previous warnx call, it looked like this should have been an errx instead. Tried
+ // that but setting the bug speed does fail all the time. Which was then exiting and the board would
+ // not run correctly. So changed to warnx.
+ warnx("failed to set bus speed");
+ }
attached = true;
}
diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp
index dc2c20e79..0b826b826 100644
--- a/src/systemcmds/tests/test_mixer.cpp
+++ b/src/systemcmds/tests/test_mixer.cpp
@@ -372,7 +372,7 @@ int test_mixer(int argc, char *argv[])
}
warnx("SUCCESS: No errors in mixer test");
- return 0;
+ return 0;
}
static int