From 553c44a93f92e314a6c9dd35c933d5ae0f18b6a3 Mon Sep 17 00:00:00 2001 From: Simen Svale Skogsrud Date: Sun, 5 Jun 2011 20:54:23 +0200 Subject: [PATCH] Fixed serial.c after tests on real hardware --- main.c | 4 ++-- serial.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 29d37da..b56bf6f 100644 --- a/main.c +++ b/main.c @@ -36,6 +36,8 @@ int main(void) { + sei(); + serial_init(BAUD_RATE); protocol_init(); settings_init(); @@ -44,8 +46,6 @@ int main(void) spindle_init(); gc_init(); limits_init(); - - sei(); for(;;){ sleep_mode(); // Wait for it ... diff --git a/serial.c b/serial.c index 2d7aaf7..ee63096 100644 --- a/serial.c +++ b/serial.c @@ -42,12 +42,16 @@ uint8_t tx_buffer[TX_BUFFER_SIZE]; uint8_t tx_buffer_head = 0; volatile uint8_t tx_buffer_tail = 0; +static void set_baud_rate(long baud) { + uint16_t UBRR0_value = ((F_CPU / 16 + baud / 2) / baud - 1); + UBRR0H = UBRR0_value >> 8; + UBRR0L = UBRR0_value; +} void serial_init(long baud) { - UBRR0H = ((F_CPU / 16 + baud / 2) / baud - 1) >> 8; - UBRR0L = ((F_CPU / 16 + baud / 2) / baud - 1); - + set_baud_rate(baud); + /* baud doubler off - Only needed on Uno XXX */ UCSR0A &= ~(1 << U2X0); @@ -96,8 +100,7 @@ SIGNAL(USART_UDRE_vect) { uint8_t serial_read() { - if (rx_buffer_head != rx_buffer_tail) { - // Return magic number if no data pending + if (rx_buffer_head == rx_buffer_tail) { return SERIAL_NO_DATA; } else { uint8_t data = rx_buffer[rx_buffer_tail];