Timeout tuning

[openparking.git] / firmware / firmware.c

diff --git a/firmware/firmware.c b/firmware/firmware.c
index d70705d5993c25a2ce5829200e12d38a2349c6c3..f77e67a570377132a7bcaf815c207be5ed3dad05 100644 (file)
--- a/firmware/firmware.c
+++ b/firmware/firmware.c
@@ -5,8 +5,8 @@
 #include "clock.h"
 #include "modbus.h"
 
-#define ECHO_TIMEOUT           (CLOCK_HZ/10)   // 10 ms
-#define MEASUREMENT_WAIT       (CLOCK_HZ/3)    // three triggers per second
+#define ECHO_TIMEOUT           (CLOCK_HZ/20)   // 50 ms
+#define MEASUREMENT_WAIT       (4*ECHO_TIMEOUT)
 
 #define N_TRIGGERS 3
 #define N_SENSORS 12
@@ -85,37 +85,66 @@ static void do_measurement(unsigned char trig)
                        distances[trig*N_TRIG_SENSORS + i] = 0;
 }
 
-static void do_measurements()
-{
-       uint8_t trig;
-
-       for (trig = 0; trig < N_TRIGGERS; trig++) {
-               do_measurement(trig);
-               _delay_ms(200);
-       }
-}
-
 static void led_set(uint8_t led, uint8_t state)
 {
        if (led == 0) {
-               if (state) {
-                       PORTC |= _BV(PC5);
-                       led_bitmap |= 1;
-               } else {
-                       PORTC &= ~_BV(PC5);
+               switch (state) {
+               case 0:
                        led_bitmap &= ~1;
+                       led_bitmap &= ~2;
+                       break;
+               case 1:
+                       led_bitmap |= 1;
+                       led_bitmap &= ~2;
+                       break;
+               default: // error
+                       led_bitmap |= 2;
+                       break;
                }
        } else {
-               if (state) {
-                       PORTB |= _BV(PB5);
-                       led_bitmap |= 2;
-               } else {
-                       PORTB &= ~_BV(PB5);
-                       led_bitmap &= ~2;
+               switch (state) {
+               case 0:
+                       led_bitmap &= ~4;
+                       led_bitmap &= ~8;
+                       break;
+               case 1:
+                       led_bitmap |= 4;
+                       led_bitmap &= ~8;
+                       break;
+               default:
+                       led_bitmap |= 8;
+                       break;
                }
        }
 }
 
+static void leds_update()
+{
+       if (led_bitmap & 1) {
+               PORTC |= _BV(PC5);
+       } else {
+               PORTC &= ~_BV(PC5);
+       }
+
+       if (led_bitmap & 2) {
+               DDRC &= ~_BV(PC5);
+       } else {
+               DDRC |= _BV(PC5);
+       }
+
+       if (led_bitmap & 4) {
+               PORTB |= _BV(PB5);
+       } else {
+               PORTB &= ~_BV(PB5);
+       }
+
+       if (led_bitmap & 8) {
+               DDRB |= _BV(PB5);
+       } else {
+               DDRB &= ~_BV(PB5);
+       }
+}
+
 static void eval_bitmaps()
 {
        uint16_t free_b = 0, err_b = 0, mask;
@@ -137,7 +166,9 @@ static void eval_bitmaps()
        err_bitmap  = err_b;
 
        if (led1_sensors) {
-               if (led1_sensors & free_bitmap) {
+               if (led1_sensors & err_bitmap) {
+                       led_set(0, 2);
+               } else if (led1_sensors & free_bitmap) {
                        led_set(0, 1);
                } else {
                        led_set(0, 0);
@@ -145,7 +176,9 @@ static void eval_bitmaps()
        }
 
        if (led2_sensors) {
-               if (led2_sensors & free_bitmap) {
+               if (led2_sensors & err_bitmap) {
+                       led_set(1, 2);
+               } else if (led2_sensors & free_bitmap) {
                        led_set(1, 1);
                } else {
                        led_set(1, 0);
@@ -188,6 +221,7 @@ int main()
                }
 
                eval_bitmaps();
+               leds_update(); // might be written from modbus
 //             led_set(0,
 //                     distances[4] > 100 || distances[11] > 100);
        }