TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 12:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bearing-fix'

Browse Source
This commit is contained in:
eried 2020-07-02 22:44:16 +02:00
commit 645a781ac2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/application/ui/ui_geomap.cpp
View File

@ -169,8 +169,9 @@ void GeoMap::paint(Painter& painter) {
display.fill_rectangle({ r.center() - Point(16, 1), { 32, 2 } }, Color::red()); display.fill_rectangle({ r.center() - Point(16, 1), { 32, 2 } }, Color::red());
display.fill_rectangle({ r.center() - Point(1, 16), { 2, 32 } }, Color::red()); display.fill_rectangle({ r.center() - Point(1, 16), { 2, 32 } }, Color::red());
} else { } else {
draw_bearing({ 120, 32 + 144 }, angle_, 10, Color::red()); draw_bearing(r.center(), angle_, 10, Color::red());
painter.draw_string({ 120 - ((int)tag_.length() * 8 / 2), 32 + 144 - 32 }, style(), tag_); //center tag above bearing
painter.draw_string(r.center() - Point(((int)tag_.length() * 8 / 2), 2 * 16), style(), tag_);
} }
} }

4
firmware/common/ui.cpp
View File

@ -91,7 +91,9 @@ Rect& Rect::operator-=(const Point& p) {
} }
Point polar_to_point(float angle, uint32_t distance) { Point polar_to_point(float angle, uint32_t distance) {
return Point(sin_f32(DEG_TO_RAD(angle) + (pi / 2)) * distance, -sin_f32(DEG_TO_RAD(angle)) * distance); //polar to compass with y negated for screen drawing
return Point(sin_f32(DEG_TO_RAD(-angle) + pi) * distance,
sin_f32(DEG_TO_RAD(-angle) - (pi / 2)) * distance);
} }
} /* namespace ui */ } /* namespace ui */