From 1fb0e3f6ccb8234c7bc3e1b0c4f9df99e214dc7e Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Mon, 16 May 2022 22:04:33 +0200 Subject: [PATCH 1/3] build: Split source file on multiple lines Makes it easier to read and also better for merge/rebase commits that add source files Signed-off-by: Sylvain Munaut --- main/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index bc32bd7..4b0f17e 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,5 +1,15 @@ idf_component_register( - SRCS "main.c" "menu.c" "fpga_test.c" "pax_keyboard.c" "system_wrapper.c" "appfs_wrapper.c" "graphics_wrapper.c" "settings.c" "wifi_connection.c" "rp2040_updater.c" "wifi_ota.c" + SRCS "main.c" + "appfs_wrapper.c" + "fpga_test.c" + "graphics_wrapper.c" + "menu.c" + "pax_keyboard.c" + "rp2040_updater.c" + "settings.c" + "system_wrapper.c" + "wifi_connection.c" + "wifi_ota.c" INCLUDE_DIRS "." "include" EMBED_TXTFILES ${project_dir}/server_certs/isrgrootx1.pem ) From 7ae0bae77330b040dd8f0950df0b6be9fe8e99e0 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Mon, 16 May 2022 21:49:38 +0200 Subject: [PATCH 2/3] components: Update spi-ili9341 Signed-off-by: Sylvain Munaut --- components/spi-ili9341 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/spi-ili9341 b/components/spi-ili9341 index 4bc9099..8fe7ca9 160000 --- a/components/spi-ili9341 +++ b/components/spi-ili9341 @@ -1 +1 @@ -Subproject commit 4bc90991a83df4e733705cc7c89906c64756e0f2 +Subproject commit 8fe7ca9876e2afed472c5d01170d4e76acdf6399 From 3499d6dea4d49bdc90cb4dc9f5c2525f17cf1863 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Mon, 16 May 2022 21:50:17 +0200 Subject: [PATCH 3/3] fpga_test: Simplify LCD handover It's all handled by the deinit Signed-off-by: Sylvain Munaut --- main/fpga_test.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/main/fpga_test.c b/main/fpga_test.c index dbacc90..7650e0a 100644 --- a/main/fpga_test.c +++ b/main/fpga_test.c @@ -156,12 +156,6 @@ void fpga_test(ILI9341* ili9341, ICE40* ice40, xQueueHandle buttonQueue) { reload_fpga = false; printf("LCD deinit...\n"); ili9341_deinit(ili9341); - printf("LCD deselect...\n"); - ili9341_select(ili9341, false); - printf("Wait...\n"); - vTaskDelay(200 / portTICK_PERIOD_MS); - printf("LCD select...\n"); - ili9341_select(ili9341, true); printf("FPGA load...\n"); if (load_old_bitstream) {