Subversion Repositories Projects

Rev

Rev 783 | Rev 809 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 783 Rev 800
Line 108... Line 108...
108
            }
108
            }
109
        } else {
109
        } else {
110
            if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) {
110
            if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) {
111
                write_ndigit_number_s(23, top_line, naviData.Altimeter / 10 * 32 / 20, 4, 0); // BARO
111
                write_ndigit_number_s(23, top_line, naviData.Altimeter / 10 * 32 / 20, 4, 0); // BARO
112
            } else {
112
            } else {
113
                //cite:killagreg "Faktor 20 bis 21 wäre korrekt." (http://forum.mikrokopter.de/topic-post211192.html#post211192)
113
                //cite:killagreg "Faktor 20 bis 21 w�re korrekt." (http://forum.mikrokopter.de/topic-post211192.html#post211192)
114
                if (naviData.Altimeter > 200 || naviData.Altimeter < -200) {
114
                if (naviData.Altimeter > 200 || naviData.Altimeter < -200) {
115
                    // above 10m only write full meters
115
                    // above 10m only write full meters
116
                    write_ndigit_number_s(23, top_line, naviData.Altimeter / 20, 4, 0); // BARO
116
                    write_ndigit_number_s(23, top_line, naviData.Altimeter / 20, 4, 0); // BARO
117
                } else {
117
                } else {
118
                    // up to 10m write meters.dm
118
                    // up to 10m write meters.dm
Line 237... Line 237...
237
        }
237
        }
238
 
238
 
239
        // pre-bottom line
239
        // pre-bottom line
240
        if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
240
        if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
241
            //write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0);
241
            //write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0);
242
            write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 3, 0);
242
            write_ndigit_number_u_10th(2, bottom_line - 1, ampere / 10, 4, 0);
243
            write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 4, 0);
243
            write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 4, 0);
244
            if (COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) {
244
            if (COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) {
245
                write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0);
245
                write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0);
246
            }
246
            }
247
        } else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) {
247
        } else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) {
248
            write_ndigit_number_u_10th(3, bottom_line - 1, naviData.Current, 3, 0);
248
            write_ndigit_number_u_10th(2, bottom_line - 1, naviData.Current, 4, 0);
249
            write_ndigit_number_u(10, bottom_line - 1, naviData.UsedCapacity, 4, 0);
249
            write_ndigit_number_u(10, bottom_line - 1, naviData.UsedCapacity, 4, 0);
250
        }
250
        }
251
 
251
 
252
        //DEBUGwrite_ndigit_number_u(1, 5, COSD_FLAGS_MODES, 3, 0);
252
        //DEBUGwrite_ndigit_number_u(1, 5, COSD_FLAGS_MODES, 3, 0);
253
 
253