Skip to content

Commit 9d6cfb7

Browse files
WP panel fix for copter
Also folder change xtrack normalisation for plane
1 parent eb86fa1 commit 9d6cfb7

File tree

16 files changed

+16
-3
lines changed

16 files changed

+16
-3
lines changed

MinimOSD_Extra_Plane_Pre_release_Beta/OSD_Panels.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void startPanels(){
1010
void panLogo(){
1111
osd.setPanel(5, 5);
1212
osd.openPanel();
13-
osd.printf_P(PSTR("MinimOSD-Extra 2.4|Plane r798"));
13+
osd.printf_P(PSTR("MinimOSD-Extra 2.4|Plane r800"));
1414
osd.closePanel();
1515
}
1616

@@ -1051,6 +1051,8 @@ void panWPDis(int first_col, int first_line){
10511051
if (wp_target_bearing_rotate_int < 0) wp_target_bearing_rotate_int += 16;
10521052
if (wp_target_bearing_rotate_int == 0) wp_target_bearing_rotate_int = 16;
10531053

1054+
if (xtrack_error > 999) xtrack_error = 999;
1055+
else if (xtrack_error < -999) xtrack_error = -999;
10541056

10551057
osd.printf("%c%c%2i%c%4.0f%c|",0x57, 0x70, wp_number,0x0,(double)((float)(wp_dist) * converth),high);
10561058
showArrow((uint8_t)wp_target_bearing_rotate_int,0);

MinimOsd-Extra_Copter_Pre release_Beta/OSD_Panels.ino renamed to MinimOsd_Extra_Copter_Pre_release_Beta/OSD_Panels.ino

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void startPanels(){
1010
void panLogo(){
1111
osd.setPanel(5, 5);
1212
osd.openPanel();
13-
osd.printf_P(PSTR("MinimOSD-Extra 2.4|Copter r794"));
13+
osd.printf_P(PSTR("MinimOSD-Extra 2.4|Copter r800"));
1414
osd.closePanel();
1515
}
1616

@@ -960,13 +960,22 @@ void panWPDis(int first_col, int first_line){
960960
osd.setPanel(first_col, first_line);
961961
osd.openPanel();
962962

963-
wp_target_bearing_rotate_int = ((int)round(((float)wp_target_bearing - osd_heading)/360.0 * 16.0) + 16) % 16 + 1; //[1, 16]
963+
// wp_target_bearing_rotate_int = ((int)round(((float)wp_target_bearing - osd_heading)/360.0 * 16.0) + 16) % 16 + 1; //[1, 16]
964+
965+
if (wp_target_bearing > 0){
966+
wp_target_bearing_rotate_int = round((wp_target_bearing - osd_heading)/360 *16.0) + 1;
967+
}else if (wp_target_bearing < 0){
968+
wp_target_bearing_rotate_int = round(((360 + wp_target_bearing) - osd_heading)/360 *16.0) + 1;
969+
}
970+
if (wp_target_bearing_rotate_int < 0) wp_target_bearing_rotate_int += 16;
971+
if (wp_target_bearing_rotate_int == 0) wp_target_bearing_rotate_int = 16;
964972

965973
if (xtrack_error > 999) xtrack_error = 999;
966974
else if (xtrack_error < -999) xtrack_error = -999;
967975

968976
osd.printf("%c%c%2i%c%4.0f%c|",0x57, 0x70, wp_number,0x0,(double)((float)(wp_dist) * converth),high);
969977
showArrow((uint8_t)wp_target_bearing_rotate_int,0);
978+
970979
if (osd_mode == 10){
971980
osd.printf("%c%c%c%4.0f%c", 0x20, 0x58, 0x65, (xtrack_error* converth), high);
972981
}else{

Tools/OSD/bin/Release/config.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
<ArduinoIDEPath>Arduino-1.0.2</ArduinoIDEPath>
66
<PlaneSketchPath>ArduCAM_OSD_Plane</PlaneSketchPath>
77
<CopterSketchPath>ArduCAM_OSD_Copter</CopterSketchPath>
8+
<AutoUpdate>False</AutoUpdate>
9+
<CheckForUpdates>True</CheckForUpdates>
810
</Config>

0 commit comments

Comments
 (0)