ipason e48a28d059 Merge branch 'MasterValid' ... # Conflicts: # .vscode/settings.json # CMakeLists.txt # SquareLineProj/ESP32S3_UI.sll # SquareLineProj/ESP32S3_UI.spj # SquareLineProj/Export/screens/ui_pageDebug.c # SquareLineProj/Export/screens/ui_pageHome.c # SquareLineProj/Export/ui.c # SquareLineProj/Export/ui.h # SquareLineProj/Export/ui_events.c # SquareLineProj/Export/ui_events.h # SquareLineProj/backup/ESP32S3_UI_backup00.zip # SquareLineProj/backup/ESP32S3_UI_backup01.zip # SquareLineProj/backup/ESP32S3_UI_backup02.zip # SquareLineProj/backup/ESP32S3_UI_backup03.zip # SquareLineProj/backup/ESP32S3_UI_backup04.zip # SquareLineProj/backup/ESP32S3_UI_backup05.zip # SquareLineProj/backup/ESP32S3_UI_backup06.zip # SquareLineProj/backup/ESP32S3_UI_backup07.zip # SquareLineProj/backup/ESP32S3_UI_backup08.zip # SquareLineProj/backup/ESP32S3_UI_backup09.zip # components/FluxButton/FluxButton.h # components/FluxDisplayPort/FluxDisplayPort.c # components/FluxMod/FluxMod.h # components/FluxSD/FluxSD.c # components/FluxUI/CMakeLists.txt # components/FluxUI/screens/ui_pageDebug.c # components/FluxUI/screens/ui_pageHome.c # components/FluxUI/ui.c # components/FluxUI/ui.h # components/FluxUI/ui_events.c # components/FluxUI/ui_events.h # components/FluxUart/FluxUart.h # components/FluxWifi/FluxWifi.h # dependencies.lock # main/CMakeLists.txt # main/idf_component.yml # main/main.h		2025-04-21 15:06:22 +08:00
..
78__esp-wifi-connect	改写main文件后编译没问题的程序等待初始化其他驱动	2025-03-14 18:59:49 +08:00
espressif__button	新增Button组件	2025-03-08 10:23:13 +08:00
espressif__cmake_utilities	新增Button组件	2025-03-08 10:23:13 +08:00
espressif__esp_lcd_touch	在main文件中新增触摸屏驱动	2025-03-03 21:36:45 +08:00
espressif__esp_lcd_touch_ft5x06	在main文件中新增触摸屏驱动	2025-03-03 21:36:45 +08:00
espressif__esp-idf-cxx	新增两个模块进行测试	2025-03-14 13:42:15 +08:00
lvgl__lvgl	新增了LVGL模块	2025-03-03 21:03:56 +08:00