Broke out services into their own files.

3 files changed, 298 insertions, 0 deletions

diff --git a/main/src/bell.c b/main/src/bell.c
new file mode 100644
index 0000000..9467bb8
--- /dev/null
+++ b/main/src/bell.c
@@ -0,0 +1,86 @@
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/timers.h>
+#include <freertos/queue.h>
+#include <esp_log.h>
+#include <driver/gpio.h>
+#include <driver/adc.h>
+
+#include <hap.h>
+
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+#include <event_queue.h>
+#include <bell.h>
+
+#define ESP_INTR_FLAG_DEFAULT 0
+
+static hap_val_t HAP_PROGRAMMABLE_SWITCH_EVENT_SINGLE_PRESS = {.u = 0};
+
+volatile bool is_intercom_bell_blocked;
+static TimerHandle_t intercom_bell_timer; // ignore new bells until timer triggered
+static hap_char_t *intercom_bell_current_state;
+
+bool is_bell_ringing(int val)
+{
+    return 1.2 < val && val < 2.5;
+}
+
+void IRAM_ATTR intercom_bell_isr(void *arg)
+{
+    if (!is_intercom_bell_blocked && is_bell_ringing(adc1_get_raw(CONFIG_HOMEKIT_INTERCOM_BELL_ADC1_CHANNEL)))
+    {
+        intercom_event_queue_bell_ring();
+        is_intercom_bell_blocked = true;
+    }
+}
+
+void intercom_bell_ring()
+{
+    ESP_LOGI(TAG, "Intercom bell ring event processed");
+
+    hap_char_update_val(intercom_bell_current_state, &HAP_PROGRAMMABLE_SWITCH_EVENT_SINGLE_PRESS);
+
+    xTimerReset(intercom_bell_timer, 10);
+}
+
+void intercom_bell_timer_cb(TimerHandle_t timer)
+{
+    ESP_LOGI(TAG, "Intercom bell timer fired");
+    is_intercom_bell_blocked = false;
+}
+
+hap_serv_t *intercom_bell_init(uint32_t key_gpio_pin)
+{
+    is_intercom_bell_blocked = false;
+    intercom_bell_timer = xTimerCreate("intercom_bell_timer", pdMS_TO_TICKS(CONFIG_HOMEKIT_INTERCOM_LOCK_TIMEOUT), pdFALSE, 0, intercom_bell_timer_cb);
+
+    hap_serv_t *intercom_bell_service = hap_serv_doorbell_create(0);
+    hap_serv_add_char(intercom_bell_service, hap_char_name_create("Intercom Bell"));
+    intercom_bell_current_state = hap_serv_get_char_by_uuid(intercom_bell_service, HAP_CHAR_UUID_PROGRAMMABLE_SWITCH_EVENT);
+
+    gpio_config_t io_conf;
+
+    io_conf.intr_type = GPIO_INTR_POSEDGE;       /* Interrupt for rising edge  */
+    io_conf.pin_bit_mask = 1 << key_gpio_pin;    /* Bit mask of the pins */
+    io_conf.mode = GPIO_MODE_INPUT;              /* Set as input mode */
+    io_conf.pull_up_en = GPIO_PULLUP_DISABLE;    /* Disable internal pull-up */
+    io_conf.pull_down_en = GPIO_PULLDOWN_ENABLE; /* Enable internal pull-down */
+
+    gpio_config(&io_conf); /* Set the GPIO configuration */
+
+    gpio_install_isr_service(ESP_INTR_FLAG_DEFAULT);                             /* Install gpio isr service */
+    gpio_isr_handler_add(key_gpio_pin, intercom_bell_isr, (void *)key_gpio_pin); /* Hook isr handler for specified gpio pin */
+
+    // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/adc.html#_CPPv425adc1_config_channel_atten14adc1_channel_t11adc_atten_t
+    adc1_config_width(ADC_WIDTH_BIT_12);
+    adc1_config_channel_atten(CONFIG_HOMEKIT_INTERCOM_BELL_ADC1_CHANNEL, ADC_ATTEN_DB_11);
+
+    return intercom_bell_service;
+}
diff --git a/main/src/event_queue.c b/main/src/event_queue.c
new file mode 100644
index 0000000..113cc56
--- /dev/null
+++ b/main/src/event_queue.c
@@ -0,0 +1,87 @@
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/timers.h>
+#include <freertos/queue.h>
+#include <esp_log.h>
+#include <driver/gpio.h>
+#include <driver/adc.h>
+
+#include <hap.h>
+
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+#include <lock.h>
+#include <bell.h>
+#include <event_queue.h>
+
+static const int INTERCOM_EVENT_QUEUE_BELL_RING = 1;
+static const int INTERCOM_EVENT_QUEUE_LOCK_UNSECURE = 2;
+static const int INTERCOM_EVENT_QUEUE_LOCK_SECURE = 3;
+static const int INTERCOM_EVENT_QUEUE_LOCK_TIMEOUT = 4;
+
+static xQueueHandle intercom_event_queue = NULL;
+
+void intercom_event_queue_bell_ring()
+{
+    xQueueSendFromISR(intercom_event_queue, (void *)&INTERCOM_EVENT_QUEUE_BELL_RING, NULL);
+}
+
+void intercom_event_queue_lock_unsecure()
+{
+    xQueueSendToBack(intercom_event_queue, (void *)&INTERCOM_EVENT_QUEUE_LOCK_UNSECURE, 10);
+}
+
+void intercom_event_queue_lock_secure()
+{
+    xQueueSendToBack(intercom_event_queue, (void *)&INTERCOM_EVENT_QUEUE_LOCK_SECURE, 10);
+}
+
+void intercom_event_queue_lock_timeout()
+{
+    xQueueSendToBack(intercom_event_queue, (void *)&INTERCOM_EVENT_QUEUE_LOCK_TIMEOUT, 10);
+}
+
+void intercom_event_queue_run()
+{
+    uint8_t intercom_event_queue_item = INTERCOM_EVENT_QUEUE_LOCK_SECURE;
+
+    while (1)
+    {
+        if (xQueueReceive(intercom_event_queue, &intercom_event_queue_item, portMAX_DELAY) == pdFALSE)
+        {
+            ESP_LOGI(TAG, "Intercom event queue trigger FAIL");
+        }
+        else
+        {
+            switch (intercom_event_queue_item)
+            {
+            case INTERCOM_EVENT_QUEUE_BELL_RING:
+                intercom_bell_ring();
+                break;
+            case INTERCOM_EVENT_QUEUE_LOCK_UNSECURE:
+                intercom_lock_unsecure();
+                break;
+            case INTERCOM_EVENT_QUEUE_LOCK_SECURE:
+                intercom_lock_secure();
+                break;
+            case INTERCOM_EVENT_QUEUE_LOCK_TIMEOUT:
+                intercom_lock_timeout();
+                break;
+            }
+        }
+    }
+}
+
+bool intercom_event_queue_init()
+{
+    int queue_len = 4;
+    int queue_item_size = sizeof(uint8_t);
+    intercom_event_queue = xQueueCreate(queue_len, queue_item_size);
+    return intercom_event_queue != NULL;
+}
diff --git a/main/src/lock.c b/main/src/lock.c
new file mode 100644
index 0000000..3d01383
--- /dev/null
+++ b/main/src/lock.c
@@ -0,0 +1,125 @@
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/timers.h>
+#include <freertos/queue.h>
+#include <esp_log.h>
+#include <driver/gpio.h>
+#include <driver/adc.h>
+
+#include <hap.h>
+
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+#include <event_queue.h>
+#include <lock.h>
+
+#define INTERCOM_LOCK_GPIO_LOCKED 0
+#define INTERCOM_LOCK_GPIO_UNLOCKED 1
+
+#define HAP_LOCK_TARGET_STATE_UNSECURED 0
+#define HAP_LOCK_TARGET_STATE_SECURED 1
+
+static hap_val_t HAP_LOCK_CURRENT_STATE_UNSECURED = {.u = 0};
+static hap_val_t HAP_LOCK_CURRENT_STATE_SECURED = {.u = 1};
+
+static TimerHandle_t intercom_lock_timer = NULL; // lock the door when timer triggered
+static hap_char_t *intercom_lock_current_state;
+static hap_char_t *intercom_lock_target_state;
+
+void intercom_lock_unsecure()
+{
+    ESP_LOGI(TAG, "Intercom unlock event processed");
+
+    gpio_set_level(CONFIG_HOMEKIT_INTERCOM_LOCK_GPIO_PIN, INTERCOM_LOCK_GPIO_UNLOCKED);
+    hap_char_update_val(intercom_lock_current_state, &HAP_LOCK_CURRENT_STATE_UNSECURED);
+
+    xTimerReset(intercom_lock_timer, 10);
+}
+
+void intercom_lock_secure()
+{
+    ESP_LOGI(TAG, "Intercom lock event processed");
+
+    gpio_set_level(CONFIG_HOMEKIT_INTERCOM_LOCK_GPIO_PIN, INTERCOM_LOCK_GPIO_LOCKED);
+    hap_char_update_val(intercom_lock_current_state, &HAP_LOCK_CURRENT_STATE_SECURED);
+}
+
+void intercom_lock_timeout()
+{
+    ESP_LOGI(TAG, "Intercom lock timeout event processed");
+
+    intercom_event_queue_lock_secure();
+    hap_val_t target_lock_secured = {.u = HAP_LOCK_TARGET_STATE_SECURED};
+    hap_char_update_val(intercom_lock_target_state, &target_lock_secured);
+}
+
+int intercom_lock_write_cb(hap_write_data_t write_data[], int count, void *serv_priv, void *write_priv)
+{
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++)
+    {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_LOCK_TARGET_STATE))
+        {
+            ESP_LOGI(TAG, "Received Write. Intercom lock %d", write->val.u);
+
+            switch (write->val.u)
+            {
+            case HAP_LOCK_TARGET_STATE_UNSECURED:
+                intercom_event_queue_lock_unsecure();
+                break;
+            case HAP_LOCK_TARGET_STATE_SECURED:
+                intercom_event_queue_lock_secure();
+                break;
+            }
+
+            /* Update target state */
+            hap_char_update_val(write->hc, &(write->val));
+            *(write->status) = HAP_STATUS_SUCCESS;
+        }
+        else
+        {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+    }
+    return ret;
+}
+
+void intercom_lock_timer_cb(TimerHandle_t timer)
+{
+    ESP_LOGI(TAG, "Intercom lock timer fired - event queued");
+
+    intercom_event_queue_lock_timeout();
+}
+
+hap_serv_t *intercom_lock_init(uint32_t key_gpio_pin)
+{
+    hap_serv_t *intercom_lock_service = hap_serv_lock_mechanism_create(HAP_LOCK_CURRENT_STATE_SECURED.u, HAP_LOCK_TARGET_STATE_SECURED);
+    hap_serv_add_char(intercom_lock_service, hap_char_name_create("Intercom Lock"));
+
+    intercom_lock_current_state = hap_serv_get_char_by_uuid(intercom_lock_service, HAP_CHAR_UUID_LOCK_CURRENT_STATE);
+    intercom_lock_target_state = hap_serv_get_char_by_uuid(intercom_lock_service, HAP_CHAR_UUID_LOCK_TARGET_STATE);
+
+    hap_serv_set_write_cb(intercom_lock_service, intercom_lock_write_cb); /* Set the write callback for the service */
+
+    intercom_lock_timer = xTimerCreate("intercom_lock_timer", pdMS_TO_TICKS(CONFIG_HOMEKIT_INTERCOM_LOCK_TIMEOUT), pdFALSE, 0, intercom_lock_timer_cb);
+
+    gpio_config_t io_conf;
+
+    io_conf.intr_type = GPIO_INTR_DISABLE;       /* Disable interrupt  */
+    io_conf.pin_bit_mask = 1 << key_gpio_pin;    /* Bit mask of the pins */
+    io_conf.mode = GPIO_MODE_OUTPUT;             /* Set as input mode */
+    io_conf.pull_up_en = GPIO_PULLUP_DISABLE;    /* Disable internal pull-up */
+    io_conf.pull_down_en = GPIO_PULLDOWN_ENABLE; /* Enable internal pull-down */
+
+    gpio_config(&io_conf); /* Set the GPIO configuration */
+
+    return intercom_lock_service;
+}