| 1,5 → 1,5 |
|---|
| /**************************************************************************** |
| * Copyright (C) 2009-2015 by Claas Anders "CaScAdE" Rathje * |
| * Copyright (C) 2009-2016 by Claas Anders "CaScAdE" Rathje * |
| * admiralcascade@gmail.com * |
| * Project-URL: http://www.mylifesucks.de/oss/c-osd/ * |
| * * |
| 120,15 → 120,15 |
|---|
| } |
| } else { |
| if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
| write_ndigit_number_s(23, top_line, naviData.Altimeter / 10 * 32 / 20, 4, 0); // BARO |
| write_ndigit_number_s(23, top_line, naviData.Altimeter_5cm / 10 * 32 / 20, 4, 0); // BARO |
| } else { |
| //cite:killagreg "Faktor 20 bis 21 w�re korrekt." (http://forum.mikrokopter.de/topic-post211192.html#post211192) |
| if (naviData.Altimeter > 200 || naviData.Altimeter < -200) { |
| if (naviData.Altimeter_5cm > 200 || naviData.Altimeter_5cm < -200) { |
| // above 10m only write full meters |
| write_ndigit_number_s(23, top_line, naviData.Altimeter / 20, 4, 0); // BARO |
| write_ndigit_number_s(23, top_line, naviData.Altimeter_5cm / 20, 4, 0); // BARO |
| } else { |
| // up to 10m write meters.dm |
| write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 2, 3, 0); // BARO |
| write_ndigit_number_s_10th(23, top_line, naviData.Altimeter_5cm / 2, 3, 0); // BARO |
| } |
| } |
| } |
| 170,7 → 170,7 |
|---|
| if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
| altimeter_offset = naviData.CurrentPosition.Altitude / 1000; // GPS |
| } else { |
| altimeter_offset = naviData.Altimeter / 20; // BARO |
| altimeter_offset = naviData.Altimeter_5cm / 20; // BARO |
| } |
| // set wasted counter to current offset |
| if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) { |
| 297,7 → 297,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 / 20 > max_Altimeter) max_Altimeter = naviData.Altimeter / 20; |
| if (naviData.Altimeter_5cm / 20 > max_Altimeter) max_Altimeter = naviData.Altimeter_5cm / 20; |
| } |
| if (naviData.GroundSpeed > max_GroundSpeed) max_GroundSpeed = naviData.GroundSpeed; |
| if (naviData.HomePositionDeviation.Distance > max_Distance) { |