tfaour
3868d357ff
Build and push server image / build-and-push (push) Successful in 32s
Back button (new GPIO0, POST /frame/back): the server now tracks a bounded history of previously-current photos (photo_queue.py), pushed to on every advance (auto or forced) and popped by back_forced() -- symmetric with advance, so pressing next afterwards returns to right where you were. frame_client.c's force_advance bool becomes a 3-way fetch_action_t (NORMAL/ADVANCE/BACK) threaded through the whole fetch path. Also folds the separate reset and manage buttons onto one pin (combo_button.c, replacing reset_button.c/manage_button.c entirely), disambiguated by hold duration: quick press shows the management menu (unchanged), ~3s hold-then-release soft-resets (esp_restart(), config kept -- new), ~15s hold factory-resets (today's old reset behavior, extended from 10s for clearer tier separation). Driven by a production board (Seeed XIAO ESP32-C6) exposing only 3 of the ESP32-C6's 8 deep-sleep-wakeup-capable GPIOs -- next/back keep their own dedicated pins where instant response matters most, everything else shares the third pin via timing instead of needing its own. Same three-pin layout now works on both the dev board and the production board. Fixed a fast-tap bug in combo_button_check() before shipping: it only did a live gpio_get_level() read to decide whether the button was pressed at all, so a press fast enough to already be released by the time boot reached that check was missed entirely (treated as "never pressed" rather than "quick press"). Added the same latched esp_sleep_get_gpio_wakeup_status() check the other buttons already use for exactly this reason.
76 lines
2.5 KiB
C
76 lines
2.5 KiB
C
#include "driver/gpio.h"
|
|
#include "esp_log.h"
|
|
#include "esp_sleep.h"
|
|
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.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
|
|
|
|
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);
|
|
}
|
|
|
|
bool 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. */
|
|
if (esp_sleep_get_gpio_wakeup_status() & (1ULL << BACK_BUTTON_GPIO)) {
|
|
ESP_LOGI(TAG, "Back-photo button caused this wake, going back");
|
|
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(BACK_BUTTON_GPIO) != 0) {
|
|
return false;
|
|
}
|
|
|
|
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 false; /* noise, not a real press */
|
|
}
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Back-photo button held during power-on, going back");
|
|
return true;
|
|
}
|
|
|
|
#else
|
|
|
|
void back_button_init(void) {}
|
|
bool back_button_check(void) { return false; }
|
|
|
|
#endif
|