diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-02 21:57:01 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-02 21:57:01 +0400 |
| commit | 220011914c01ef4050ca487059b0d317e6b53fb7 (patch) | |
| tree | 6fa016ffe42a71a176d079908d38a5766be904fe /src/modules/mavlink/waypoints.c | |
| parent | 911c2bdeeeb624c111c680b228e49d27391af484 (diff) | |
| download | px4-firmware-220011914c01ef4050ca487059b0d317e6b53fb7.tar.gz px4-firmware-220011914c01ef4050ca487059b0d317e6b53fb7.tar.bz2 px4-firmware-220011914c01ef4050ca487059b0d317e6b53fb7.zip | |
navigator: AUTO_READY nav state added, RTL implemented properly
Diffstat (limited to 'src/modules/mavlink/waypoints.c')
| -rw-r--r-- | src/modules/mavlink/waypoints.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/waypoints.c b/src/modules/mavlink/waypoints.c index 1adfeafde..168666d4e 100644 --- a/src/modules/mavlink/waypoints.c +++ b/src/modules/mavlink/waypoints.c @@ -152,7 +152,7 @@ int map_mavlink_mission_item_to_mission_item(const mavlink_mission_item_t *mavli mission_item->loiter_direction = (mavlink_mission_item->param3 > 0) ? 1 : -1; /* 1 if positive CW, -1 if negative CCW */ mission_item->nav_cmd = mavlink_mission_item->command; - mission_item->time_inside = mavlink_mission_item->param1 / 1e3f; /* from milliseconds to seconds */ + mission_item->time_inside = mavlink_mission_item->param1; mission_item->autocontinue = mavlink_mission_item->autocontinue; // mission_item->index = mavlink_mission_item->seq; mission_item->origin = ORIGIN_MAVLINK; @@ -184,7 +184,7 @@ int map_mission_item_to_mavlink_mission_item(const struct mission_item_s *missio mavlink_mission_item->param4 = mission_item->yaw*M_RAD_TO_DEG_F; mavlink_mission_item->param3 = mission_item->loiter_radius*(float)mission_item->loiter_direction; mavlink_mission_item->command = mission_item->nav_cmd; - mavlink_mission_item->param1 = mission_item->time_inside * 1e3f; /* from seconds to milliseconds */ + mavlink_mission_item->param1 = mission_item->time_inside; mavlink_mission_item->autocontinue = mission_item->autocontinue; // mavlink_mission_item->seq = mission_item->index; |