diff options
| author | Luke Hoersten <[email protected]> | 2021-03-14 14:56:33 -0500 |
|---|---|---|
| committer | Luke Hoersten <[email protected]> | 2021-03-14 14:56:33 -0500 |
| commit | fd413fa8d493b48353e0dda44cca7cf6e884b7ea (patch) | |
| tree | 5fe8778ebedafa56621de2e39542b2390ab6d768 | |
| parent | 3d8aaa00022d7868037c39a34ebe2c9b02abc02b (diff) | |
Fixed ping mask bug thanks to @mikedoug
| -rw-r--r-- | main/src/bell.c | 6 | ||||
| -rw-r--r-- | main/src/led.c | 2 | ||||
| -rw-r--r-- | main/src/lock.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/main/src/bell.c b/main/src/bell.c index 4045d90..d8dd7d0 100644 --- a/main/src/bell.c +++ b/main/src/bell.c @@ -69,7 +69,7 @@ hap_serv_t *intercom_bell_init(uint32_t key_gpio_pin) 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.pin_bit_mask = 1ULL << 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 */ @@ -80,8 +80,8 @@ hap_serv_t *intercom_bell_init(uint32_t key_gpio_pin) 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); + adc1_config_width(ADC_WIDTH_MAX); + adc1_config_channel_atten(CONFIG_HOMEKIT_INTERCOM_BELL_ADC1_CHANNEL, ADC_ATTEN_MAX); return intercom_bell_service; } diff --git a/main/src/led.c b/main/src/led.c index 394577c..714e0f7 100644 --- a/main/src/led.c +++ b/main/src/led.c @@ -27,7 +27,7 @@ void intercom_led_init(uint32_t key_gpio_pin) gpio_config_t io_conf; io_conf.intr_type = GPIO_INTR_DISABLE; /* Interrupt for falling edge */ - io_conf.pin_bit_mask = 1 << key_gpio_pin; /* Bit mask of the pins */ + io_conf.pin_bit_mask = 1ULL << 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 */ diff --git a/main/src/lock.c b/main/src/lock.c index 4b98f51..ead0401 100644 --- a/main/src/lock.c +++ b/main/src/lock.c @@ -97,7 +97,7 @@ hap_serv_t *intercom_lock_init(uint32_t key_gpio_pin) 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.pin_bit_mask = 1ULL << 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 */ |