aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/roboclaw/RoboClaw.cpp
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-06-30 12:31:06 +0200
committerAnton Babushkin <anton.babushkin@me.com>2014-06-30 12:31:06 +0200
commit1a6b2b9c1ebd127a662051393d266e2815d09524 (patch)
treece18d2597a2e61d56247360b20ee8e05942fade3 /src/drivers/roboclaw/RoboClaw.cpp
parent72071cdcd39cae6be8533e67d01cbc7533ca6cb1 (diff)
parent857b843d445f59f2dc393e4d5f879fc56f77a0e0 (diff)
downloadpx4-firmware-1a6b2b9c1ebd127a662051393d266e2815d09524.tar.gz
px4-firmware-1a6b2b9c1ebd127a662051393d266e2815d09524.tar.bz2
px4-firmware-1a6b2b9c1ebd127a662051393d266e2815d09524.zip
Merge branch 'master' into dataman_state_nav_rewrite
Diffstat (limited to 'src/drivers/roboclaw/RoboClaw.cpp')
-rw-r--r--src/drivers/roboclaw/RoboClaw.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/drivers/roboclaw/RoboClaw.cpp b/src/drivers/roboclaw/RoboClaw.cpp
index dd5e4d3e0..fdaa7f27b 100644
--- a/src/drivers/roboclaw/RoboClaw.cpp
+++ b/src/drivers/roboclaw/RoboClaw.cpp
@@ -182,7 +182,10 @@ float RoboClaw::getMotorPosition(e_motor motor)
return _motor1Position;
} else if (motor == MOTOR_2) {
return _motor2Position;
- }
+ } else {
+ warnx("Unknown motor value passed to RoboClaw::getMotorPosition");
+ return NAN;
+ }
}
float RoboClaw::getMotorSpeed(e_motor motor)
@@ -191,7 +194,10 @@ float RoboClaw::getMotorSpeed(e_motor motor)
return _motor1Speed;
} else if (motor == MOTOR_2) {
return _motor2Speed;
- }
+ } else {
+ warnx("Unknown motor value passed to RoboClaw::getMotorPosition");
+ return NAN;
+ }
}
int RoboClaw::setMotorSpeed(e_motor motor, float value)