X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fmodbus.c;fp=firmware%2Fmodbus.c;h=2b2a255bedc15d8523d30a9b5d8d518421de5331;hb=db62b021ea5b82e91eaacb345ad81439a4cb41dc;hp=0c238c2a9b00d655522bcafee847753a2b80ba2d;hpb=dc770d3e8804b9cb81fd1d0c7fc7336a14dd7c1f;p=openparking.git diff --git a/firmware/modbus.c b/firmware/modbus.c index 0c238c2..2b2a255 100644 --- a/firmware/modbus.c +++ b/firmware/modbus.c @@ -43,7 +43,6 @@ static uint8_t mb_unit_id; #define UART_BAUD 9600 #define UBRR_VAL ((F_CPU + 8UL * UART_BAUD) / (16UL*UART_BAUD) - 1) -#define wait_one_byte() _delay_us(10*1000000/UART_BAUD) /* * According to Wikipedia, it is indeed 28 bits = 3.5 bytes without @@ -267,14 +266,19 @@ ISR(USART_RX_vect) } } +ISR(USART_TX_vect) +{ + UCSR0B &= ~_BV(TXCIE0); // disable further IRQs + ctl_pin_off(); +} + ISR(USART_UDRE_vect) { ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { if (tx_head == tx_tail) { + UCSR0B |= _BV(TXCIE0); // enable xmit complete irq UCSR0B &= ~_BV(UDRIE0); tx_tail = tx_head = 0; - wait_one_byte(); // FIXME: too long busy-wait - ctl_pin_off(); } else { UDR0 = txbuf[tx_tail]; tx_tail = bufptr_inc(tx_tail);