tfaour
fcf3aec4c0
Next/back button assignment moves from a frame-level "Button assignments" card into each widget's own gear-icon dialog, prefilled with a sane default at creation (photos/calendar -> advance/back, whiteboard/weather -> check_now, others -> none). At most one binding per (widget, button) now -- cross-widget execution order never mattered since each widget's action only touches its own state. New firmware capability: holding NEXT or BACK past a configurable duration (min 3s, server-side default) triggers a frame-wide action instead of the per-widget short-press one -- cycling saved layouts, refreshing all widgets, or freezing/unfreezing every photo widget (see app/global_actions.py). Firmware next/back checks gain the same hold-duration polling the combo button already had; the threshold comes from the previous wake's /frame/config fetch (persisted in NVS), since this wake's button decision happens before that request. Not done here: firmware/version.txt is intentionally left unbumped -- this hasn't been built or hardware-tested (no ESP-IDF toolchain in this environment), so no firmware release build should be triggered yet.
98 lines
3.4 KiB
C
98 lines
3.4 KiB
C
#include <stdint.h>
|
|
|
|
#include "driver/gpio.h"
|
|
#include "esp_log.h"
|
|
#include "esp_sleep.h"
|
|
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
|
|
#include "wifi_provisioning.h"
|
|
|
|
#include "back_button.h"
|
|
|
|
static const char *TAG = "back_button";
|
|
|
|
#if CONFIG_FRAME_BACK_BUTTON_GPIO >= 0
|
|
|
|
#define BACK_BUTTON_GPIO ((gpio_num_t)CONFIG_FRAME_BACK_BUTTON_GPIO)
|
|
#define BACK_BUTTON_DEBOUNCE_MS 20
|
|
#define BACK_BUTTON_DEBOUNCE_CHECKS 3
|
|
#define BACK_BUTTON_POLL_MS 100
|
|
|
|
void back_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(BACK_BUTTON_GPIO);
|
|
|
|
gpio_config_t io_conf = {
|
|
.pin_bit_mask = 1ULL << BACK_BUTTON_GPIO,
|
|
.mode = GPIO_MODE_INPUT,
|
|
.pull_up_en = GPIO_PULLUP_ENABLE,
|
|
};
|
|
gpio_config(&io_conf);
|
|
|
|
/* 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 << BACK_BUTTON_GPIO, ESP_GPIO_WAKEUP_GPIO_LOW);
|
|
}
|
|
|
|
back_button_result_t back_button_check(void)
|
|
{
|
|
/* A quick tap can easily release before this runs (~0.4-0.5s into
|
|
* boot, confirmed on hardware -- a live gpio_get_level() check here
|
|
* missed real presses that had already woken the device). The wakeup
|
|
* status register is latched at the moment of waking and isn't
|
|
* cleared until the next sleep entry, so it reliably reflects a tap
|
|
* regardless of how quickly it was released. */
|
|
bool caused_wake = esp_sleep_get_gpio_wakeup_status() & (1ULL << BACK_BUTTON_GPIO);
|
|
|
|
if (!caused_wake) {
|
|
/* Not a GPIO-wakeup-from-this-pin boot (normal timer wake, or a
|
|
* fresh power-on/reflash) -- fall back to a live, debounced level
|
|
* check so holding the button down while powering on also
|
|
* works. */
|
|
if (gpio_get_level(BACK_BUTTON_GPIO) != 0) {
|
|
return BACK_BUTTON_NOT_PRESSED;
|
|
}
|
|
for (int i = 0; i < BACK_BUTTON_DEBOUNCE_CHECKS; i++) {
|
|
vTaskDelay(pdMS_TO_TICKS(BACK_BUTTON_DEBOUNCE_MS));
|
|
if (gpio_get_level(BACK_BUTTON_GPIO) != 0) {
|
|
return BACK_BUTTON_NOT_PRESSED; /* noise, not a real press */
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Confirmed pressed -- measure how long, same reasoning/pattern as
|
|
* next_button_check(). */
|
|
uint32_t hold_threshold_ms;
|
|
if (frame_config_get_hold_duration_ms(&hold_threshold_ms) != ESP_OK) {
|
|
hold_threshold_ms = CONFIG_FRAME_HOLD_ACTION_MS;
|
|
}
|
|
|
|
uint32_t elapsed_ms = 0;
|
|
while (gpio_get_level(BACK_BUTTON_GPIO) == 0) {
|
|
if (elapsed_ms >= hold_threshold_ms) {
|
|
ESP_LOGI(TAG, "Back button held past %ums, triggering global hold action",
|
|
(unsigned)hold_threshold_ms);
|
|
return BACK_BUTTON_HOLD;
|
|
}
|
|
vTaskDelay(pdMS_TO_TICKS(BACK_BUTTON_POLL_MS));
|
|
elapsed_ms += BACK_BUTTON_POLL_MS;
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Back-photo button short press (%ums), going back", (unsigned)elapsed_ms);
|
|
return BACK_BUTTON_SHORT_PRESS;
|
|
}
|
|
|
|
#else
|
|
|
|
void back_button_init(void) {}
|
|
back_button_result_t back_button_check(void) { return BACK_BUTTON_NOT_PRESSED; }
|
|
|
|
#endif
|