tfaour
c0fefc19f1
Firmware build check / build-check (push) Successful in 2m44s
esp_sleep_enable_gpio_wakeup_on_hp_periph_powerdown() only exists on
ESP32-C6 (SOC_GPIO_SUPPORT_HP_PERIPH_PD_SLEEP_WAKEUP), so the ee02
(ESP32-S3) build failed with implicit-declaration errors in
{back,next,combo}_button.c once the epd13in3e driver's #error stopped
masking it.
Each button file now branches on that capability macro: the C6 path
(devkit/xiao) is untouched, and ESP32-S3 uses
esp_sleep_enable_ext1_wakeup_io() instead. The earlier ext1 attempt was
rejected on C6 hardware because its pull resistor didn't hold across
RTC_PERIPH power-down -- tracing the same path in ESP-IDF source shows
gpio_config()'s pull_up_en already delegates to rtc_gpio_pullup_en()
for RTC-capable pins on every non-original-ESP32 target, so the pull-up
should already survive the same power-down on S3. The _io() variant is
additive, so the three button files don't need cross-file mask
coordination. Also widens the button GPIO Kconfig range for
IDF_TARGET_ESP32S3 (0-21, matching its RTC-IO set) instead of the
C6-shaped 0-7.
Verified: ee02, devkit, and xiao all build clean end-to-end locally
(native ESP-IDF v6.0, no Docker in this sandbox). NOT verified: whether
this actually avoids the spurious-instant-wakeup bug on real EE02
hardware -- that failure mode was only ever confirmed empirically, not
root-caused in a way a compile can check. continue-on-error stays on
in CI's ee02 build step until that's confirmed.
106 lines
3.8 KiB
C
106 lines
3.8 KiB
C
#include "driver/gpio.h"
|
|
#include "esp_log.h"
|
|
#include "esp_sleep.h"
|
|
#include "soc/soc_caps.h"
|
|
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
|
|
#include "wifi_provisioning.h"
|
|
|
|
#include "combo_button.h"
|
|
|
|
static const char *TAG = "combo_button";
|
|
|
|
#if CONFIG_FRAME_COMBO_BUTTON_GPIO >= 0
|
|
|
|
#define COMBO_BUTTON_GPIO ((gpio_num_t)CONFIG_FRAME_COMBO_BUTTON_GPIO)
|
|
#define COMBO_BUTTON_POLL_MS 100
|
|
|
|
void combo_button_init(void)
|
|
{
|
|
/* See next_button.c's next_button_init() for why this has to run
|
|
* before gpio_config() -- a deep sleep with this pin armed as a
|
|
* wakeup source leaves it "held," and nothing un-holds it on wake
|
|
* except explicitly asking. */
|
|
gpio_hold_dis(COMBO_BUTTON_GPIO);
|
|
|
|
gpio_config_t io_conf = {
|
|
.pin_bit_mask = 1ULL << COMBO_BUTTON_GPIO,
|
|
.mode = GPIO_MODE_INPUT,
|
|
.pull_up_en = GPIO_PULLUP_ENABLE,
|
|
};
|
|
gpio_config(&io_conf);
|
|
|
|
#if SOC_GPIO_SUPPORT_HP_PERIPH_PD_SLEEP_WAKEUP
|
|
/* See next_button.c for why this API (not ext1) -- it manages the
|
|
* pull resistor across the sleep transition itself, so the pin
|
|
* doesn't float and wake the device spuriously. */
|
|
esp_sleep_enable_gpio_wakeup_on_hp_periph_powerdown(1ULL << COMBO_BUTTON_GPIO, ESP_GPIO_WAKEUP_GPIO_LOW);
|
|
#else
|
|
/* See next_button.c for why ext1 is safe here on targets without the
|
|
* API above (e.g. ESP32-S3), and why _io() needs no cross-file mask
|
|
* coordination. */
|
|
ESP_ERROR_CHECK(esp_sleep_enable_ext1_wakeup_io(1ULL << COMBO_BUTTON_GPIO, ESP_EXT1_WAKEUP_ANY_LOW));
|
|
#endif
|
|
}
|
|
|
|
bool combo_button_check(void)
|
|
{
|
|
/* A quick tap can easily release before we get here (~tens to
|
|
* hundreds of ms into boot, same issue the other buttons already
|
|
* hit and fixed -- confirmed on hardware: a fast press was being
|
|
* missed entirely with just a live level check here). The wakeup
|
|
* status register is latched at the moment of waking and isn't
|
|
* cleared until the next sleep entry, so it still confirms this pin
|
|
* caused the wake even if it's since been released -- in which case
|
|
* the poll loop below simply measures 0ms held, correctly resolving
|
|
* to a quick press rather than "not pressed at all." */
|
|
#if SOC_GPIO_SUPPORT_HP_PERIPH_PD_SLEEP_WAKEUP
|
|
bool caused_wake = esp_sleep_get_gpio_wakeup_status() & (1ULL << COMBO_BUTTON_GPIO);
|
|
#else
|
|
bool caused_wake = esp_sleep_get_ext1_wakeup_status() & (1ULL << COMBO_BUTTON_GPIO);
|
|
#endif
|
|
if (!caused_wake && gpio_get_level(COMBO_BUTTON_GPIO) != 0) {
|
|
return false; /* not pressed, and didn't cause this wake either */
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Combo button held -- quick press for soft reset, %dms for menu, %dms for factory reset",
|
|
CONFIG_FRAME_COMBO_MENU_HOLD_MS, CONFIG_FRAME_COMBO_FACTORY_RESET_HOLD_MS);
|
|
|
|
int elapsed_ms = 0;
|
|
while (gpio_get_level(COMBO_BUTTON_GPIO) == 0) {
|
|
vTaskDelay(pdMS_TO_TICKS(COMBO_BUTTON_POLL_MS));
|
|
elapsed_ms += COMBO_BUTTON_POLL_MS;
|
|
if (elapsed_ms >= CONFIG_FRAME_COMBO_FACTORY_RESET_HOLD_MS) {
|
|
/* Fires immediately, doesn't wait for release -- same
|
|
* convention as the old dedicated reset button. */
|
|
ESP_LOGW(TAG, "Held %dms, clearing config and restarting into provisioning",
|
|
CONFIG_FRAME_COMBO_FACTORY_RESET_HOLD_MS);
|
|
frame_config_clear();
|
|
esp_restart();
|
|
}
|
|
}
|
|
|
|
if (elapsed_ms >= CONFIG_FRAME_COMBO_MENU_HOLD_MS) {
|
|
ESP_LOGI(TAG, "Held %dms and released, showing management menu", elapsed_ms);
|
|
return true;
|
|
}
|
|
|
|
ESP_LOGW(TAG, "Quick press (%dms), soft-restarting (config kept)", elapsed_ms);
|
|
esp_restart();
|
|
}
|
|
|
|
bool combo_button_is_pressed(void)
|
|
{
|
|
return gpio_get_level(COMBO_BUTTON_GPIO) == 0;
|
|
}
|
|
|
|
#else
|
|
|
|
void combo_button_init(void) {}
|
|
bool combo_button_check(void) { return false; }
|
|
bool combo_button_is_pressed(void) { return false; }
|
|
|
|
#endif
|