aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/ros/nodes/manual_input/manual_input.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-08 08:15:44 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-08 08:15:44 +0100
commitc118d17cb576b76df3bc1b765fb38c34421c7be4 (patch)
tree5f4dd4b604207f186dfcd16fc5bc923820a7985e /src/platforms/ros/nodes/manual_input/manual_input.cpp
parent34b023d0a62bef93feb0ce3131e677f7c8546b45 (diff)
downloadpx4-firmware-c118d17cb576b76df3bc1b765fb38c34421c7be4.tar.gz
px4-firmware-c118d17cb576b76df3bc1b765fb38c34421c7be4.tar.bz2
px4-firmware-c118d17cb576b76df3bc1b765fb38c34421c7be4.zip
fix code style in src/platforms
Diffstat (limited to 'src/platforms/ros/nodes/manual_input/manual_input.cpp')
-rw-r--r--src/platforms/ros/nodes/manual_input/manual_input.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/platforms/ros/nodes/manual_input/manual_input.cpp b/src/platforms/ros/nodes/manual_input/manual_input.cpp
index 475d0c4d2..688df50e0 100644
--- a/src/platforms/ros/nodes/manual_input/manual_input.cpp
+++ b/src/platforms/ros/nodes/manual_input/manual_input.cpp
@@ -72,7 +72,7 @@ ManualInput::ManualInput() :
}
-void ManualInput::JoyCallback(const sensor_msgs::JoyConstPtr& msg)
+void ManualInput::JoyCallback(const sensor_msgs::JoyConstPtr &msg)
{
px4::manual_control_setpoint msg_out;
@@ -99,10 +99,11 @@ void ManualInput::JoyCallback(const sensor_msgs::JoyConstPtr& msg)
_man_ctrl_sp_pub.publish(msg_out);
}
-void ManualInput::MapAxis(const sensor_msgs::JoyConstPtr& msg, int map_index, double scale, double offset,
- double deadzone, float &out)
+void ManualInput::MapAxis(const sensor_msgs::JoyConstPtr &msg, int map_index, double scale, double offset,
+ double deadzone, float &out)
{
double val = msg->axes[map_index];
+
if (val + offset > deadzone || val + offset < -deadzone) {
out = (float)((val + offset)) * scale;
}
@@ -110,8 +111,8 @@ void ManualInput::MapAxis(const sensor_msgs::JoyConstPtr& msg, int map_index, do
int main(int argc, char **argv)
{
- ros::init(argc, argv, "manual_input");
- ManualInput m;
- ros::spin();
- return 0;
+ ros::init(argc, argv, "manual_input");
+ ManualInput m;
+ ros::spin();
+ return 0;
}