/C-OSD/trunk/CHANGE.LOG |
---|
17,6 → 17,8 |
* Free Software Foundation, Inc., * |
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
****************************************************************************/ |
20090419-2145 |
*reset-bug workaround in usart1.c: usart1_DisableTXD and usart1_EnableTXD |
20090419-1900 |
*fixed bug in heading-fine conv for bearing to home |
/C-OSD/trunk/main.c |
---|
674,7 → 674,7 |
usart1_request_mk_data(0, 'd', 0); |
// disable TXD-pin |
usart1_DisableTXD(); |
//usart1_DisableTXD(); |
// stats for after flight |
int16_t max_Altimeter = 0; |
794,7 → 794,7 |
write_char_xy(22, 7, 204); // small meters m |
write_ascii_string_pgm(2, 8, stats_item_pointers[3]); // min voltage |
write_ndigit_number_u_10th(18, 8, min_UBat, 100, 0); |
write_ascii_string(22, 8, "V"); // voltage |
write_char_xy(22, 8, 0x9E); // small v |
write_ascii_string_pgm(2, 9, stats_item_pointers[4]); // max time |
write_time(16, 9, max_FlyingTime); |
write_char_xy(22, 9, 210); // fly clock |
854,9 → 854,14 |
config_menu(); |
} |
if (seconds_since_last_data > 2) { |
/*if (COSD_FLAGS & COSD_FLAG_HUD) { |
write_ascii_string(2, 3, "ERROR: NO DATA for"); |
write_time(21, 3, seconds_since_last_data); |
}*/ |
// request OSD Data from NC every 100ms |
usart1_request_mk_data(1, 'o', 100); |
seconds_since_last_data = 0; |
_delay_ms(200); |
//seconds_since_last_data = 0; |
} |
} |
#endif |
/C-OSD/trunk/usart1.c |
---|
53,8 → 53,8 |
* disable the txd pin of usart1 |
*/ |
void usart1_DisableTXD(void) { |
UCSR1B &= ~(1 << TXCIE1); // disable TX-Interrupt |
UCSR1B &= ~(1 << TXEN1); // disable TXD in USART |
//UCSR1B &= ~(1 << TXCIE1); // disable TX-Interrupt |
UCSR1B &= ~(1 << TXEN1); // disable TX in USART |
DDRB &= ~(1<<DDB3); // set TXD pin as input |
PORTB &= ~(1 << PORTB3); |
} |
66,7 → 66,7 |
DDRB |= (1<<DDB3); // set TXD pin as output |
PORTB &= ~(1 << PORTB3); |
UCSR1B |= (1 << TXEN1); // enable TX in USART |
UCSR1B |= (1 << TXCIE1); // disable TX-Interrupt |
//UCSR1B |= (1 << TXCIE1); // enable TX-Interrupt |
} |
90,6 → 90,13 |
} |
/** |
* transmit interrupt handler |
* unused |
*/ |
SIGNAL(SIG_USART1_DATA) { |
} |
/** |
* receive data through usart1 |
* portions taken and adapted from |
* http://svn.mikrokopter.de/mikrowebsvn/filedetails.php?repname=FlightCtrl&path=%2Fbranches%2FV0.72p+Code+Redesign+killagreg%2Fuart0.c |
239,7 → 246,7 |
unsigned char mstenth = ms/10; |
sendMKData(label, address, &mstenth, 1); |
// disable TXD pin again |
usart1_DisableTXD(); |
} |
/C-OSD/trunk/usart1.h |
---|
53,6 → 53,12 |
void usart1_puts(char*); |
/** |
* transmit interrupt handler |
* unused |
*/ |
SIGNAL(SIG_USART1_DATA); |
/** |
* receive data through usart1 |
* portions taken and adapted from |
* http://svn.mikrokopter.de/mikrowebsvn/filedetails.php?repname=FlightCtrl&path=%2Fbranches%2FV0.72p+Code+Redesign+killagreg%2Fuart0.c |