Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 737 → Rev 738

/C-OSD/trunk/main.c
223,7 → 223,6
#endif
 
 
 
// set up Atmega162 Ports
DDRA |= (1 << PA1); // PA1 output (/CS)
MAX_CS_HIGH
296,6 → 295,9
// init usart
usart1_init();
 
// keep serial port clean
usart1_DisableTXD();
 
// set up timer
// CTC, Prescaler /64
TCCR0 = (1 << WGM01) | (0 << WGM00) | (0 << CS02) | (1 << CS01) | (1 << CS00);
338,17 → 340,6
//usart1_puts("\x1B[2J\x1B[H");
//usart1_puts("hello world!123\r\n");
 
#if FCONLY
// request data ever 100ms from FC;
usart1_request_mk_data(0, 'd', 100);
#else
// request OSD Data from NC every 100ms
usart1_request_mk_data(1, 'o', 100);
 
// and disable debug...
usart1_request_mk_data(0, 'd', 0);
#endif
 
while (1) {
// in case SPI is ready and there is nothing to send right now
if (!icnt && spi_ready) {
388,6 → 379,7
} else {
osd_fcmode();
}
seconds_since_last_data = 0;
}
#else
if (rxd_buffer[2] == 'O') { // NC OSD Data
405,6 → 397,7
} else {
osd_ncmode();
}
//seconds_since_last_data = 0;
}
#endif
rxd_buffer_locked = 0;
413,20 → 406,24
if (s1_pressed()) {
config_menu();
}
if (seconds_since_last_data > 2) {
if (seconds_since_last_data > 0) {
usart1_EnableTXD();
//usart1_puts_pgm(PSTR("zu alt\r\n"));
#if FCONLY
// request data ever 100ms from FC;
usart1_request_mk_data(0, 'd', 100);
//usart1_request_mk_data(0, 'd', 100);
usart1_puts_pgm(PSTR(REQUEST_DBG_DATA));
#else
// request OSD Data from NC every 100ms
usart1_request_mk_data(1, 'o', 100);
//usart1_request_mk_data(1, 'o', 100);
usart1_puts_pgm(PSTR(REQUEST_OSD_DATA));
 
// and disable debug...
usart1_request_mk_data(0, 'd', 0);
 
//usart1_request_mk_data(0, 'd', 0);
#endif
// reset last time counter
seconds_since_last_data = 0;
#endif
usart1_DisableTXD();
}
}
#endif