From 032a3a783d9108e2651cd5c30059cd259228fe77 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 28 May 2025 13:29:48 +1000 Subject: [PATCH] AntennaTracker: replace ToRad with radians and ToDeg with degrees --- AntennaTracker/GCS_MAVLink_Tracker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AntennaTracker/GCS_MAVLink_Tracker.cpp b/AntennaTracker/GCS_MAVLink_Tracker.cpp index 3dad14de3f4..2d2a9ae9c71 100644 --- a/AntennaTracker/GCS_MAVLink_Tracker.cpp +++ b/AntennaTracker/GCS_MAVLink_Tracker.cpp @@ -371,8 +371,8 @@ void GCS_MAVLINK_Tracker::handle_message_mission_item(const mavlink_message_t &m case MAV_FRAME_LOCAL_NED: // local (relative to home position) { tell_command = Location{ - int32_t(1.0e7f*ToDeg(packet.x/(RADIUS_OF_EARTH*cosf(ToRad(home.lat/1.0e7f)))) + home.lat), - int32_t(1.0e7f*ToDeg(packet.y/RADIUS_OF_EARTH) + home.lng), + int32_t(1.0e7f*degrees(packet.x/(RADIUS_OF_EARTH*cosf(radians(home.lat/1.0e7f)))) + home.lat), + int32_t(1.0e7f*degrees(packet.y/RADIUS_OF_EARTH) + home.lng), int32_t(-packet.z*1.0e2f), Location::AltFrame::ABOVE_HOME }; @@ -384,8 +384,8 @@ void GCS_MAVLINK_Tracker::handle_message_mission_item(const mavlink_message_t &m case MAV_FRAME_LOCAL: // local (relative to home position) { tell_command = { - int32_t(1.0e7f*ToDeg(packet.x/(RADIUS_OF_EARTH*cosf(ToRad(home.lat/1.0e7f)))) + home.lat), - int32_t(1.0e7f*ToDeg(packet.y/RADIUS_OF_EARTH) + home.lng), + int32_t(1.0e7f*degrees(packet.x/(RADIUS_OF_EARTH*cosf(radians(home.lat/1.0e7f)))) + home.lat), + int32_t(1.0e7f*degrees(packet.y/RADIUS_OF_EARTH) + home.lng), int32_t(packet.z*1.0e2f), Location::AltFrame::ABOVE_HOME };