/C-OSD/trunk/CHANGE.LOG |
---|
18,6 → 18,13 |
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
****************************************************************************/ |
20101008-0945 |
*fixed EPi-Strom voltage-display when using FC-Ampere |
20101007-1555 |
*added passive option: OSD will NOT request data after bootup |
20100908-2335 |
*fixed height-offset causing different height values in OSD compared to MK-Tool when using baro-height (thx Neo360) |
/C-OSD/trunk/config.c |
---|
150,6 → 150,9 |
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)); |
185,6 → 188,9 |
clear(); |
// update flags to paint display again because of clear |
COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN; |
// we got data |
COSD_FLAGS_RUNTIME |= COSD_DATARECEIVED; |
} |
/* ########################################################################## |
267,7 → 273,12 |
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("Passive")); |
onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_PASSIVE); |
/*write_ascii_string_pgm(MENU_MIDDLE, ++line, PSTR("?????")); |
onoff(MENU_MIDDLE + 10, line, COSD_FLAGS_CONFIG & COSD_FLAG_PASSIVE);*/ |
// bottom |
write_ascii_string_pgm(MENU_LEFT, 9, PSTR("Reset uptime")); |
311,7 → 322,7 |
while (inmenu) { |
if (s2_pressed()) { |
chosen = (chosen + 1) % 17; |
if (chosen == 10) chosen = 13; // SKIP unused menu space for now |
if (chosen == 11) chosen = 13; // SKIP unused menu space for now |
config_menu_drawings(chosen); |
_delay_ms(500); |
} else if (s1_pressed()) { |
358,6 → 369,9 |
case 9: // big vario |
COSD_FLAGS_MODES ^= COSD_FLAG_BIGVARIO; |
break; |
case 10: // passive |
COSD_FLAGS_CONFIG ^= COSD_FLAG_PASSIVE; |
break; |
case 13: // reset uptime |
uptime = 0; |
config_menu_doclick(chosen); |
/C-OSD/trunk/default/dist.bat |
---|
19,7 → 19,7 |
:: * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
:: ****************************************************************************/ |
set DATE=20100908-2335 |
set DATE=20101008-0945 |
:: date /T |
/C-OSD/trunk/main.c |
---|
338,6 → 338,7 |
// clear serial screen |
//usart1_puts("\x1B[2J\x1B[H"); |
COSD_FLAGS_RUNTIME &= ~COSD_DATARECEIVED; |
#if !FCONLY |
usart1_request_nc_uart(); |
#endif |
443,7 → 444,10 |
if (s1_pressed()) { |
config_menu(); |
} |
if (seconds_since_last_data > 0) { |
// reqest data untill there has been some answer |
if (!(COSD_FLAGS_RUNTIME & COSD_DATARECEIVED) || |
// or while not in passive mode |
(seconds_since_last_data > 0 && !(COSD_FLAGS_CONFIG & COSD_FLAG_PASSIVE))) { |
usart1_EnableTXD(); |
//usart1_puts_pgm(PSTR("zu alt\r\n")); |
#if FCONLY |
/C-OSD/trunk/main.h |
---|
95,6 → 95,7 |
#define COSD_FLAG_GPSHEIGHT 2 |
#define COSD_FLAG_FCMODE 4 |
#define COSD_FLAG_FEET 8 |
#define COSD_FLAG_PASSIVE 16 |
/* ########################################################################## |
* FLAGS only usable during runtime (not saved) |
102,6 → 103,7 |
#define COSD_FLAG_STROMREC 1 |
#define COSD_ICONS_WRITTEN 2 |
#define COSD_WASFLYING 4 |
#define COSD_DATARECEIVED 8 |
/* ########################################################################## |
* LED controll |
/C-OSD/trunk/osd_ncmode_default.c |
---|
245,14 → 245,14 |
//write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0); |
write_ndigit_number_u_10th(2, bottom_line - 1, ampere / 10, 4, 0); |
write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 4, 0); |
if (COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0); |
} |
} else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) { |
write_ndigit_number_u_10th(2, bottom_line - 1, naviData.Current, 4, 0); |
write_ndigit_number_u(10, bottom_line - 1, naviData.UsedCapacity, 4, 0); |
} |
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0); |
} |
//DEBUGwrite_ndigit_number_u(1, 5, COSD_FLAGS_MODES, 3, 0); |
// bottom line |
/C-OSD/trunk/usart1.c |
---|
227,7 → 227,7 |
wait = 0; |
while (rxd_buffer_locked == 0 && wait < 150) { |
wait++; |
_delay_ms(10); |
_delay_ms(50); |
} |
} |
Decode64(); |