From ea05037258993adc5707333696255da0bf9e40ad Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Sun, 30 May 2021 11:00:27 -0500 Subject: Doorbell interrupts working. GPIO cannot do both ADC and ISR so split the pins. --- main/include/bell.h | 10 +++++++--- main/include/led.h | 2 +- main/include/lock.h | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'main/include') diff --git a/main/include/bell.h b/main/include/bell.h index 35a618e..41f133a 100644 --- a/main/include/bell.h +++ b/main/include/bell.h @@ -4,10 +4,14 @@ bool is_bell_ringing(int val); -void IRAM_ATTR intercom_bell_isr(void *arg); +void intercom_bell_read(void *p); -void intercom_bell_ring(); +void IRAM_ATTR intercom_bell_isr(void *arg); void intercom_bell_timer_cb(TimerHandle_t timer); -hap_serv_t *intercom_bell_init(uint32_t key_gpio_pin); +void intercom_bell_isr_gpio_init(); + +void intercom_bell_adc_gpio_init(); + +hap_serv_t *intercom_bell_init(); diff --git a/main/include/led.h b/main/include/led.h index 98248e6..ea10f58 100644 --- a/main/include/led.h +++ b/main/include/led.h @@ -2,4 +2,4 @@ int intercom_led_identify(hap_acc_t *ha); -void intercom_led_init(uint32_t key_gpio_pin); \ No newline at end of file +void intercom_led_init(); \ No newline at end of file diff --git a/main/include/lock.h b/main/include/lock.h index d26a222..aca9b67 100644 --- a/main/include/lock.h +++ b/main/include/lock.h @@ -12,4 +12,6 @@ int intercom_lock_write_cb(hap_write_data_t write_data[], int count, void *serv_ void intercom_lock_timer_cb(TimerHandle_t timer); -hap_serv_t *intercom_lock_init(uint32_t key_gpio_pin); +void intercom_lock_gpio_init(); + +hap_serv_t *intercom_lock_init(); -- cgit v1.2.3