WebSVN - Projects - Diff - Rev 835 and 837

 #include <util/delay.h>
 #include "max7456_software_spi.h"
 #include "config.h"
 #include "buttons.h"
 #include "usart1.h"
+#include "osd_helpers.h"
 #if !(ALLCHARSDEBUG|(WRITECHARS != -1))
 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] = {
+, 5,
+, 5,
+, 10,
-uint8_t EEMEM ee_COSD_FLAGS_CONFIG = 0;
+, 10
-uint8_t EEMEM ee_COSD_DISPLAYMODE = 0;
+};
         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++) {
+            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++) {
+        eeprom_write_byte(&ee_COSD_SCOPE[i], scope[i]);
+    }
+}
 /**
  * auto config some stuff on startup, currently only battery cells
     usart1_request_blocking('V', PSTR(REQUEST_FC_VERSION));
 #else
     usart1_request_nc_uart();
     _delay_ms(200);
     usart1_request_nc_uart();
     //usart1_request_mk_data(1, 'v', 0);
     write_ascii_string_pgm(2, 11, PSTR("NC VERSION: ........"));
     usart1_request_blocking('V', PSTR(REQUEST_NC_VERSION));
 #endif
     str_VersionInfo VersionInfo;
  */
 void config_menu_drawings(uint8_t chosen) {
     static uint8_t old_y = 0;
     uint8_t x = MENU_LEFT, y = MENU_TOP, line = MENU_TOP;
-    if (chosen > 5 && chosen < 12) { // right
+    if (chosen > 5 && chosen < 13) { // right
         x = MENU_MIDDLE;
         y = chosen - 6 + MENU_TOP;
     } else if (chosen < 7) {
         y = chosen + MENU_TOP;
     onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO);
     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("?????"));
+    write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("Move Scope"));
     onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_PASSIVE);*/
     _delay_ms(500);
     config_menu_drawings(chosen);
+}
+/**
+ * move around the four scope edges
+ */
+void move_scope() {
+    uint8_t mode = 0;
+    clear();
+    draw_scope();
+    _delay_ms(500);
+    while (mode < 8) {
+        if (s2_pressed()) { // next
+            mode++;
+            _delay_ms(500);
+        } else if (s1_pressed()) {
+            scope[mode] = (scope[mode] + 1) % (mode % 2 == 0 ? 30 : bottom_line);
+            clear();
+            draw_scope();
+            _delay_ms(100);
+        }
+    }
+    clear();
+}
 /**
  * a simple config menu tryout
  */
 void config_menu(void) {
     // disable interrupts (makes the menu more smoothely)
     config_menu_drawings(chosen);
     while (inmenu) {
         if (s2_pressed()) {
             chosen = (chosen + 1) % 17;
-            if (chosen == 11) chosen = 13; // SKIP unused menu space for now
+            //if (chosen == 12) chosen = 13; // SKIP unused menu space for now
             config_menu_drawings(chosen);
             _delay_ms(500);
         } else if (s1_pressed()) {
             switch (chosen) {
                     COSD_FLAGS_MODES ^= COSD_FLAG_BIGVARIO;
                     break;
                 case 10: // passive
                     COSD_FLAGS_CONFIG ^= COSD_FLAG_PASSIVE;
                     break;
+                case 11: // scope
+                    COSD_FLAGS_CONFIG ^= COSD_FLAG_SHOW_SCOPE;
+                    break;
+                case 12: // move scope
+                    move_scope();
+                    break;
                 case 13: // reset uptime
                     uptime = 0;
                     config_menu_doclick(chosen);
                     break;
                 case 14: // change mode

Subversion Repositories Projects

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