diff options
| author | Your Name <you@example.com> | 2026-05-20 02:14:45 +0530 |
|---|---|---|
| committer | Your Name <you@example.com> | 2026-05-20 02:14:45 +0530 |
| commit | 899016795c389151e6b486ec470653f5688e5c5f (patch) | |
| tree | 64b4c732d6f585552fd14df5f47890764c66ac1a /main/display.h | |
| parent | 4f713120dbedd37a3512c2ec1af0766025a59d57 (diff) | |
feat: merge display-fix — touch driver, keyboard, WiFi setup UI
Squash-merge of feature/display-fix (27 commits):
- AXS15231B touch driver with coordinate parsing (touch.c/h)
- On-screen keyboard with layout/hit detection (keyboard.c/h)
- WiFi setup state machine + config_add_wifi (wifi_setup.c/h)
- Web-based WiFi setup via captive portal
- Display rotation fix (stride=480), color fixes, DMA byte-swap
- WiFi QR code on BOOT and ERROR screens
- ERROR state transition after WiFi retries exhausted
- Unit tests: test_touch, test_keyboard, test_wifi_setup
- Integration test: wifi_setup.mjs
- E2E test: wifi-setup.spec.mjs
- Per-board hardware locks for flash targets
Conflicts resolved: took master for config/cvm/api/main (more current),
took display-fix for display/axs15231b (newer fixes).
Diffstat (limited to 'main/display.h')
| -rw-r--r-- | main/display.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/display.h b/main/display.h index 407521b..ecb76b6 100644 --- a/main/display.h +++ b/main/display.h | |||
| @@ -9,7 +9,8 @@ typedef enum { | |||
| 9 | DISPLAY_BOOT, | 9 | DISPLAY_BOOT, |
| 10 | DISPLAY_READY, | 10 | DISPLAY_READY, |
| 11 | DISPLAY_PAYMENT_RECEIVED, | 11 | DISPLAY_PAYMENT_RECEIVED, |
| 12 | DISPLAY_ERROR | 12 | DISPLAY_ERROR, |
| 13 | DISPLAY_SETUP_PENDING | ||
| 13 | } display_state_t; | 14 | } display_state_t; |
| 14 | 15 | ||
| 15 | typedef enum { | 16 | typedef enum { |
| @@ -20,7 +21,12 @@ typedef enum { | |||
| 20 | esp_err_t display_init(void); | 21 | esp_err_t display_init(void); |
| 21 | void display_set_state(display_state_t state); | 22 | void display_set_state(display_state_t state); |
| 22 | void display_update(const char *ap_ssid, int active_clients, | 23 | void display_update(const char *ap_ssid, int active_clients, |
| 23 | uint64_t wallet_balance, const char *portal_url); | 24 | uint64_t wallet_balance, const char *portal_url, |
| 25 | const char *mint_url, int price_per_step, | ||
| 26 | const char *wifi_status); | ||
| 27 | void display_notify_payment(int amount_sats, int64_t allotment_ms); | ||
| 28 | void display_notify_wifi_connected(const char *ip); | ||
| 29 | void display_notify_wifi_disconnected(void); | ||
| 24 | void display_render_text(int x, int y, const char *text, uint16_t fg, uint16_t bg, int scale); | 30 | void display_render_text(int x, int y, const char *text, uint16_t fg, uint16_t bg, int scale); |
| 25 | void display_render_qr(const char *text); | 31 | void display_render_qr(const char *text); |
| 26 | 32 | ||