merge in progress

This commit is contained in:
philippe44
2020-01-11 13:56:58 -08:00
parent 886676df88
commit e82d56fbfa
42 changed files with 2138 additions and 1951 deletions

View File

@@ -156,7 +156,7 @@ void button_create(void *id, int gpio, int type, bool pull, int debounce, button
if (n_buttons >= MAX_BUTTONS) return;
ESP_LOGI(TAG, "creating button using GPIO %u, type %u, pull-up/down %u, long press %u shifter %u", gpio, type, pull, long_press, shifter_gpio);
ESP_LOGI(TAG, "Creating button using GPIO %u, type %u, pull-up/down %u, long press %u shifter %u", gpio, type, pull, long_press, shifter_gpio);
if (!n_buttons) {
button_evt_queue = xQueueCreate(10, sizeof(struct button_s));