altos: Use fast timer for buttons instead of edge-triggered ISR

[fw/altos] / src / drivers / ao_button.c

diff --git a/src/drivers/ao_button.c b/src/drivers/ao_button.c
index 07e92c670f3a1c590aed332b875d3f8fc66e46b3..53728bceef47d99c26b54fe6ad58a637dc985c8c 100644 (file)
--- a/src/drivers/ao_button.c
+++ b/src/drivers/ao_button.c
@@ -19,6 +19,7 @@
 #include <ao.h>
 #include <ao_button.h>
 #include <ao_exti.h>
+#include <ao_fast_timer.h>
 #if AO_EVENT
 #include <ao_event.h>
 #define ao_button_queue(b,v)   ao_event_put_isr(AO_EVENT_BUTTON, b, v)
@@ -37,7 +38,6 @@ static struct ao_button_state ao_button_state[AO_BUTTON_COUNT];
 
 #define port(q)        AO_BUTTON_ ## q ## _PORT
 #define bit(q) AO_BUTTON_ ## q
-#define pin(q) AO_BUTTON_ ## q ## _PIN
 
 #ifndef AO_BUTTON_INVERTED
 #define AO_BUTTON_INVERTED     1
@@ -45,9 +45,9 @@ static struct ao_button_state ao_button_state[AO_BUTTON_COUNT];
 
 #if AO_BUTTON_INVERTED
 /* pins are inverted */
-#define ao_button_value(b)     !ao_gpio_get(port(b), bit(b), pin(b))
+#define ao_button_value(b)     !ao_gpio_get(port(b), bit(b))
 #else
-#define ao_button_value(b)     ao_gpio_get(port(b), bit(b), pin(b))
+#define ao_button_value(b)     ao_gpio_get(port(b), bit(b))
 #endif
 
 static uint8_t
@@ -68,6 +68,39 @@ _ao_button_get(uint8_t b)
 #endif
 #if AO_BUTTON_COUNT > 4
        case 4: return ao_button_value(4);
+#endif
+#if AO_BUTTON_COUNT > 5
+       case 5: return ao_button_value(5);
+#endif
+#if AO_BUTTON_COUNT > 6
+       case 6: return ao_button_value(6);
+#endif
+#if AO_BUTTON_COUNT > 7
+       case 7: return ao_button_value(7);
+#endif
+#if AO_BUTTON_COUNT > 8
+       case 8: return ao_button_value(8);
+#endif
+#if AO_BUTTON_COUNT > 9
+       case 9: return ao_button_value(9);
+#endif
+#if AO_BUTTON_COUNT > 10
+       case 10: return ao_button_value(10);
+#endif
+#if AO_BUTTON_COUNT > 11
+       case 11: return ao_button_value(11);
+#endif
+#if AO_BUTTON_COUNT > 12
+       case 12: return ao_button_value(12);
+#endif
+#if AO_BUTTON_COUNT > 13
+       case 13: return ao_button_value(13);
+#endif
+#if AO_BUTTON_COUNT > 14
+       case 14: return ao_button_value(14);
+#endif
+#if AO_BUTTON_COUNT > 15
+       case 15: return ao_button_value(15);
 #endif
        }
        return 0;
@@ -117,12 +150,7 @@ ao_button_isr(void)
 }
 
 #define init(b) do {                                                   \
-               ao_enable_port(port(b));                                \
-                                                                       \
-               ao_exti_setup(port(b), bit(b),                          \
-                             AO_BUTTON_MODE|AO_EXTI_MODE_FALLING|AO_EXTI_MODE_RISING|AO_EXTI_PRIORITY_MED, \
-                             ao_button_isr);                           \
-               ao_exti_enable(port(b), bit(b));                        \
+               ao_enable_input(port(b), bit(b), AO_BUTTON_MODE);       \
                _ao_button_init(b);                                     \
        } while (0)
 
@@ -144,4 +172,42 @@ ao_button_init(void)
 #if AO_BUTTON_COUNT > 4
        init(4);
 #endif
+#if AO_BUTTON_COUNT > 5
+       init(5);
+#endif
+#if AO_BUTTON_COUNT > 6
+       init(6);
+#endif
+#if AO_BUTTON_COUNT > 7
+       init(7);
+#endif
+#if AO_BUTTON_COUNT > 8
+       init(8);
+#endif
+#if AO_BUTTON_COUNT > 9
+       init(9);
+#endif
+#if AO_BUTTON_COUNT > 10
+       init(10);
+#endif
+#if AO_BUTTON_COUNT > 11
+       init(11);
+#endif
+#if AO_BUTTON_COUNT > 12
+       init(12);
+#endif
+#if AO_BUTTON_COUNT > 13
+       init(13);
+#endif
+#if AO_BUTTON_COUNT > 14
+       init(14);
+#endif
+#if AO_BUTTON_COUNT > 15
+       init(15);
+#endif
+#if AO_BUTTON_COUNT > 16
+       #error too many buttons
+#endif
+       ao_fast_timer_init();
+       ao_fast_timer_on(ao_button_isr);
 }