WebSVN - Projects - Diff - Rev 738 and 757

 /****************************************************************************
  *   Copyright (C) 2009-2010 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   *
  *   the Free Software Foundation; either version 2 of the License.         *
  *                                                                          *
  *   This program is distributed in the hope that it will be useful,        *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
  *   GNU General Public License for more details.                           *
  *                                                                          *
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program; if not, write to the                          *
  *   Free Software Foundation, Inc.,                                        *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.              *
  ****************************************************************************/
 #include <avr/io.h>
 #include <avr/eeprom.h>
 #include <avr/pgmspace.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
 #include "max7456_software_spi.h"
 #include "config.h"
 #include "main.h"
 #include "buttons.h"
 #include "usart1.h"
 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;
 #if !(ALLCHARSDEBUG|(WRITECHARS != -1))
 // video modes
 const char VM_PAL[] PROGMEM = "PAL ";
 const char VM_NTSC[] PROGMEM = "NTSC";
 const displaymode_t * mode;
 #endif
 const char ee_message0[] PROGMEM = "Loading Data from EEPROM";
 const char ee_message1[] PROGMEM = "No saved Data in EEPROM";
 const char* ee_msg[] PROGMEM = {ee_message0, ee_message1};
 /**
  * read data saved in eeprom, print out message if <verbose> is set
  */
 void get_eeprom(uint8_t verbose) {
         if (eeprom_read_byte(&ee_checkbyte1) == CHECKBYTE1 && eeprom_read_byte(&ee_checkbyte2) == CHECKBYTE2) {
                 #if !(ALLCHARSDEBUG|(WRITECHARS != -1))
                 if (verbose) write_ascii_string_pgm(2, 9, ee_msg[0]); // Loading data
                 #endif
                 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);
         } else {
                 #if !(ALLCHARSDEBUG|(WRITECHARS != -1))
                 if (verbose) write_ascii_string_pgm(2, 9, ee_msg[1]); // Loading data
                 #endif
+        }
+}
 #if !(ALLCHARSDEBUG|(WRITECHARS != -1))
 /**
  * save data to eeprom
  */
 void save_eeprom() {
         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);
+}
 /**
  * auto config some stuff on startup, currently only battery cells
- * TODO: this is testing stuff, strings should go progmem and so on...
  */
 void init_cosd(uint8_t UBat) {
     clear();
         write_ascii_string_pgm(2, 1, PSTR("C-OSD Initialisation")); // C-OSD Initialisation
 #if FCONLY
         write_ascii_string_pgm(2, 2, PSTR("FC only Mode")); // FC only mode
 #else
         write_ascii_string_pgm(2, 2, PSTR("NaviCtrl Mode")); // NaviCtrl Mode
 #endif
     write_ascii_string_pgm(2, 3, PSTR(BUILDDATE));
     uint8_t cellnum = 0;
     if (CELL_NUM == -1) {
                 write_ascii_string_pgm(2, 4, PSTR("Guessing Number of Cells")); // Guessing Number of Cells
         do {
             cellnum++;
         } while (UBat > ((cellnum * CELL_VOLT_MAX) + 23));
     } else {
         cellnum = CELL_NUM;
+    }
     min_voltage = cellnum * CELL_VOLT_MIN;
     max_voltage = cellnum * CELL_VOLT_MAX;
         write_ascii_string_pgm(2, 5, PSTR("Number of Cells:")); // Number of Cells
     write_ndigit_number_u(21, 5, cellnum, 1, 0);
         write_ascii_string_pgm(2, 6, PSTR("Warn Voltage   :")); // Warn Voltage
     write_ndigit_number_s_10th(20, 6, min_voltage, 3, 0);
         write_ascii_string_pgm(2, 7, PSTR("Max Voltage    :")); // Max Voltage
     write_ndigit_number_s_10th(20, 7, max_voltage, 3, 0);
         get_eeprom(1);
     //write_ascii_string_pgm(23, 2, vm[COSD_FLAGS & COSD_FLAG_NTSC]);
         if (COSD_FLAGS_CONFIG & COSD_FLAG_NTSC) {
                 write_ascii_string_pgm(23, 2, VM_NTSC);
         } else {
                 write_ascii_string_pgm(23, 2, VM_PAL);
+        }
         // request version from board
         rxd_buffer_locked = 0;
         usart1_EnableTXD();
         #if FCONLY
                 //usart1_request_mk_data(0, 'v', 0);
                 write_ascii_string_pgm(2, 11, PSTR("FC VERSION: ........"));
                 usart1_puts_pgm(PSTR(REQUEST_FC_VERSION));
         #else
                 //usart1_request_mk_data(1, 'v', 0);
                 usart1_puts_pgm(PSTR(REQUEST_NC_VERSION));
                 write_ascii_string_pgm(2, 11, PSTR("NC VERSION: ........"));
         #endif
         usart1_DisableTXD();
         // wait for response
         while (rxd_buffer_locked == 0) {
                 asm("nop");
+        }
         Decode64();
         str_VersionInfo VersionInfo;
         VersionInfo = *((str_VersionInfo*) pRxData);
         write_ndigit_number_u(14, 11, VersionInfo.SWMajor, 3, 1);
         write_ndigit_number_u(18, 11, VersionInfo.SWMinor, 3, 1);
         write_ascii_char(22 + 11*30, 'a' + VersionInfo.SWPatch);
         // end version request
         #if FCONLY
         COSD_DISPLAYMODE %= (sizeof(fcdisplaymodes) / sizeof(displaymode_t));
         mode = fcdisplaymodes;
         mode += COSD_DISPLAYMODE;
         osd_fcmode = (int(*)(void)) pgm_read_word(&mode->dfun);
         // re-request data ever 100ms from FC;
         //usart1_request_mk_data(0, 'd', 100);
         #else
         COSD_DISPLAYMODE %= (sizeof(ncdisplaymodes) / sizeof(displaymode_t));
         mode = ncdisplaymodes;
         mode += COSD_DISPLAYMODE;
         osd_ncmode = (int(*)(void)) pgm_read_word(&mode->dfun);
         // re-request OSD Data from NC every 100ms
         //usart1_request_mk_data(1, 'o', 100);
         #endif
     _delay_ms(3000);
     clear();
     // update flags to paint display again because of clear
     COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN;
+}
 /* ##########################################################################
  * A simple config menu for the flags
  * ##########################################################################*/
 /**
  * helper function for flag display
  */
-void onoff(uint8_t line, uint8_t onoff) {
+void onoff(uint8_t col, uint8_t line, uint8_t onoff) {
         if (onoff) {
-                write_ascii_string_pgm(23, line, PSTR("ON "));
+                write_ascii_string_pgm(col, line, PSTR("ON "));
         } else {
-                write_ascii_string_pgm(23, line, PSTR("OFF"));
+                write_ascii_string_pgm(col, line, PSTR("OFF"));
+        }
+}
 /**
  * helper function for menu updating
  */
 void config_menu_drawings(uint8_t chosen) {
-        uint8_t line = 2;
+        static uint8_t old_y = 0;
+        uint8_t x = MENU_LEFT, y = MENU_TOP, line = MENU_TOP;
+        if (chosen > 5 && chosen < 12) {        // right
+                x = MENU_MIDDLE;
+                y = chosen - 6 + MENU_TOP;
+        } else if (chosen < 7) {
+                y = chosen + MENU_TOP;
+        } else {
+                y = chosen - 6 + MENU_TOP;
+        }
-    // clear prevoius _cursor_
+    // clear prevoius _cursor_ and draw current
-    //write_char_xy(3, line + ((chosen + 11) % 12), 0x00);
+        for (uint8_t myx = MENU_LEFT; myx < 29; myx++) {
-        for (uint8_t x = 2; x < 28; x++) {
+                write_char_att_xy(myx, old_y, 0);
-                write_char_att_xy(x, line + ((chosen + 11) % 12), 0);
+                if (myx > x - 1 && myx < x + 14) {
+                        write_char_att_xy(myx, y, BLACKBG | INVERT);
                 write_char_att_xy(x, line + chosen, BLACKBG | INVERT);
-        };
-        // draw current _cursor_
-        //write_char_xy(3, line + chosen, 0xD9);
+        };
-        write_ascii_string_pgm(4, line, PSTR("Video Mode"));
+        write_ascii_string_pgm(MENU_LEFT, line, PSTR("Video"));
         if (COSD_FLAGS_CONFIG & COSD_FLAG_NTSC) {
-                write_ascii_string_pgm(23, line, VM_NTSC);
+                write_ascii_string_pgm(MENU_LEFT + 10, line, VM_NTSC);
         } else {
-                write_ascii_string_pgm(23, line, VM_PAL);
+                write_ascii_string_pgm(MENU_LEFT + 10, line, VM_PAL);
         }
-        write_ascii_string_pgm(4, ++line, PSTR("Full HUD"));
-        onoff(line, COSD_FLAGS_MODES & COSD_FLAG_HUD);
-        write_ascii_string_pgm(4, ++line, PSTR("Art Horizon in HUD"));
+        write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("Full HUD"));
+        onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_HUD);
+        write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("Horizon"));
-        onoff(line, COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON);
+        onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON);
-        write_ascii_string_pgm(4, ++line, PSTR("Big Vario bar"));
+        write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("Aggr.Hor."));
-        onoff(line, COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO);
+        onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_AGGRHORIZON);
-        write_ascii_string_pgm(4, ++line, PSTR("Statistics"));
+        write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("Stats"));
-    onoff(line, COSD_FLAGS_MODES & COSD_FLAG_STATS);
+    onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_STATS);
-        write_ascii_string_pgm(4, ++line, PSTR("Current by FC"));
-        onoff(line, COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT);
+        write_ascii_string_pgm(MENU_LEFT, ++line, PSTR("A by FC"));
-        write_ascii_string_pgm(4, ++line, PSTR("Voltage by C-Strom"));
+        onoff(MENU_LEFT + 10, line, COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT);
-        onoff(line, COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT);
         // 2nd col
-        write_ascii_string_pgm(4, ++line, PSTR("Reset uptime"));
+        line = 2;
+        write_ascii_string_pgm(MENU_MIDDLE, line, PSTR("V C-Strom"));
+        onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT);
+        write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Height by"));
+        if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) {
+                write_ascii_string_pgm(MENU_MIDDLE + 10, line, PSTR(" GPS"));
+        } else {
+                write_ascii_string_pgm(MENU_MIDDLE + 10, line, PSTR("BARO"));
+        }
+        write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Feet/mph"));
+        onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_FEET);
-        write_ascii_string_pgm(4, ++line, PSTR("Display Mode"));
+        write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Big Vario"));
-        write_ascii_string_pgm(18, line, (const char *) (pgm_read_word(&(mode->desc))));
+        onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO);
         // bottom
-        write_ascii_string_pgm(4, ++line, PSTR("Height by"));
+        write_ascii_string_pgm(MENU_LEFT, 9, PSTR("Reset uptime"));
         if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) {
-                write_ascii_string_pgm(20, line, PSTR(" GPS"));
+        write_ascii_string_pgm(MENU_LEFT, 10, PSTR("Display Mode"));
-        } else {
+        write_ascii_string_pgm(18, 10, (const char *) (pgm_read_word(&(mode->desc))));
                 write_ascii_string_pgm(20, line, PSTR("BARO"));
         write_ascii_string_pgm(MENU_LEFT, 11, PSTR("Save config"));
         write_ascii_string_pgm(MENU_LEFT, 12, PSTR("EXIT"));
         write_ascii_string_pgm(4, ++line, PSTR("Save config"));
-        write_ascii_string_pgm(4, ++line, PSTR("EXIT"));
+        old_y = y;
+}
 /**
  * some sort of clicking response in the menu
  */
 void config_menu_doclick(uint8_t chosen) {
-    write_ascii_string_pgm(4, chosen + 2, PSTR("DONE              "));
+    write_ascii_string_pgm(MENU_LEFT, chosen + MENU_TOP - 6, PSTR("DONE              "));
     _delay_ms(500);
     config_menu_drawings(chosen);
+}
 /**
  * a simple config menu tryout
  */
 void config_menu(void) {
     // disable interrupts (makes the menu more smoothely)
     cli();
     // clear screen
     clear();
     uint8_t chosen = 0;
         uint8_t inmenu = 1;
     write_ascii_string_pgm(6, 1, PSTR("C-OSD Config Menu"));
     // wait a bit before doing stuff so user has chance to release button
     _delay_ms(250);
     config_menu_drawings(chosen);
     while (inmenu) {
         if (s2_pressed()) {
-                        chosen = (chosen + 1) % 12;
+                        chosen = (chosen + 1) % 17;
+                        if (chosen == 10) chosen = 13; // SKIP unused menu space for now
                         config_menu_drawings(chosen);
                         _delay_ms(500);
         } else if (s1_pressed()) {
             switch (chosen) {
                 case 0: // NTSC or PAL
                     COSD_FLAGS_CONFIG ^= COSD_FLAG_NTSC;
                                         // Setup Video Mode
                                         if (COSD_FLAGS_CONFIG & COSD_FLAG_NTSC) {
                                             // NTSC + enable display immediately (VM0)
                                             spi_send_byte(0x00, 0b00001000);
                                                 bottom_line = 12;
                                         } else {
                                             // PAL + enable display immediately (VM0)
                                             spi_send_byte(0x00, 0b01001000);
                                                 bottom_line = 14;
+                                        }
-                    config_menu_drawings(chosen);
                     break;
                 case 1: // full HUD
                     COSD_FLAGS_MODES ^= COSD_FLAG_HUD;
-                    config_menu_drawings(chosen);
                     break;
                 case 2: // art horizon
                     COSD_FLAGS_MODES ^= COSD_FLAG_ARTHORIZON;
-                    config_menu_drawings(chosen);
                     break;
-                case 3: // big vario
+                case 3: // aggressiva horizon
-                    COSD_FLAGS_MODES ^= COSD_FLAG_BIGVARIO;
+                    COSD_FLAGS_MODES ^= COSD_FLAG_AGGRHORIZON;
-                    config_menu_drawings(chosen);
                     break;
                 case 4: // statistics
                     COSD_FLAGS_MODES ^= COSD_FLAG_STATS;
-                    config_menu_drawings(chosen);
                     break;
-                /*case 5: // warnings
-                    COSD_FLAGS_MODES ^= COSD_FLAG_WARNINGS;
-                    config_menu_drawings(chosen);
-                    break;*/
                 case 5: // current by fc
                     COSD_FLAGS_MODES ^= COSD_FLAG_FCCURRENT;
-                    config_menu_drawings(chosen);
                     break;
                                 case 6: // 2nd voltage by c-strom
                     COSD_FLAGS_MODES ^= COSD_FLAG_STROMVOLT;
-                    config_menu_drawings(chosen);
                     break;
+                case 7: // GPS or BARO height
+                    COSD_FLAGS_CONFIG ^= COSD_FLAG_GPSHEIGHT;
+                    break;
+                case 8: // Feet and mph?
+                    COSD_FLAGS_CONFIG ^= COSD_FLAG_FEET;
+                    break;
+                                case 9: // big vario
+                    COSD_FLAGS_MODES ^= COSD_FLAG_BIGVARIO;
+                    break;
-                case 7: // reset uptime
+                case 13: // reset uptime
                     uptime = 0;
-                    config_menu_doclick(chosen);
+                                        config_menu_doclick(chosen);
                     break;
-                case 8: // change mode
+                case 14: // 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);
                                         #else
                                         COSD_DISPLAYMODE = (COSD_DISPLAYMODE + 1) % (sizeof(ncdisplaymodes) / sizeof(displaymode_t));
                                         mode = ncdisplaymodes;
                                         mode += COSD_DISPLAYMODE;
                                         osd_ncmode = (int(*)(void)) pgm_read_word(&mode->dfun);
                                         #endif
-                                        config_menu_drawings(chosen);
                     break;
-                case 9: // GPS or BARO height
-                    COSD_FLAGS_CONFIG ^= COSD_FLAG_GPSHEIGHT;
-                    config_menu_drawings(chosen);
-                    break;
-                case 10: // save
+                case 15: // save
                     save_eeprom();
-                    config_menu_doclick(chosen);
+                                        config_menu_doclick(chosen);
                     break;
-                case 11: // exit
+                case 16: // exit
                                         inmenu = 0;
+                                        config_menu_doclick(chosen);
                     break;
+            }
+                        config_menu_drawings(chosen);
             _delay_ms(250);
+        }
+    }
     // clear screen up again
     clear();
     // update flags to paint display again if needed
     COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN;
     // enable interrupts again
     sei();
+}
 #endif

Subversion Repositories Projects

(root)/C-OSD/trunk/config.c - Rev 738 → 757