projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
drivers
/
ao_button.c
diff --git
a/src/drivers/ao_button.c
b/src/drivers/ao_button.c
index f6a9676bc481ad934b6d794625092a84f531f5d0..c8103e884d3cd47bfacb5909a0034acafa41a325 100644
(file)
--- a/
src/drivers/ao_button.c
+++ b/
src/drivers/ao_button.c
@@
-37,7
+37,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 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
#ifndef AO_BUTTON_INVERTED
#define AO_BUTTON_INVERTED 1
@@
-45,9
+44,9
@@
static struct ao_button_state ao_button_state[AO_BUTTON_COUNT];
#if AO_BUTTON_INVERTED
/* pins are inverted */
#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
#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
#endif
static uint8_t