From 5010298e5d9c5ae3a49007eac9532e7f68535e5d Mon Sep 17 00:00:00 2001 From: jbinz Date: Thu, 19 Jun 2025 19:32:27 +0200 Subject: [PATCH 1/3] Absolute bearing. --- ground_station/src/navigation.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground_station/src/navigation.hpp b/ground_station/src/navigation.hpp index 5ffcc815..1e7632e6 100644 --- a/ground_station/src/navigation.hpp +++ b/ground_station/src/navigation.hpp @@ -113,7 +113,7 @@ class Navigation { return elevation; } - inline float computeBearing() { return (azimuth + filter.getYawRadians() - PI_F / 2) / (2 * PI_F / 360); } + inline float computeBearing() { return (azimuth - PI_F / 2) / (2 * PI_F / 360); } struct mag_calibration_t { float offset[3]; From a5ccd54538b5de151e393d437af24ac71ae9b4d7 Mon Sep 17 00:00:00 2001 From: jbinz Date: Thu, 19 Jun 2025 19:48:00 +0200 Subject: [PATCH 2/3] clang --- ground_station/src/navigation.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground_station/src/navigation.hpp b/ground_station/src/navigation.hpp index 1e7632e6..31c3f60b 100644 --- a/ground_station/src/navigation.hpp +++ b/ground_station/src/navigation.hpp @@ -113,7 +113,7 @@ class Navigation { return elevation; } - inline float computeBearing() { return (azimuth - PI_F / 2) / (2 * PI_F / 360); } + inline float computeBearing() const { return (azimuth - PI_F / 2) / (2 * PI_F / 360); } struct mag_calibration_t { float offset[3]; From 25633d212f4c046b54a1d28ee11165fc6e98099a Mon Sep 17 00:00:00 2001 From: jbinz Date: Fri, 20 Jun 2025 20:05:12 +0200 Subject: [PATCH 3/3] Added coming soon to bearing. --- ground_station/src/hmi/window.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ground_station/src/hmi/window.cpp b/ground_station/src/hmi/window.cpp index cfdb21b0..227b73c8 100644 --- a/ground_station/src/hmi/window.cpp +++ b/ground_station/src/hmi/window.cpp @@ -332,8 +332,8 @@ void Window::UpdateLiveState(TelemetryData *data1, TelemetryData *data2, Navigat float bearing = navigation->computeBearing(); display.setCursor(static_cast(xOffset1 + first_row_offset), 145); - display.print(old_bearing[0]); - display.print(" deg"); + //display.print(old_bearing[0]); + display.print("Coming soon"); old_bearing[0] = bearing; // Set Downrange text of FC 2 to white @@ -351,8 +351,8 @@ void Window::UpdateLiveState(TelemetryData *data1, TelemetryData *data2, Navigat bearing = navigation->computeBearing(); display.setCursor(static_cast(xOffset2 + first_row_offset), 145); - display.print(old_bearing[1]); - display.print(" deg"); + //display.print(old_bearing[1]); + display.print("Coming soon"); old_bearing[1] = bearing; // Set DownRange to white @@ -556,12 +556,12 @@ void Window::updateLiveData(TelemetryData *data, Navigation *navigation, int16_t display.setCursor(static_cast(xOffset + first_row_offset), 145); display.setTextColor(WHITE); - display.print(old_bearing[index]); - display.print(" deg"); + //display.print(old_bearing[index]); + display.print("Coming soon"); display.setTextColor(color); display.setCursor(static_cast(xOffset + first_row_offset), 145); - display.print(bearing); - display.print(" deg"); + //display.print(bearing); + display.print("Coming soon"); old_bearing[index] = bearing; }