tfaour
d395cf3bb9
Build and push server image / build-and-push (push) Successful in 35s
Factory-reset (GPIO3, hold 10s): clears stored WiFi/server config and restarts into provisioning -- the deliberate, USB-free replacement for the earlier reverted RST-based auto-reprovisioning idea. Next-photo (GPIO2, tap): wakes the device and forces the server to advance immediately via a new POST /frame/advance, instead of waiting for the refresh interval. Both buttons arm themselves as deep-sleep GPIO wakeup sources so a press is noticed promptly even while asleep. Also makes GET /frame/image side-effect-free: it now only advances once refresh_interval_s has elapsed since the current photo was set (tracked server-side), so a device reboot for any reason just redisplays the current photo instead of silently skipping ahead. The server maintains a small reorderable upcoming-photos queue, viewable and rearrangeable from the web UI.
70 lines
2.2 KiB
C
70 lines
2.2 KiB
C
#include "driver/gpio.h"
|
|
#include "esp_log.h"
|
|
#include "esp_sleep.h"
|
|
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
|
|
#include "next_button.h"
|
|
|
|
static const char *TAG = "next_button";
|
|
|
|
#if CONFIG_FRAME_NEXT_BUTTON_GPIO >= 0
|
|
|
|
#define NEXT_BUTTON_GPIO ((gpio_num_t)CONFIG_FRAME_NEXT_BUTTON_GPIO)
|
|
#define NEXT_BUTTON_DEBOUNCE_MS 20
|
|
#define NEXT_BUTTON_DEBOUNCE_CHECKS 3
|
|
|
|
void next_button_init(void)
|
|
{
|
|
gpio_config_t io_conf = {
|
|
.pin_bit_mask = 1ULL << NEXT_BUTTON_GPIO,
|
|
.mode = GPIO_MODE_INPUT,
|
|
.pull_up_en = GPIO_PULLUP_ENABLE,
|
|
};
|
|
gpio_config(&io_conf);
|
|
|
|
/* See reset_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 << NEXT_BUTTON_GPIO, ESP_GPIO_WAKEUP_GPIO_LOW);
|
|
}
|
|
|
|
bool next_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. */
|
|
if (esp_sleep_get_gpio_wakeup_status() & (1ULL << NEXT_BUTTON_GPIO)) {
|
|
ESP_LOGI(TAG, "Next-photo button caused this wake, forcing advance");
|
|
return true;
|
|
}
|
|
|
|
/* 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(NEXT_BUTTON_GPIO) != 0) {
|
|
return false;
|
|
}
|
|
|
|
for (int i = 0; i < NEXT_BUTTON_DEBOUNCE_CHECKS; i++) {
|
|
vTaskDelay(pdMS_TO_TICKS(NEXT_BUTTON_DEBOUNCE_MS));
|
|
if (gpio_get_level(NEXT_BUTTON_GPIO) != 0) {
|
|
return false; /* noise, not a real press */
|
|
}
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Next-photo button held during power-on, forcing advance");
|
|
return true;
|
|
}
|
|
|
|
#else
|
|
|
|
void next_button_init(void) {}
|
|
bool next_button_check(void) { return false; }
|
|
|
|
#endif
|