Do more RX checks in the IRQ handler.

[openparking.git] / firmware / modbus.c

diff --git a/firmware/modbus.c b/firmware/modbus.c
index 4e8456354e1a5385d630eb7f4cd59cff0f6606a3..e45f5f0f7ba9064472ba9ff6510ac5e4fdc5df3b 100644 (file)
--- a/firmware/modbus.c
+++ b/firmware/modbus.c
@@ -159,7 +159,7 @@ static mb_exception write_single_reg(uint16_t reg, uint16_t val)
        return MB_OK;
 }
 
-void modbus_poll()
+uint8_t modbus_poll()
 {
        bufptr_t packet_len;
        uint16_t crc;
@@ -167,22 +167,14 @@ void modbus_poll()
 
        ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
                if (transmitting)
-                       return;
-
-               if (buf_len == 0) // nothing received yet
-                       return;
+                       return 0;
 
                if (get_clock() - last_rx < REQ_TIMEOUT) // still receiving
-                       return;
-
-               if (buf_len < 4) { // too short
-                       buf_len = 0;
-                       return;
-               }
+                       return 0;
 
-               if (buffer[0] != mb_unit_id) { // not for myself
+               if (buf_len < 4) { // too short (or not for us)
                        buf_len = 0;
-                       return;
+                       return 0;
                }
 
                transmitting = 1; // disable further reads
@@ -197,7 +189,7 @@ void modbus_poll()
                        transmitting = 0;
                        buf_len = 0;
                }
-               return;
+               return 1;
        }
 
        packet_len -= 2; // strip the CRC
@@ -234,21 +226,35 @@ void modbus_poll()
        tx_ptr = 0;
        ctl_pin_on();
        UCSR0B |= _BV(UDRIE0);
+
+       return 1;
 }
 
 ISR(USART_RX_vect)
 {
        uint8_t rx_byte = UDR0;
+       clock_t now = get_clock();
+
+       if (transmitting) // how did we get here? discard it
+               goto out;
 
-       if (transmitting) // discard it
-               return;
+       if (buf_len && buffer[0] != mb_unit_id) // not for us
+               goto out;
 
-       buffer[buf_len] = rx_byte;
+       if (buf_len == BUFSIZE) { // overrun - discard the packet
+               buffer[0] = 0xFF;
+               buf_len = 1;
+               goto out;
+       }
 
-       if (buf_len + 1 < BUFSIZE) // ignore overruns
-               buf_len++;
+       if (now - last_rx >= REQ_TIMEOUT) { // new packet; start over
+               buf_len = 0;
+       }
 
-       last_rx = get_clock();
+       // TODO: we can probably calculate the CRC here as well
+       buffer[buf_len++] = rx_byte;
+out:
+       last_rx = now;
 }
 
 ISR(USART_TX_vect)