Skip to content

[GS] Bearing in live screen is now absolute. #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[GS] Bearing in live screen is now absolute. #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5010298
Absolute bearing.
jbinz Jun 19, 2025
a5ccd54
clang
jbinz Jun 19, 2025
25633d2
Added coming soon to bearing.
jbinz Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ground_station/src/hmi/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@ void Window::UpdateLiveState(TelemetryData *data1, TelemetryData *data2, Navigat
float bearing = navigation->computeBearing();

display.setCursor(static_cast<int16_t>(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
Expand All @@ -351,8 +351,8 @@ void Window::UpdateLiveState(TelemetryData *data1, TelemetryData *data2, Navigat
bearing = navigation->computeBearing();

display.setCursor(static_cast<int16_t>(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
Expand Down Expand Up @@ -556,12 +556,12 @@ void Window::updateLiveData(TelemetryData *data, Navigation *navigation, int16_t

display.setCursor(static_cast<int16_t>(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<int16_t>(xOffset + first_row_offset), 145);
display.print(bearing);
display.print(" deg");
//display.print(bearing);
display.print("Coming soon");
old_bearing[index] = bearing;
}

Expand Down
2 changes: 1 addition & 1 deletion ground_station/src/navigation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() const { return (azimuth - PI_F / 2) / (2 * PI_F / 360); }

struct mag_calibration_t {
float offset[3];
Expand Down
Loading