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/app_main.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'main/app_main.c') diff --git a/main/app_main.c b/main/app_main.c index e1d42b4..bfd4d4f 100644 --- a/main/app_main.c +++ b/main/app_main.c @@ -14,7 +14,7 @@ #define INTERCOM_TASK_STACKSIZE 4 * 1024 #define INTERCOM_TASK_NAME "hap_intercom" -static void intercom_thread_entry(void *p) +static void intercom_init(void *p) { hap_init(HAP_TRANSPORT_WIFI); /* Initialize the HAP core */ @@ -30,16 +30,13 @@ static void intercom_thread_entry(void *p) .cid = HAP_CID_DOOR, }; - ESP_LOGI(TAG, "GPIO Pins [BELL: %d, ADC1: %d, LOCK: %d, LED: %d]", CONFIG_HOMEKIT_INTERCOM_BELL_GPIO_PIN, CONFIG_HOMEKIT_INTERCOM_BELL_ADC1_CHANNEL, CONFIG_HOMEKIT_INTERCOM_LOCK_GPIO_PIN, CONFIG_HOMEKIT_INTERCOM_LED_GPIO_PIN); - hap_acc_t *intercom_accessory = hap_acc_create(&cfg); - /* Add a dummy Product Data */ uint8_t product_data[] = {'E', 'S', 'P', '3', '2', 'H', 'A', 'P'}; hap_acc_add_product_data(intercom_accessory, product_data, sizeof(product_data)); - hap_acc_add_serv(intercom_accessory, intercom_bell_init(CONFIG_HOMEKIT_INTERCOM_BELL_GPIO_PIN)); - hap_acc_add_serv(intercom_accessory, intercom_lock_init(CONFIG_HOMEKIT_INTERCOM_LOCK_GPIO_PIN)); - intercom_led_init(CONFIG_HOMEKIT_INTERCOM_LED_GPIO_PIN); + hap_acc_add_serv(intercom_accessory, intercom_bell_init()); + hap_acc_add_serv(intercom_accessory, intercom_lock_init()); + intercom_led_init(); hap_add_accessory(intercom_accessory); /* Add the Accessory to the HomeKit Database */ @@ -80,5 +77,5 @@ static void intercom_thread_entry(void *p) void app_main() { - xTaskCreate(intercom_thread_entry, INTERCOM_TASK_NAME, INTERCOM_TASK_STACKSIZE, NULL, INTERCOM_TASK_PRIORITY, NULL); + xTaskCreate(intercom_init, INTERCOM_TASK_NAME, INTERCOM_TASK_STACKSIZE, NULL, INTERCOM_TASK_PRIORITY, NULL); } -- cgit v1.2.3