WebSVN - Projects - Diff - Rev 902 and 1197 - /C-OSD/trunk/osd

 /**
  * draw a compass rose at <x>/<y> for <heading>
  */
 void draw_compass(uint8_t x, uint8_t y, uint16_t heading) {
     //char* rose = "---N---O---S---W---N---O---S---W---N---O---S---W";
-    static char rose[48] PROGMEM = {216, 215, 216, 211, 216, 215, 216, 213, 216, 215, 216, 212,
+    static char rose[] PROGMEM = {216, 215, 216, 211, 216, 215, 216, 213, 216, 215, 216, 212,
 , 215, 216, 214, 216, 215, 216, 211, 216, 215, 216, 213,
 , 215, 216, 212, 216, 215, 216, 214, 216, 215, 216, 211,
 , 215, 216, 213, 216, 215, 216, 212, 216, 215, 216, 214};
     // the center is char 19 (north), we add the current heading in 8th
     // which would be 22.5 degrees, but float would bloat up the code
 /**
  * draw variometer arrows at <x>/<y> according to <variometer>
  */
 void draw_variometer(uint8_t x, uint8_t y, int16_t variometer) {
-    if (variometer == 0) {
-        write_char_xy(x, y, 0xbb); // plain line
+    uint8_t chr = 0xbb;
-    } else if (variometer > 0) { // gain height
+    if (variometer > 0) { // gain height
-        switch (variometer / 5) {
-            case 0:
-                //write_char_xy(x, y, 0xba); // smallest arrow up
-                write_char_xy(x, y, 0x70); // one arrow up
-                break;
-            case 1:
-                //write_char_xy(x, y, 0xb9); // small arrow up
-                write_char_xy(x, y, 0x71); // two arrows up
-                break;
-            case 2:
-                //write_char_xy(x, y, 0xb8); // large arrow up
-                write_char_xy(x, y, 0x72); // three arrows up
+        chr = 0x70 + (variometer / 5);
-                break;
-            default:
-                //write_char_xy(x, y, 0xb7); // largest arrow up
-                write_char_xy(x, y, 0x73); // three black arrows up
         if (chr > 0x73) chr = 0x73;
     } else { // sink
-        switch (variometer / -5) {
-            case 0:
-                //write_char_xy(x, y, 0xbc); // smallest arrow down
-                write_char_xy(x, y, 0x77); // one arrow down
-                break;
-            case 1:
-                //write_char_xy(x, y, 0xbd); // small arrow down
-                write_char_xy(x, y, 0x76); // two arrows down
-                break;
-            case 2:
-                //write_char_xy(x, y, 0xbe); // large arrow down
-                write_char_xy(x, y, 0x75); // three arrows down
+        chr = 0x77 - (variometer / -5);
-                break;
-            default:
-                //write_char_xy(x, y, 0xbf); // largest arrow down
-                write_char_xy(x, y, 0x74); // three black arrows down
         if (chr < 0x74) chr = 0x74;
+    }
     write_char_xy(x, y, chr);
+}
 // big vario arrays
  */
 void draw_stats() {
 #if FCONLY
 #else
     uint8_t line = 3;
-    write_ascii_string_pgm(1, line, (const char *)(pgm_read_word(&(stats_item_pointers[0])))); // max Altitude
+    write_ascii_string_pgm(1, line, PSTR("max Altitude:")); // max Altitude
-    write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[1])))); // max Speed
+    write_ascii_string_pgm(1, ++line, PSTR("max Speed :")); // max Speed
-    write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[2])))); // max Distance
+    write_ascii_string_pgm(1, ++line, PSTR("max Distance:")); // max Distance
     if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) {
         write_ndigit_number_s(16, line - 2, max_Altimeter * 32 / 10, 4, 0);
         write_char_xy(20, line - 2, 0x7E); // small feet ft
         write_char_xy(20, line - 1, 203); // km/h
         write_ndigit_number_u(16, line - 0, max_Distance / 10, 4, 0);
         write_char_xy(20, line - 0, 204); // small meters m
+    }
-    write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[3])))); // min voltage
+    write_ascii_string_pgm(1, ++line, PSTR("min Voltage :")); // min voltage
     write_ndigit_number_u_10th(16, line, min_UBat, 3, 0);
     write_char_xy(20, line, 0x9E); // small V
     if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
-        write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[7])))); // ampere
+        write_ascii_string_pgm(1, ++line, PSTR("max current :")); // ampere
         write_ndigit_number_u_10th(16, line, max_ampere / 10, 3, 0);
         write_char_xy(20, line, 0x9F); // small A
             write_ndigit_number_u(21, line, naviData.UsedCapacity - wasted_ampere_offset, 5, 0);
+        }
         write_char_xy(26, line, 0xB5); // mah
     }
-    write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[4])))); // max time
+    write_ascii_string_pgm(1, ++line, PSTR("max Time:")); // max time
     write_time(14, line, max_FlyingTime);
     write_char_xy(20, line, 210); // fly clock
-    write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[5])))); // longitude
+    write_ascii_string_pgm(1, ++line, PSTR("longitude :")); // longitude
     write_gps_pos(14, line, naviData.CurrentPosition.Longitude);
-    write_ascii_string_pgm(1, ++line, (const char *)(pgm_read_word(&(stats_item_pointers[6])))); // latitude
+    write_ascii_string_pgm(1, ++line, PSTR("latitude:")); // latitude
     write_gps_pos(14, line, naviData.CurrentPosition.Latitude);
 #endif
+}

Subversion Repositories Projects

(root)/C-OSD/trunk/osd_helpers.c - Rev 902 → 1197