7.31 PX4#1

13rianK · Jul 31, 2015 · 97c31bd · 97c31bd
1 parent bb05397
commit 97c31bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Pixhawk.creator.user b/Pixhawk.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.4.0, 2015-07-30T15:40:32. -->
+<!-- Written by QtCreator 3.4.0, 2015-07-30T22:39:23. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp
@@ -89,7 +89,7 @@ __END_DECLS
 
 static const float mg2ms2 = CONSTANTS_ONE_G / 1000.0f;
 extern bool isInAdcMode;
-static int mavlink_fd=0;
+//static int mavlink_fd=0;
 
 MavlinkReceiver::MavlinkReceiver(Mavlink *parent) :
 	_mavlink(parent),
@@ -966,7 +966,7 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg)
 	mavlink_manual_control_t man;
 	mavlink_msg_manual_control_decode(msg, &man);
 
-    mavlink_fd = open(MAVLINK_LOG_DEVICE, 0);
+    //mavlink_fd = open(MAVLINK_LOG_DEVICE, 0);
 
 	// Check target
 	if (man.target != 0 && man.target != _mavlink->get_system_id()) {
@@ -1044,8 +1044,9 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg)
 		manual.acro_switch = decode_switch_pos(man.buttons, 4);
         manual.offboard_switch = decode_switch_pos(man.buttons, 5);
 
-        mavlink_log_info(mavlink_fd,"command values: x: %.2f y: %.2f z: %.2f r: %.2f  mode_switch: %d "\
-                                    " return_switch: %d  pos_switch: %d  loiter_switch: %d acro_switch: %d  off_switch: %d");
+     //   mavlink_log_info(mavlink_fd,"command values: x: %d y: %d z: %d r: %d  mode_switch: %d "
+       //                             " return_switch: %d  pos_switch: %d  loiter_switch: %d acro_switch: %d  off_switch: %d",man.x,man.y,man.z,man.r,
+         //                manual.mode_switch,manual.return_switch,manual.posctl_switch,manual.loiter_switch,manual.acro_switch,manual.offboard_switch);
 
         //if(!isInAdcMode){
             if (_manual_pub < 0) {