| 108,15 → 108,15 |
|---|
| } |
| } else { |
| if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
| write_ndigit_number_s(23, top_line, naviData.Altimeter / 10 * 32 / 30, 4, 0); // BARO |
| write_ndigit_number_s(23, top_line, naviData.Altimeter / 10 * 32 / 20, 4, 0); // BARO |
| } else { |
| //note:lephisto:according to several sources it's /30 |
| if (naviData.Altimeter > 300 || naviData.Altimeter < -300) { |
| //cite:killagreg "Faktor 20 bis 21 wäre korrekt." (http://forum.mikrokopter.de/topic-post211192.html#post211192) |
| if (naviData.Altimeter > 200 || naviData.Altimeter < -200) { |
| // above 10m only write full meters |
| write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 4, 0); // BARO |
| write_ndigit_number_s(23, top_line, naviData.Altimeter / 20, 4, 0); // BARO |
| } else { |
| // up to 10m write meters.dm |
| write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 3, 0); // BARO |
| write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 2, 3, 0); // BARO |
| } |
| } |
| } |
| 290,7 → 290,7 |
|---|
| if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
| if (naviData.CurrentPosition.Altitude / 1000 - altimeter_offset > max_Altimeter) max_Altimeter = naviData.CurrentPosition.Altitude / 1000; |
| } else { |
| if (naviData.Altimeter / 30 > max_Altimeter) max_Altimeter = naviData.Altimeter / 30; |
| if (naviData.Altimeter / 20 > max_Altimeter) max_Altimeter = naviData.Altimeter / 32; |
| } |
| if (naviData.GroundSpeed > max_GroundSpeed) max_GroundSpeed = naviData.GroundSpeed; |
| if (naviData.HomePositionDeviation.Distance > max_Distance) { |