Commit Graph

129 Commits

Author SHA1 Message Date
ipason
a8fddb4220 修改bs测试中途提交 2025-04-23 13:18:12 +08:00
muler
4dff8129a7 新增状态LED 2025-04-23 09:47:21 +08:00
ipason
83ec64a363 新增测试中取消测试功能 2025-04-23 09:36:19 +08:00
ipason
8621bb3f16 新建测试任务待完善 2025-04-23 08:58:26 +08:00
vmWin10
0816204ee9 修改BS控制信息文本为Monster12 2025-04-22 17:42:43 +08:00
ipason
904534dacc 修改了CMake文件,修复了无法打开配置菜单栏问题 2025-04-22 17:40:22 +08:00
vmWin10
ea0ecc715a Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC 2025-04-22 16:26:23 +08:00
vmWin10
963fc0c3b0 关闭前的SquareLine提交 2025-04-22 16:26:11 +08:00
ipason
1e58cd0c9d updateFromSquareline 2025-04-22 16:04:56 +08:00
vmWin10
b0c33123cc Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC 2025-04-22 15:53:17 +08:00
vmWin10
f2968fcd85 新增一个字体文件,修改了通知页的字体 2025-04-22 15:53:10 +08:00
ipason
3f3ab57f78 根据SquareLine工程修改了Component中的代码 2025-04-22 15:45:06 +08:00
vmWin10
c113f9ef94 修改了BS消息通知的label名称 2025-04-22 15:27:57 +08:00
vmWin10
d4bca6ff1f Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC 2025-04-22 15:24:58 +08:00
vmWin10
fe65fb81f5 新增BS节目消息通知功能 2025-04-22 15:24:49 +08:00
ipason
8fef1b6fd5 界面更新完毕 2025-04-22 15:14:43 +08:00
vmWin10
a5fc9c8c4b 清空了 2025-04-22 14:08:37 +08:00
vmWin10
3f617dde08 Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC
# Conflicts:
#	components/FluxUI/ui_event_homePage.c
2025-04-22 14:07:35 +08:00
vmWin10
003fdbc366 删除了一行 2025-04-22 14:05:40 +08:00
ipason
8cbdd945a8 Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC
# Conflicts:
#	components/FluxUI/ui_event_homePage.c
2025-04-22 14:03:12 +08:00
ipason
25500eee9b 我修改了要给 2025-04-22 14:02:16 +08:00
vmWin10
a958ceda34 修改了两个文件 2025-04-22 14:01:10 +08:00
vmWin10
e2c6149ee7 Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC 2025-04-22 13:54:53 +08:00
ipason
73c78832ec 修改了BS的响应事件 2025-04-22 13:51:54 +08:00
vmWin10
0a2171dedd Merge branch 'master' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC 2025-04-22 13:49:05 +08:00
vmWin10
d9df8eccf4 新增BS页中挡位修改触发函数 2025-04-22 13:48:56 +08:00
ipason
b19e150cea 新增BS事件函数移植成功 2025-04-22 11:11:54 +08:00
vmWin10
dd20401bce 新增BS事件响应函数 2025-04-22 11:00:42 +08:00
vmWin10
2dbed817f1 新增BS中设备类型修改操作 2025-04-22 10:46:49 +08:00
ipason
5fdcb7ce87 BS呼吸页面修改成功,编译通过。 2025-04-22 10:40:39 +08:00
vmWin10
7baa091c1d 通过Win10虚拟机修改了SquareLine文件,新增配合呼吸模拟器的测试页面。 2025-04-22 10:14:48 +08:00
ipason
d6d75cc277 移动了SquareLine中的屏幕 2025-04-22 08:43:58 +08:00
ipason
a9b123c6f5 修复重新亮屏后的亮度过高问题 2025-04-21 18:29:00 +08:00
ipason
a2605479a5 新增文件检测功能,找不到索引就新建文件 2025-04-21 17:46:58 +08:00
ipason
0095bbf59d 修改了squareline后的提交【slider light】 2025-04-21 16:14:00 +08:00
ipason
fef182000c 设置默认亮度 2025-04-21 16:11:01 +08:00
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
50f564aa21 整理了event的响应代码,串口收发测试结果显示是合理的。 2025-04-19 16:56:31 +08:00
ipason
627c12e37e 修改了部分event代码 2025-04-19 10:40:11 +08:00
ipason
58cde461c9 组件注释添加完毕,剩下UI没写。 2025-04-19 09:30:40 +08:00
ipason
d217ecf46a 修改了部分注释信息,待完全修改完毕 2025-04-18 18:59:53 +08:00
ipason
4cc0afda2a 适配办公室电脑的环境 2025-04-17 16:25:48 +08:00
ipason
e19b62fd3b Merge commit '8e1aa5abe8663a01ee276bbaf5d8f64dc6f81468' into MasterValid
# Conflicts:
#	.vscode/settings.json
#	SquareLineProj/backup/ESP32S3_UI_backup08.zip
#	components/FluxUI/ui_events.c
#	main/main.cpp
#	sdkconfig
2025-04-17 16:14:05 +08:00
ipason
6cdf78286b 修改了PCB文件 2025-04-17 16:04:28 +08:00
ASUS660
8e1aa5abe8 适配家里的环境 2025-04-17 00:09:29 +08:00
jarvis
3528044ea5 Merge branch 'CPP_Development' of http://sunme.top:3000/YuwellSoftwareEE/FluxDC into CPP_Development 2025-04-16 21:30:03 +08:00
jarvis
f5d6276824 新增了原理图 2025-04-16 21:30:01 +08:00
jarvis
49a8428e11 新增一个日期UI 2025-03-28 10:13:22 +08:00
jarvis
ccf28d0904 新增通过SNTP获取时间功能 2025-03-27 14:57:30 +08:00