diff options
author | Julian Oes <julian@oes.ch> | 2014-05-13 09:40:56 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-05-13 09:40:56 +0200 |
commit | 634157210c6181f02bebfa3f43c64cf40694ab2a (patch) | |
tree | 15c234a3c0fd0ec8d5797b43a2f0f45a538fad27 /src/modules/mavlink | |
parent | 80ecaf7946d39abe44dd3b45590e2c73004b4fda (diff) | |
parent | 8f6cd3a3ae58e1c1190dc8adb5169871b99ce5e9 (diff) | |
download | px4-firmware-634157210c6181f02bebfa3f43c64cf40694ab2a.tar.gz px4-firmware-634157210c6181f02bebfa3f43c64cf40694ab2a.tar.bz2 px4-firmware-634157210c6181f02bebfa3f43c64cf40694ab2a.zip |
Merge pull request #922 from PX4/manualcontrolrename
Rename variables for manual control setpoint
Diffstat (limited to 'src/modules/mavlink')
-rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 8 | ||||
-rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index b8879157e..79dd88657 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -1138,10 +1138,10 @@ protected: if (manual_sub->update(t)) { mavlink_msg_manual_control_send(_channel, mavlink_system.sysid, - manual->roll * 1000, - manual->pitch * 1000, - manual->yaw * 1000, - manual->throttle * 1000, + manual->x * 1000, + manual->y * 1000, + manual->z * 1000, + manual->r * 1000, 0); } } diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 64fc41838..b03a68c07 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -191,7 +191,7 @@ MavlinkReceiver::handle_message(mavlink_message_t *msg) } } - + /* If we've received a valid message, mark the flag indicating so. This is used in the '-w' command-line flag. */ _mavlink->set_has_received_messages(true); @@ -438,10 +438,10 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg) memset(&manual, 0, sizeof(manual)); manual.timestamp = hrt_absolute_time(); - manual.pitch = man.x / 1000.0f; - manual.roll = man.y / 1000.0f; - manual.yaw = man.r / 1000.0f; - manual.throttle = man.z / 1000.0f; + manual.x = man.x / 1000.0f; + manual.y = man.y / 1000.0f; + manual.r = man.r / 1000.0f; + manual.z = man.z / 1000.0f; if (_manual_pub < 0) { _manual_pub = orb_advertise(ORB_ID(manual_control_setpoint), &manual); |