CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity
2,100 Commits 3 Branches 5 Tags
96e5825d60b2e035c98ed3f236259a461c960b59
Commit Graph

6 Commits

Author SHA1 Message Date
zkk
baea9235c0 合并新功能 增加开门检测功能等... 2025-05-10 08:08:39 +00:00
zkk
88f477ea89 修复网络IP更新慢问题，新增网络图标，修复F430NX独立双喷头安全距离值，修复取消打印z偏移值保存不上问题 
# Conflicts:
#	ks_includes/locales/KlipperScreen.pot   resolved by 05ba96b66e version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo   resolved by 05ba96b66e version
#	ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po   resolved by 05ba96b66e version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo   resolved by 05ba96b66e version
#	ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po   resolved by 05ba96b66e version
#	panels/factory_settings.py   resolved by 05ba96b66e version
#	panels/network.py   resolved by 05ba96b66e version
 2025-03-05 14:01:28 +08:00
zkk
19621a635f 更新配置文件解决舵机和F430NX的舵机问题 
Squashed commit of the following:

commit acca7d7eab
Merge: f82a1916 628358b3
Author: zkk <1007518571@qq.com>
Date:   Fri Feb 14 17:42:01 2025 +0800

    Merge commit '628358b38a26e9d2113e809898dc8ac0f6e66265' into release

commit 628358b38a
Merge: e88fb64d 3052c81a
Author: zkk <1007518571@qq.com>
Date:   Fri Feb 14 17:38:17 2025 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/GeneralKlipperScreen into develop

commit 3052c81aa2
Author: ruipeng <1041589370@qq.com>
Date:   Fri Feb 14 17:17:43 2025 +0800

    同步更新，优化零位舵机问题；修复F430NX二喷头偏移值逻辑不对导致的超范围报错问题

commit e88fb64ddd
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 17 16:04:57 2025 +0800

    更新机器的配置信息 优化外置驱动的使能延时问题 解决F430NX切头报错问题

commit 9e1613c390
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 17 08:51:35 2025 +0800

    调试零位舵机打开后的等待时间为2s 解决慢速舵机的问题

commit f82a191613
Merge: 65bcc855 f1214483
Author: zkk <1007518571@qq.com>
Date:   Mon Jan 13 18:11:45 2025 +0800

    Merge commit 'f1214483ee5167f4a5e55fcc35e1b5b2be1f73e2' into release

commit f1214483ee
Author: zkk <1007518571@qq.com>
Date:   Mon Jan 13 18:11:18 2025 +0800

    修复不能移轴的错误

commit 65bcc85584
Merge: 20670a7b f9e470ed
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 16:59:45 2025 +0800

    Merge commit 'f9e470ed00443cddf413d21f416a78e8eb3eec27' into release

commit f9e470ed00
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 16:58:07 2025 +0800

    更新D600Pro2 和D1000配置文件

commit 20670a7b09
Merge: 1a87ced3 70942b19
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:41:10 2025 +0800

    Merge commit '70942b197a58d9ff8ac150968693abe88731f838' into release

commit 70942b197a
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:40:12 2025 +0800

    修改双头偏移值页面的二维码和文本

commit 673eb5cdfe
Merge: a676def1 991003e6
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 11:23:39 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop

commit a676def10d
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 11:06:17 2025 +0800

    降低全系舵机速度

commit 6e89c481c3
Author: ruipeng <1041589370@qq.com>
Date:   Fri Jan 10 10:40:20 2025 +0800

    同步更新，完善F430NX断电续打、断料自动切头、复制镜像模式等功能及参数。

commit 991003e6cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d0
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa18
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bd
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f7
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697b
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465c
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618be
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f8561
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8b
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d5
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:26:08 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 882850dbde
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d95
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 4f3aa9aa4c
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:30:00 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit e3fd413d62
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release

# Conflicts:
#	printer_config/D1000/base.cfg   resolved by acca7d7eab version
#	printer_config/D600Pro2/base.cfg   resolved by acca7d7eab version
#	printer_config/F430NX/base.cfg   resolved by acca7d7eab version
 2025-02-14 17:44:49 +08:00
zkk
072f226674 更新D600Pro2与D1000配置文件 
Squashed commit of the following:

commit 65bcc85584
Merge: 20670a7b f9e470ed
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 16:59:45 2025 +0800

    Merge commit 'f9e470ed00443cddf413d21f416a78e8eb3eec27' into release

commit f9e470ed00
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 16:58:07 2025 +0800

    更新D600Pro2 和D1000配置文件

commit 20670a7b09
Merge: 1a87ced3 70942b19
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:41:10 2025 +0800

    Merge commit '70942b197a58d9ff8ac150968693abe88731f838' into release

commit 70942b197a
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:40:12 2025 +0800

    修改双头偏移值页面的二维码和文本

commit 673eb5cdfe
Merge: a676def1 991003e6
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 11:23:39 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop

commit a676def10d
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 11:06:17 2025 +0800

    降低全系舵机速度

commit 6e89c481c3
Author: ruipeng <1041589370@qq.com>
Date:   Fri Jan 10 10:40:20 2025 +0800

    同步更新，完善F430NX断电续打、断料自动切头、复制镜像模式等功能及参数。

commit 991003e6cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d0
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa18
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bd
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f7
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697b
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465c
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618be
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f8561
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8b
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d5
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:26:08 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 882850dbde
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d95
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 4f3aa9aa4c
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:30:00 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit e3fd413d62
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release
 2025-01-10 17:00:35 +08:00
zkk
7d287f416a Squashed commit of the following: 
commit 20670a7b09
Merge: 1a87ced3 70942b19
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:41:10 2025 +0800

    Merge commit '70942b197a58d9ff8ac150968693abe88731f838' into release

commit 70942b197a
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 14:40:12 2025 +0800

    修改双头偏移值页面的二维码和文本

commit 673eb5cdfe
Merge: a676def1 991003e6
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 11:23:39 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop

commit a676def10d
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 11:06:17 2025 +0800

    降低全系舵机速度

commit 6e89c481c3
Author: ruipeng <1041589370@qq.com>
Date:   Fri Jan 10 10:40:20 2025 +0800

    同步更新，完善F430NX断电续打、断料自动切头、复制镜像模式等功能及参数。

commit 991003e6cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d0
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa18
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bd
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f7
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697b
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465c
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618be
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f8561
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8b
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d5
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:26:08 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 882850dbde
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d95
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 4f3aa9aa4c
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:30:00 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit e3fd413d62
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release
 2025-01-10 14:41:59 +08:00
zkk
17b0a05b49 修改为中性UI 2024-12-11 17:01:04 +08:00