From 71f207403e84607ec3668bc716d97fd64046c5a5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 4 Jun 2021 18:36:02 +1000 Subject: [PATCH] AP_Common: make angles in degrees end in _deg to make it obvious it is not radians --- libraries/AP_Common/Location.cpp | 14 +++++++------- libraries/AP_Common/Location.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/AP_Common/Location.cpp b/libraries/AP_Common/Location.cpp index 41b09f1fcc..bf7d5e702f 100644 --- a/libraries/AP_Common/Location.cpp +++ b/libraries/AP_Common/Location.cpp @@ -259,20 +259,20 @@ void Location::offset(float ofs_north, float ofs_east) * positions, so it keeps the accuracy even when dealing with small * distances and floating point numbers */ -void Location::offset_bearing(float bearing, float distance) +void Location::offset_bearing(float bearing_deg, float distance) { - const float ofs_north = cosf(radians(bearing)) * distance; - const float ofs_east = sinf(radians(bearing)) * distance; + const float ofs_north = cosf(radians(bearing_deg)) * distance; + const float ofs_east = sinf(radians(bearing_deg)) * distance; offset(ofs_north, ofs_east); } // extrapolate latitude/longitude given bearing, pitch and distance -void Location::offset_bearing_and_pitch(float bearing, float pitch, float distance) +void Location::offset_bearing_and_pitch(float bearing_deg, float pitch_deg, float distance) { - const float ofs_north = cosf(radians(pitch)) * cosf(radians(bearing)) * distance; - const float ofs_east = cosf(radians(pitch)) * sinf(radians(bearing)) * distance; + const float ofs_north = cosf(radians(pitch_deg)) * cosf(radians(bearing_deg)) * distance; + const float ofs_east = cosf(radians(pitch_deg)) * sinf(radians(bearing_deg)) * distance; offset(ofs_north, ofs_east); - const int32_t dalt = sinf(radians(pitch)) * distance *100.0f; + const int32_t dalt = sinf(radians(pitch_deg)) * distance *100.0f; alt += dalt; } diff --git a/libraries/AP_Common/Location.h b/libraries/AP_Common/Location.h index ba317d432f..00f947f460 100644 --- a/libraries/AP_Common/Location.h +++ b/libraries/AP_Common/Location.h @@ -72,10 +72,10 @@ public: void offset(float ofs_north, float ofs_east); // extrapolate latitude/longitude given bearing and distance - void offset_bearing(float bearing, float distance); + void offset_bearing(float bearing_deg, float distance); // extrapolate latitude/longitude given bearing, pitch and distance - void offset_bearing_and_pitch(float bearing, float pitch, float distance); + void offset_bearing_and_pitch(float bearing_deg, float pitch_deg, float distance); // longitude_scale - returns the scaler to compensate for // shrinking longitude as you move north or south from the equator