Skip to content

Commit fa43acc

Browse files
committed
Merge branch 'contrib/github_pr_543' into 'master'
fix: add #include <stdbool.h> and parentheses (GitHub PR) Closes AEGHB-1143 See merge request ae_group/esp-iot-solution!1323
2 parents fa4d472 + 5276b26 commit fa43acc

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

components/knob/include/iot_knob.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#pragma once
88

99
#include <stdint.h>
10+
#include <stdbool.h>
1011
#include "esp_err.h"
1112

1213
#ifdef __cplusplus

components/knob/iot_knob.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ static void knob_cb(void *args)
218218
if (target->enable_power_save) {
219219
knob_gpio_wake_up_control((uint32_t)target->encoder_a, !target->encoder_a_level, true);
220220
knob_gpio_wake_up_control((uint32_t)target->encoder_b, !target->encoder_b_level, true);
221-
knob_gpio_set_intr((uint32_t)target->encoder_a, !target->encoder_a_level == 0 ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL);
222-
knob_gpio_set_intr((uint32_t)target->encoder_b, !target->encoder_b_level == 0 ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL);
221+
knob_gpio_set_intr((uint32_t)target->encoder_a, !(target->encoder_a_level == 0) ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL);
222+
knob_gpio_set_intr((uint32_t)target->encoder_b, !(target->encoder_b_level == 0) ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL);
223223
knob_gpio_intr_control((uint32_t)(target->encoder_a), true);
224224
knob_gpio_intr_control((uint32_t)(target->encoder_b), true);
225225
}
@@ -262,8 +262,8 @@ knob_handle_t iot_knob_create(const knob_config_t *config)
262262

263263
if (config->enable_power_save) {
264264
knob->enable_power_save = config->enable_power_save;
265-
knob_gpio_init_intr(config->gpio_encoder_a, !knob->encoder_a_level == 0 ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL, knob_power_save_isr_handler, knob->encoder_a);
266-
knob_gpio_init_intr(config->gpio_encoder_b, !knob->encoder_b_level == 0 ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL, knob_power_save_isr_handler, knob->encoder_b);
265+
knob_gpio_init_intr(config->gpio_encoder_a, !(knob->encoder_a_level == 0) ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL, knob_power_save_isr_handler, knob->encoder_a);
266+
knob_gpio_init_intr(config->gpio_encoder_b, !(knob->encoder_b_level == 0) ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL, knob_power_save_isr_handler, knob->encoder_b);
267267

268268
ret = knob_gpio_wake_up_init(config->gpio_encoder_a, !knob->encoder_a_level);
269269
KNOB_CHECK_GOTO(ESP_OK == ret, "encoder A wake up gpio init failed", _encoder_deinit);

0 commit comments

Comments
 (0)