WebSVN - Projects - Diff - Rev 507 and 519 - /C-OSD/trunk/osd_ncmode

                     write_char_xy(27, bottom_line, 0xC9); // sat2
                         COSD_FLAGS2 |= COSD_ICONS_WRITTEN;
+                }
                 // first line
-                write_ndigit_number_u(2, top_line, (uint16_t) (((uint32_t) naviData.GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 100, 0);
+                write_ndigit_number_u(2, top_line, (uint16_t) (((uint32_t) naviData.GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 3, 0);
-                write_ndigit_number_u(7, top_line, naviData.RC_Quality, 100, 0);
+                write_ndigit_number_u(7, top_line, naviData.RC_Quality, 3, 0);
                 if (naviData.RC_Quality <= RCLVL_WRN && last_RC_Quality > RCLVL_WRN) {
                     for (uint8_t x = 0; x < 4; x++)
                         write_char_att_xy(7 + x, top_line, BLINK);
                     write_char_xy(11, top_line, 0); // clear
                 } else {
                     write_char_xy(11, top_line, 0xC6); // PC icon
+                }
-                write_ndigit_number_u(13, top_line, naviData.CompassHeading, 100, 0);
+                write_ndigit_number_u(13, top_line, naviData.CompassHeading, 3, 0);
                 write_ascii_string_pgm(17, top_line, (const char *) (pgm_read_word ( &(directions[heading_conv(naviData.CompassHeading)]))));
                 draw_variometer(21, top_line, naviData.Variometer);
                 //note:lephisto:according to several sources it's /30
                 if (naviData.Altimeter > 300 || naviData.Altimeter < -300) {
                     // above 10m only write full meters
-                    write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 1000, 0);
+                    write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 4, 0);
                 } else {
+                    // up to 10m write meters.dm
+                    //write_number_u_10th(21, top_line, naviData.Altimeter / 3);
+                    write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 3, 0);
                     // up to 10m write meters.dm
                     //write_number_u_10th(21, top_line, naviData.Altimeter / 3);
-                    write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 100, 0);
+                // GPS HIGHT
                 //write_ndigit_number_s(23, top_line-1, (int16_t) (naviData.CurrentPosition.Altitude / 1000), 4, 0);
                 // seccond line
                 draw_compass(11, top_line + 1, naviData.CompassHeading);
                 // TODO: verify correctness
                 uint16_t heading_home = (naviData.HomePositionDeviation.Bearing + 360 - naviData.CompassHeading) % 360;
                 //write_char_xy(21, top_line + 1, arrowdir[heading_conv(heading_home)]);
                 // finer resolution, 0xa0 is first character and we add the index 0 <= index < 16
                 } else {
                     // stats
                     if ((COSD_FLAGS2 & COSD_WASFLYING) && (COSD_FLAGS & COSD_FLAG_STATS)) {
                                 uint8_t line = 3;
                         write_ascii_string_pgm(2, line, (const char *) (pgm_read_word(&(stats_item_pointers[0])))); // max Altitude
-                        write_ndigit_number_s(18, line, max_Altimeter / 30, 1000, 0);
+                        write_ndigit_number_s(18, line, max_Altimeter / 30, 4, 0);
                         write_char_xy(22, line, 204); // small meters m
                         write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[1])))); // max Speed
-                        write_ndigit_number_u(19, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 100, 0);
+                        write_ndigit_number_u(19, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 3, 0);
                         write_char_xy(22, line, 203); // km/h
                         write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[2])))); // max Distance
-                        write_ndigit_number_u(19, line, max_Distance / 10, 100, 0);
+                        write_ndigit_number_u(19, line, max_Distance / 10, 3, 0);
                         write_char_xy(22, line, 204); // small meters m
                         write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[3])))); // min voltage
-                        write_ndigit_number_u_10th(18, line, min_UBat, 100, 0);
+                        write_ndigit_number_u_10th(18, line, min_UBat, 3, 0);
                         write_char_xy(22, line, 0x9E); // small V
                                 if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
                                         write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[7])))); // ampere
-                                        write_ndigit_number_u_10th(18, line, max_ampere / 10, 100, 0);
+                                        write_ndigit_number_u_10th(18, line, max_ampere / 10, 3, 0);
                                         write_char_xy(22, line, 0x9F); // small A
+                                }
                         write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[4])))); // max time
                         write_time(16, line, max_FlyingTime);
                         write_char_xy(22, line, 210); // fly clock
                     draw_big_variometer(27, 8, naviData.Variometer);
+                }
                 // pre-bottom line
                 if (COSD_FLAGS2 & COSD_FLAG_STROMREC) {
-                        //write_ndigit_number_s(3, bottom_line - 1, ampere, 1000, 0);
+                        //write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0);
-                        write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 100, 0);
+                        write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 3, 0);
-                        write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 1000, 0);
+                        write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 4, 0);
                         if (COSD_FLAGS & COSD_FLAG_STROMVOLT) {
-                                write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 100, 0);
+                                write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0);
+                        }
+                }
                 // bottom line
                 draw_battery(2, bottom_line, min_voltage, naviData.UBat, max_voltage);
-                write_ndigit_number_u_10th(3, bottom_line, naviData.UBat, 100, 0);
+                write_ndigit_number_u_10th(3, bottom_line, naviData.UBat, 3, 0);
                 if (naviData.UBat <= min_voltage && last_UBat > min_voltage) {
                     for (uint8_t x = 2; x < 8; x++)
                         write_char_att_xy(x, bottom_line, BLINK);
+                }
                 write_time(8, bottom_line, uptime);
                 write_time(15, bottom_line, naviData.FlyingTime);
-                write_ndigit_number_u(24, bottom_line, naviData.SatsInUse, 10, 0);
+                write_ndigit_number_u(24, bottom_line, naviData.SatsInUse, 2, 0);
                 if (naviData.NCFlags & NC_FLAG_MANUAL_CONTROL) {

Subversion Repositories Projects

(root)/C-OSD/trunk/osd_ncmode_default.c - Rev 507 → 519