WebSVN - Projects - Diff - Rev 837 and 902

 /****************************************************************************
- *   Copyright (C) 2009-2010 by Claas Anders "CaScAdE" Rathje               *
+ *   Copyright (C) 2009-2011 by Claas Anders "CaScAdE" Rathje               *
  *   admiralcascade@gmail.com                                               *
  *   Project-URL: http://www.mylifesucks.de/oss/c-osd/                      *
  *                                                                          *
  *   This program is free software; you can redistribute it and/or modify   *
  *   it under the terms of the GNU General Public License as published by   *
 uint8_t EEMEM ee_checkbyte1 = CHECKBYTE1;
 uint8_t EEMEM ee_checkbyte2 = CHECKBYTE2;
 uint8_t EEMEM ee_COSD_FLAGS_MODES = 0;
 uint8_t EEMEM ee_COSD_FLAGS_CONFIG = 0;
 uint8_t EEMEM ee_COSD_DISPLAYMODE = 0;
-uint8_t EEMEM ee_COSD_SCOPE [8] = {
+uint8_t EEMEM ee_COSD_SCOPE [12] = {
-, 5,
+, 5, 0,
-, 5,
+, 5, 0,
-, 10,
+, 10, 0,
-, 10
+, 10, 0
 };
 // video modes
 const char VM_PAL[] PROGMEM = "PAL ";
         if (verbose) write_ascii_string_pgm(2, 2, ee_msg[0]); // Loading data
         COSD_FLAGS_MODES = eeprom_read_byte(&ee_COSD_FLAGS_MODES);
         COSD_FLAGS_CONFIG = eeprom_read_byte(&ee_COSD_FLAGS_CONFIG);
         COSD_DISPLAYMODE = eeprom_read_byte(&ee_COSD_DISPLAYMODE);
         //if (verbose) write_ndigit_number_u(23, 11, COSD_DISPLAYMODE, 2, 0);
-        for (int i = 0; i < 8; i++) {
+        for (int i = 0; i < 12; i++) {
             scope[i] = eeprom_read_byte(&ee_COSD_SCOPE[i]);
+        }
     } else {
         if (verbose) write_ascii_string_pgm(2, 2, ee_msg[1]); // Loading data
+    }
     eeprom_write_byte(&ee_checkbyte1, CHECKBYTE1);
     eeprom_write_byte(&ee_checkbyte2, CHECKBYTE2);
     eeprom_write_byte(&ee_COSD_FLAGS_MODES, COSD_FLAGS_MODES);
     eeprom_write_byte(&ee_COSD_FLAGS_CONFIG, COSD_FLAGS_CONFIG);
     eeprom_write_byte(&ee_COSD_DISPLAYMODE, COSD_DISPLAYMODE);
-    for (int i = 0; i < 8; i++) {
+    for (int i = 0; i < 12; i++) {
         eeprom_write_byte(&ee_COSD_SCOPE[i], scope[i]);
+    }
+}
  * helper function for menu updating
  */
 void config_menu_drawings(uint8_t chosen) {
     static uint8_t old_y = 0;
     uint8_t x = MENU_LEFT, y = MENU_TOP, line = MENU_TOP;
+    //************************************************* 13 to 14
-    if (chosen > 5 && chosen < 13) { // right
+    if (chosen > 6 && chosen < 15) { // right
         x = MENU_MIDDLE;
-        y = chosen - 6 + MENU_TOP;
+        y = chosen - 7 + MENU_TOP;
-    } else if (chosen < 7) {
+    } else if (chosen < 8) {
         y = chosen + MENU_TOP;
     } else {
-        y = chosen - 6 + MENU_TOP;
+        y = chosen - 7 + MENU_TOP;
+    }
     // clear prevoius _cursor_ and draw current
     for (uint8_t myx = MENU_LEFT; myx < 29; myx++) {
     onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_STATS);
     write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("A by FC"));
+    onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT);
+    write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("GPS Pos"));
-    onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT);
+    onoff(MENU_LEFT + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS);
     // 2nd col
     line = 2;
     onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_FEET);
     write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Big Vario"));
+    onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO);
+    write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Big Speed"));
-    onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO);
+    onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_BIGSPEED);
     write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Passive"));
     onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_PASSIVE);
     write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Cam Scope"));
     onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_SCOPE);
     write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Move Scope"));
     // bottom
-    write_ascii_string_pgm(MENU_LEFT, 9, PSTR("Reset uptime"));
+    write_ascii_string_pgm(MENU_LEFT, 10, PSTR("Reset uptime"));
 void move_scope() {
     uint8_t mode = 0;
     clear();
     draw_scope();
     _delay_ms(500);
-    while (mode < 8) {
+    while (mode < 12) {
         if (s2_pressed()) { // next
             mode++;
             _delay_ms(500);
         } else if (s1_pressed()) {
+            if (mode % 3 == 2) {
+                scope[mode] = (scope[mode] + 1) % 2;
+            } else {
-            scope[mode] = (scope[mode] + 1) % (mode % 2 == 0 ? 30 : bottom_line);
+                scope[mode] = (scope[mode] + 1) % ((mode % 3) % 2 == 0 ? 30 : bottom_line);
+            }
             clear();
             draw_scope();
             _delay_ms(100);
+        }
+    }
     config_menu_drawings(chosen);
     while (inmenu) {
         if (s2_pressed()) {
-            chosen = (chosen + 1) % 17;
+            chosen = (chosen + 1) % 19;
             //if (chosen == 12) chosen = 13; // SKIP unused menu space for now
             config_menu_drawings(chosen);
             _delay_ms(500);
                     COSD_FLAGS_MODES ^= COSD_FLAG_STATS;
                     break;
                 case 5: // current by fc
                     COSD_FLAGS_MODES ^= COSD_FLAG_FCCURRENT;
                     break;
+                case 6: // GPS coordinates while flying
+                    COSD_FLAGS_CONFIG ^= COSD_FLAG_SHOW_COORDS;
+                    break;
-                case 6: // 2nd voltage by c-strom
+                case 7: // 2nd voltage by c-strom
                     COSD_FLAGS_MODES ^= COSD_FLAG_STROMVOLT;
                     break;
-                case 7: // GPS or BARO height
+                case 8: // GPS or BARO height
                     COSD_FLAGS_CONFIG ^= COSD_FLAG_GPSHEIGHT;
                     break;
-                case 8: // Feet and mph?
+                case 9: // Feet and mph?
                     COSD_FLAGS_CONFIG ^= COSD_FLAG_FEET;
                     break;
-                case 9: // big vario
+                case 10: // big vario
                     COSD_FLAGS_MODES ^= COSD_FLAG_BIGVARIO;
                     break;
+                case 11: // big Speed
+                    COSD_FLAGS_CONFIG ^= COSD_FLAG_BIGSPEED;
+                    break;
-                case 10: // passive
+                case 12: // passive
                     COSD_FLAGS_CONFIG ^= COSD_FLAG_PASSIVE;
                     break;
-                case 11: // scope
+                case 13: // scope
                     COSD_FLAGS_CONFIG ^= COSD_FLAG_SHOW_SCOPE;
                     break;
-                case 12: // move scope
+                case 14: // move scope
                     move_scope();
                     break;
-                case 13: // reset uptime
+                case 15: // reset uptime
                     uptime = 0;
                     config_menu_doclick(chosen);
                     break;
-                case 14: // change mode
+                case 16: // change mode
 #if FCONLY
                     COSD_DISPLAYMODE = (COSD_DISPLAYMODE + 1) % (sizeof (fcdisplaymodes) / sizeof (displaymode_t));
                     mode = fcdisplaymodes;
                     mode += COSD_DISPLAYMODE;
                     osd_fcmode = (int(*)(void)) pgm_read_word(&mode->dfun);
                     mode = ncdisplaymodes;
                     mode += COSD_DISPLAYMODE;
                     osd_ncmode = (int(*)(void)) pgm_read_word(&mode->dfun);
 #endif
                     break;
-                case 15: // save
+                case 17: // save
                     save_eeprom();
                     config_menu_doclick(chosen);
                     break;
-                case 16: // exit
+                case 18: // exit
                     inmenu = 0;
                     config_menu_doclick(chosen);
                     break;
+            }
             config_menu_drawings(chosen);

Subversion Repositories Projects

(root)/C-OSD/trunk/config.c/ - Rev 837 → 902