Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'navigator_rewrite' into navigator_rewrite_estimator

Browse Source
This commit is contained in:
Julian Oes
2014-06-11 13:29:47 +02:00
parent 4247fc7585 cfcba921a1
commit 1625d7b0cd
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/rc.usb
+2
View File
@@ -17,6 +17,8 @@ mavlink stream -d /dev/ttyACM0 -s ATTITUDE_CONTROLS -r 30
usleep 100000 usleep 100000
mavlink stream -d /dev/ttyACM0 -s SERVO_OUTPUT_RAW_0 -r 20 mavlink stream -d /dev/ttyACM0 -s SERVO_OUTPUT_RAW_0 -r 20
usleep 100000 usleep 100000
mavlink stream -d /dev/ttyACM0 -s GLOBAL_POSITION_SETPOINT_INT -r 20
usleep 100000
# Exit shell to make it available to MAVLink # Exit shell to make it available to MAVLink
exit exit
src/modules/mavlink/mavlink_messages.cpp
+8 -8
View File
@@ -959,14 +959,14 @@ protected:
void send(const hrt_abstime t) void send(const hrt_abstime t)
{ {
if (pos_sp_triplet_sub->update(t)) { /* always send this message, even if it has not been updated */
mavlink_msg_global_position_setpoint_int_send(_channel, pos_sp_triplet_sub->update(t);
MAV_FRAME_GLOBAL, mavlink_msg_global_position_setpoint_int_send(_channel,
(int32_t)(pos_sp_triplet->current.lat * 1e7), MAV_FRAME_GLOBAL,
(int32_t)(pos_sp_triplet->current.lon * 1e7), (int32_t)(pos_sp_triplet->current.lat * 1e7),
(int32_t)(pos_sp_triplet->current.alt * 1000), (int32_t)(pos_sp_triplet->current.lon * 1e7),
(int16_t)(pos_sp_triplet->current.yaw * M_RAD_TO_DEG_F * 100.0f)); (int32_t)(pos_sp_triplet->current.alt * 1000),
} (int16_t)(pos_sp_triplet->current.yaw * M_RAD_TO_DEG_F * 100.0f));
} }
}; };