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 |
|
ipason
|
51ac160178
|
新增日志记录功能，测试完毕待上线
|
2025-04-21 14:06:52 +08:00 |
|
ipason
|
58cde461c9
|
组件注释添加完毕，剩下UI没写。
|
2025-04-19 09:30:40 +08:00 |
|
jarvis
|
ccf28d0904
|
新增通过SNTP获取时间功能
|
2025-03-27 14:57:30 +08:00 |
|
jarvis
|
82d34131e1
|
新增主界面标准流量动态更改功能
|
2025-03-17 13:46:43 +08:00 |
|
jarvis
|
79e78845fe
|
将所有文件改为UTF8格式
|
2025-03-15 09:37:07 +08:00 |
|
jarvis
|
1aa483a49f
|
新增两个模块进行测试
|
2025-03-14 13:42:15 +08:00 |
|
jarvis
|
93c7296f66
|
界面新增WiFi开启显示
|
2025-03-12 18:44:46 +08:00 |
|
jarvis
|
ed70c1af25
|
将UI控件进行重命名后没有问题的程序
|
2025-03-12 17:32:58 +08:00 |
|
jarvis
|
42223e617a
|
成功完成WiFi连接UI及逻辑设计
|
2025-03-12 14:00:26 +08:00 |
|
jarvis
|
500841b6d2
|
解决了扫描WIFI后程序重启问题
|
2025-03-11 14:36:08 +08:00 |
|
jarvis
|
caaa816163
|
将wifi初始化放在main中的程序，不能将扫描也放到main中。
|
2025-03-10 19:01:20 +08:00 |
|
jarvis
|
8c8e58fec2
|
可以正常WiFi扫描的程序
|
2025-03-10 18:07:34 +08:00 |
|