From 899016795c389151e6b486ec470653f5688e5c5f Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 20 May 2026 02:14:45 +0530 Subject: feat: merge display-fix — touch driver, keyboard, WiFi setup UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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). --- components/axs15231b/include/axs15231b.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'components/axs15231b/include') diff --git a/components/axs15231b/include/axs15231b.h b/components/axs15231b/include/axs15231b.h index 5ec017c..32c489f 100644 --- a/components/axs15231b/include/axs15231b.h +++ b/components/axs15231b/include/axs15231b.h @@ -5,8 +5,8 @@ #include #include -#define AXS15231B_WIDTH 480 -#define AXS15231B_HEIGHT 320 +#define AXS15231B_WIDTH 320 +#define AXS15231B_HEIGHT 480 #define AXS15231B_PIN_CS 45 #define AXS15231B_PIN_CLK 47 @@ -23,5 +23,4 @@ void axs15231b_fill_rect(int x, int y, int w, int h, uint16_t color); void axs15231b_flush(void); int axs15231b_get_width(void); int axs15231b_get_height(void); - #endif -- cgit v1.2.3