aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/ros/nodes/commander/commander.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/commander/commander.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/commander/commander.cpp')
-rw-r--r--src/platforms/ros/nodes/commander/commander.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/platforms/ros/nodes/commander/commander.cpp b/src/platforms/ros/nodes/commander/commander.cpp
index d8ff739b9..b9fc296f9 100644
--- a/src/platforms/ros/nodes/commander/commander.cpp
+++ b/src/platforms/ros/nodes/commander/commander.cpp
@@ -57,7 +57,7 @@ Commander::Commander() :
{
}
-void Commander::ManualControlInputCallback(const px4::manual_control_setpointConstPtr& msg)
+void Commander::ManualControlInputCallback(const px4::manual_control_setpointConstPtr &msg)
{
px4::vehicle_control_mode msg_vehicle_control_mode;
px4::vehicle_status msg_vehicle_status;
@@ -72,14 +72,16 @@ void Commander::ManualControlInputCallback(const px4::manual_control_setpointCon
/* fill actuator armed */
float arm_th = 0.95;
_msg_actuator_armed.timestamp = px4::get_time_micros();
+
if (_msg_actuator_armed.armed) {
/* Check for disarm */
- if (msg->r < -arm_th && msg->z < (1-arm_th)) {
+ if (msg->r < -arm_th && msg->z < (1 - arm_th)) {
_msg_actuator_armed.armed = false;
}
+
} else {
/* Check for arm */
- if (msg->r > arm_th && msg->z < (1-arm_th)) {
+ if (msg->r > arm_th && msg->z < (1 - arm_th)) {
_msg_actuator_armed.armed = true;
}
}
@@ -107,8 +109,8 @@ void Commander::ManualControlInputCallback(const px4::manual_control_setpointCon
int main(int argc, char **argv)
{
- ros::init(argc, argv, "commander");
- Commander m;
- ros::spin();
- return 0;
+ ros::init(argc, argv, "commander");
+ Commander m;
+ ros::spin();
+ return 0;
}