61,7 → 61,7 |
#if !(ALLCHARSDEBUG|(WRITECHARS != -1)) |
|
volatile NaviData_t naviData; |
volatile DebugOut_t debugData; |
volatile str_DebugOut debugData; |
|
// cache old vars for blinking attribute, checkup is faster than full |
// attribute write each time |
139,20 → 139,24 |
const char str_2[] PROGMEM = "minimal"; |
const char str_3[] PROGMEM = " jopl"; |
|
const displaymode_t ncdisplaymodes[] PROGMEM = { |
{ osd_ncmode_default, (char *)str_1}, |
{ osd_ncmode_minimal, (char *)str_2} |
}; |
|
#if FCONLY |
const displaymode_t fcdisplaymodes[] PROGMEM = { |
{ osd_fcmode_default, (char *)str_1}, |
{ osd_fcmode_jopl, (char *)str_3} |
}; |
int (*osd_fcmode)(void) = (int(*)(void)) & osd_fcmode_default; |
#else |
|
const displaymode_t ncdisplaymodes[] PROGMEM = { |
{ osd_ncmode_default, (char *)str_1}, |
{ osd_ncmode_minimal, (char *)str_2} |
}; |
int (*osd_ncmode)(void) = (int(*)(void)) & osd_ncmode_default; |
int (*osd_fcmode)(void) = (int(*)(void)) & osd_fcmode_default; |
#endif |
|
|
#endif |
|
/* ########################################################################## |
* Interrupt handler |
* ##########################################################################*/ |
334,6 → 338,7 |
// clear serial screen |
//usart1_puts("\x1B[2J\x1B[H"); |
|
|
while (1) { |
// in case SPI is ready and there is nothing to send right now |
if (!icnt && spi_ready) { |
360,7 → 365,7 |
#if FCONLY |
if (rxd_buffer[2] == 'D') { // FC Data |
Decode64(); |
debugData = *((DebugOut_t*)pRxData); |
debugData = *((str_DebugOut*)pRxData); |
|
// init on first data retrival, distinguished by last battery :) |
if (last_UBat == 255) { |
436,6 → 441,10 |
config_menu(); |
} |
if (seconds_since_last_data > 0) { |
#if !FCONLY |
usart1_request_nc_uart(); |
#endif |
|
usart1_EnableTXD(); |
//usart1_puts_pgm(PSTR("zu alt\r\n")); |
#if FCONLY |
442,7 → 451,7 |
// request data ever 100ms from FC; |
//usart1_request_mk_data(0, 'd', 100); |
usart1_puts_pgm(PSTR(REQUEST_DBG_DATA)); |
#else |
#else |
// request OSD Data from NC every 100ms |
//usart1_request_mk_data(1, 'o', 100); |
usart1_puts_pgm(PSTR(REQUEST_OSD_DATA)); |