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
..
images	增加了模板文件及gitignore	2025-03-03 20:29:13 +08:00
CMakeLists.txt	新增通过SNTP获取时间功能	2025-03-27 14:57:30 +08:00
idf_component.yml	改写main文件后编译没问题的程序等待初始化其他驱动	2025-03-14 18:59:49 +08:00
Kconfig.projbuild	增加了模板文件及gitignore	2025-03-03 20:29:13 +08:00
main.cc	将程序变为C/CPP混编前的提交	2025-03-14 15:58:53 +08:00
main.cpp	新增日志记录功能，测试完毕待上线	2025-04-21 14:06:52 +08:00
main.h	修改了部分注释信息，待完全修改完毕	2025-04-18 18:59:53 +08:00