33,7 → 33,8 |
uint8_t EEMEM ee_checkbyte2 = CHECKBYTE2; |
uint16_t EEMEM ee_cal_ampere = 512; |
uint8_t EEMEM ee_sensor = 50; |
uint8_t EEMEM ee_COSD_FLAGS; |
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)) |
66,10 → 67,11 |
const char menu_item6[] PROGMEM = "Voltage by C-Strom"; |
const char menu_item7[] PROGMEM = "Reset uptime"; |
const char menu_item8[] PROGMEM = "Display Mode"; |
const char menu_item9[] PROGMEM = "Save config"; |
const char menu_item10[] PROGMEM = "EXIT"; |
const char menu_item9[] PROGMEM = "Height by"; |
const char menu_item10[] PROGMEM = "Save config"; |
const char menu_item11[] PROGMEM = "EXIT"; |
const char* menu[] = {menu_item0, menu_item1, menu_item2, menu_item3, menu_item4, |
menu_item5, menu_item6, menu_item7, menu_item8, menu_item9, menu_item10}; |
menu_item5, menu_item6, menu_item7, menu_item8, menu_item9, menu_item10, menu_item11}; |
|
const displaymode_t * mode; |
|
87,7 → 89,8 |
#if !(ALLCHARSDEBUG|(WRITECHARS != -1)) |
if (verbose) write_ascii_string_pgm(2, 9, ee_msg[0]); // Loading data |
#endif |
COSD_FLAGS = eeprom_read_byte(&ee_COSD_FLAGS); |
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 { |
105,7 → 108,8 |
void save_eeprom() { |
eeprom_write_byte(&ee_checkbyte1, CHECKBYTE1); |
eeprom_write_byte(&ee_checkbyte2, CHECKBYTE2); |
eeprom_write_byte(&ee_COSD_FLAGS, COSD_FLAGS); |
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); |
} |
|
124,7 → 128,7 |
write_ascii_string_pgm(2, 2, init_point[2]); // NaviCtrl Mode |
//write_ascii_string(2, 2, "NaviCtrl Mode"); |
#endif |
write_ascii_string(2, 3, BUILDDATE); |
write_ascii_string_pgm(2, 3, PSTR(BUILDDATE)); |
uint8_t cellnum = 0; |
if (CELL_NUM == -1) { |
write_ascii_string_pgm(2, 4, init_point[3]); // Guessing Number of Cells |
150,7 → 154,7 |
get_eeprom(1); |
|
//write_ascii_string_pgm(23, 2, vm[COSD_FLAGS & COSD_FLAG_NTSC]); |
if (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); |
172,7 → 176,7 |
_delay_ms(200); |
clear(); |
// update flags to paint display again because of clear |
COSD_FLAGS2 &= ~COSD_ICONS_WRITTEN; |
COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN; |
} |
|
/* ########################################################################## |
188,38 → 192,38 |
// draw current _cursor_ |
write_ascii_string(3, chosen + 2, ">"); |
|
if (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); |
} |
|
if (COSD_FLAGS & COSD_FLAG_HUD) { |
if (COSD_FLAGS_MODES & COSD_FLAG_HUD) { |
write_ascii_string_pgm(23, 3, ON); |
} else { |
write_ascii_string_pgm(23, 3, OFF); |
} |
if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) { |
if (COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON) { |
write_ascii_string_pgm(23, 4, ON); |
} else { |
write_ascii_string_pgm(23, 4, OFF); |
} |
if (COSD_FLAGS & COSD_FLAG_BIGVARIO) { |
if (COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO) { |
write_ascii_string_pgm(23, 5, ON); |
} else { |
write_ascii_string_pgm(23, 5, OFF); |
} |
if (COSD_FLAGS & COSD_FLAG_STATS) { |
if (COSD_FLAGS_MODES & COSD_FLAG_STATS) { |
write_ascii_string_pgm(23, 6, ON); |
} else { |
write_ascii_string_pgm(23, 6, OFF); |
} |
if (COSD_FLAGS & COSD_FLAG_WARNINGS) { |
if (COSD_FLAGS_MODES & COSD_FLAG_WARNINGS) { |
write_ascii_string_pgm(23, 7, ON); |
} else { |
write_ascii_string_pgm(23, 7, OFF); |
} |
if (COSD_FLAGS & COSD_FLAG_STROMVOLT) { |
if (COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
write_ascii_string_pgm(23, 8, ON); |
} else { |
write_ascii_string_pgm(23, 8, OFF); |
227,6 → 231,11 |
//write_ndigit_number_u(23, 10, COSD_DISPLAYMODE, 2, 0); |
write_ascii_string_pgm(18, 10, (const char *) (pgm_read_word(&(mode->desc)))); |
|
if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
write_ascii_string_pgm(20, 11, PSTR(" GPS")); |
} else { |
write_ascii_string_pgm(20, 11, PSTR("BARO")); |
} |
} |
|
/** |
233,7 → 242,7 |
* some sort of clicking response in the menu |
*/ |
void config_menu_doclick(uint8_t chosen, const char* menu[]) { |
write_ascii_string(4, chosen + 2, "DONE "); |
write_ascii_string_pgm(4, chosen + 2, PSTR("DONE ")); |
_delay_ms(500); |
write_ascii_string_pgm(4, chosen + 2, menu[chosen]); |
} |
250,7 → 259,7 |
|
uint8_t inmenu = 1; |
uint8_t chosen = 0; |
write_ascii_string(6, 1, "C-OSD Config Menu"); |
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); |
266,6 → 275,7 |
write_ascii_string_pgm(4, 10, menu[8]); |
write_ascii_string_pgm(4, 11, menu[9]); |
write_ascii_string_pgm(4, 12, menu[10]); |
write_ascii_string_pgm(4, 13, menu[11]); |
|
config_menu_drawings(chosen); |
|
272,15 → 282,15 |
while (inmenu) { |
if (s2_pressed()) { |
write_ascii_string(3, chosen + 2, " "); |
chosen = (chosen + 1) % 11; |
chosen = (chosen + 1) % 12; |
write_ascii_string(3, chosen + 2, ">"); |
_delay_ms(500); |
} else if (s1_pressed()) { |
switch (chosen) { |
case 0: // full HUD |
COSD_FLAGS ^= COSD_FLAG_NTSC; |
case 0: // NTSC or PAL |
COSD_FLAGS_CONFIG ^= COSD_FLAG_NTSC; |
// Setup Video Mode |
if (COSD_FLAGS & COSD_FLAG_NTSC) { |
if (COSD_FLAGS_CONFIG & COSD_FLAG_NTSC) { |
// NTSC + enable display immediately (VM0) |
spi_send_byte(0x00, 0b00001000); |
|
294,27 → 304,27 |
config_menu_drawings(chosen); |
break; |
case 1: // full HUD |
COSD_FLAGS ^= COSD_FLAG_HUD; |
COSD_FLAGS_MODES ^= COSD_FLAG_HUD; |
config_menu_drawings(chosen); |
break; |
case 2: // art horizon |
COSD_FLAGS ^= COSD_FLAG_ARTHORIZON; |
COSD_FLAGS_MODES ^= COSD_FLAG_ARTHORIZON; |
config_menu_drawings(chosen); |
break; |
case 3: // big vario |
COSD_FLAGS ^= COSD_FLAG_BIGVARIO; |
COSD_FLAGS_MODES ^= COSD_FLAG_BIGVARIO; |
config_menu_drawings(chosen); |
break; |
case 4: // statistics |
COSD_FLAGS ^= COSD_FLAG_STATS; |
COSD_FLAGS_MODES ^= COSD_FLAG_STATS; |
config_menu_drawings(chosen); |
break; |
case 5: // warnings |
COSD_FLAGS ^= COSD_FLAG_WARNINGS; |
COSD_FLAGS_MODES ^= COSD_FLAG_WARNINGS; |
config_menu_drawings(chosen); |
break; |
case 6: // 2nd voltage by c-strom |
COSD_FLAGS ^= COSD_FLAG_STROMVOLT; |
COSD_FLAGS_MODES ^= COSD_FLAG_STROMVOLT; |
config_menu_drawings(chosen); |
break; |
case 7: // reset uptime |
335,11 → 345,15 |
#endif |
config_menu_drawings(chosen); |
break; |
case 9: // save |
case 9: // GPS or BARO height |
COSD_FLAGS_CONFIG ^= COSD_FLAG_GPSHEIGHT; |
config_menu_drawings(chosen); |
break; |
case 10: // save |
save_eeprom(); |
config_menu_doclick(chosen, menu); |
break; |
case 10: // exit |
case 11: // exit |
inmenu = 0; |
break; |
} |
351,7 → 365,7 |
clear(); |
|
// update flags to paint display again if needed |
COSD_FLAGS2 &= ~COSD_ICONS_WRITTEN; |
COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN; |
|
// enable interrupts again |
sei(); |