client: Prefix all the config settings with "config_"

[tattlekey] / client / button.c

diff --git a/client/button.c b/client/button.c
index 4df8d66d139aee5c856f1822e65d748b94a6d043..1f111a1dac4381056cce57ee8840bb89fc1a1590 100644 (file)
--- a/client/button.c
+++ b/client/button.c
@@ -8,7 +8,7 @@
 static callback_t button_callback = NULL;
 
 static void respond_to_gpio_interrupt(uint gpio, uint32_t event_mask) {
-  if (gpio == button_pin && event_mask & GPIO_IRQ_EDGE_FALL &&
+  if (gpio == config_button_pin && event_mask & GPIO_IRQ_EDGE_FALL &&
       button_callback) {
     button_callback();
   }
@@ -17,7 +17,7 @@ static void respond_to_gpio_interrupt(uint gpio, uint32_t event_mask) {
 void begin_listening_for_button_press(callback_t callback) {
   button_callback = callback;
 
-  gpio_set_pulls(button_pin, 1, 0);
+  gpio_set_pulls(config_button_pin, 1, 0);
 
   /* Allow some time for the pull-up to take effect.
    * I'm not sure if this is necessary.
@@ -25,6 +25,6 @@ void begin_listening_for_button_press(callback_t callback) {
    * the internal GPIO pull-up resistors are 50k. */
   sleep_ms(100);
 
-  gpio_set_irq_enabled_with_callback(button_pin, GPIO_IRQ_EDGE_FALL, 1,
+  gpio_set_irq_enabled_with_callback(config_button_pin, GPIO_IRQ_EDGE_FALL, 1,
                                      respond_to_gpio_interrupt);
 }