aboutsummaryrefslogtreecommitdiff
path: root/src/systemcmds/motor_test
diff options
context:
space:
mode:
authorHolger Steinhaus <holger@steinhaus-home.de>2014-11-03 19:37:44 +0100
committerHolger Steinhaus <holger@steinhaus-home.de>2014-11-03 19:37:44 +0100
commita18460183cdfa590af29c2299acb30206b418cb1 (patch)
treeb3b5594e1c8c84c15ea6aaac55b6ee10c820e2fc /src/systemcmds/motor_test
parentf8ba5f8dae146529e3ff28f4330cdc4daaa6f260 (diff)
downloadpx4-firmware-a18460183cdfa590af29c2299acb30206b418cb1.tar.gz
px4-firmware-a18460183cdfa590af29c2299acb30206b418cb1.tar.bz2
px4-firmware-a18460183cdfa590af29c2299acb30206b418cb1.zip
motor_test: cleanup
Diffstat (limited to 'src/systemcmds/motor_test')
-rw-r--r--src/systemcmds/motor_test/motor_test.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/systemcmds/motor_test/motor_test.c b/src/systemcmds/motor_test/motor_test.c
index 079f99674..a73f46626 100644
--- a/src/systemcmds/motor_test/motor_test.c
+++ b/src/systemcmds/motor_test/motor_test.c
@@ -54,7 +54,8 @@
#include "systemlib/err.h"
-__EXPORT int motor_test_main(int argc, char *argv[]);
+__EXPORT int motor_test_main(int argc, char *argv[]);
+
static void motor_test(unsigned channel, float value);
static void usage(const char *reason);
@@ -67,13 +68,13 @@ void motor_test(unsigned channel, float value)
_test_motor.timestamp = hrt_absolute_time();
_test_motor.value = value;
- if (_test_motor_pub > 0) {
- /* publish armed state */
- orb_publish(ORB_ID(test_motor), _test_motor_pub, &_test_motor);
- } else {
- /* advertise and publish */
- _test_motor_pub = orb_advertise(ORB_ID(test_motor), &_test_motor);
- }
+ if (_test_motor_pub > 0) {
+ /* publish test state */
+ orb_publish(ORB_ID(test_motor), _test_motor_pub, &_test_motor);
+ } else {
+ /* advertise and publish */
+ _test_motor_pub = orb_advertise(ORB_ID(test_motor), &_test_motor);
+ }
}
static void usage(const char *reason)
@@ -102,18 +103,18 @@ int motor_test_main(int argc, char *argv[])
switch (ch) {
case 'm':
- /* Read in channels supplied as one int and convert to mask: 1234 -> 0xF */
+ /* Read in motor number */
channel = strtoul(optarg, NULL, 0);
break;
case 'p':
- /* Read in custom low value */
+ /* Read in power value */
lval = strtoul(optarg, NULL, 0);
if (lval > 100)
usage("value invalid");
- value = (float)lval/100.f;
+ value = ((float)lval)/100.f;
break;
default:
usage(NULL);