Compare commits

...

28 Commits

Author SHA1 Message Date
zkk
530470a41c Merge commit '5c36e52012b0b789772efad207da125188b1e109' into release
# Conflicts:
#	config/CreatBot_D1000/1.1/door_detect.cfg   resolved by 5c36e52 version
#	config/CreatBot_D1000/1.1/door_detect.cfg~HEAD   resolved by 5c36e52 version
#	config/CreatBot_D1000/base.cfg   resolved by 5c36e52 version
#	config/CreatBot_D600Pro2/1.1/door_detect.cfg   resolved by 5c36e52 version
#	config/CreatBot_D600Pro2/1.1/door_detect.cfg~HEAD   resolved by 5c36e52 version
#	config/CreatBot_D600Pro2/base.cfg   resolved by 5c36e52 version
2025-05-10 16:50:53 +08:00
zkk
248a4e48a0 优化关于温度的报警提示
(cherry picked from commit f4afd87318f42e53fa235bc1b3062ceda9d5d8a7)
2025-04-22 17:29:48 +08:00
4ea52d07b4 修复Kit版机型的一处拼写错误
(cherry picked from commit 42139a47dbf272a0ef24220cd533f4fc2e19ec1c)
2025-04-22 17:26:35 +08:00
5ae4989358 修复D600pro2、D1000机型断料自动切头时,喷头偏移值未应用的问题
(cherry picked from commit 58678be1f83d74ac0e3c2435ffb5d71078918f47)
2025-04-22 17:25:40 +08:00
zkk
af723d3cd0 优化D600Pro2HS和D1000HS的Z轴step脉冲信号脉宽为5微秒
(cherry picked from commit d521dd26fa7c21a14e5a01f8ffd7bc491c3fe1af)
2025-04-11 11:19:35 +08:00
661f3eae0f 修复开门检测机型暂停后点击恢复没反应的问题
(cherry picked from commit d9500887ac6447bf541e44b36584cd9dfba51533)
2025-04-11 11:19:35 +08:00
zkk
1ae7fc486f 解决D600Pro2HS更换z轴电机 解锁电机点击回零z轴下降距离不够的问题
(cherry picked from commit 40ef648e4cdbc6b0bd9d679f46ee7766850afd88)
2025-04-11 11:19:35 +08:00
zkk
764b9fe983 修改D600Pro2舵机收起的角度
(cherry picked from commit 13552e128338c5b9ec414f3baef832a5c997c831)
2025-04-11 11:19:35 +08:00
4cdbc006d3 实现开门检测功能
(cherry picked from commit 82b7fc8acfdc61853da617e7d3e0bb83163f454b)
2025-03-31 10:02:01 +08:00
zkk
a0958a82cc Merge commit '724fa910c5e20a6595fc41c2dfbe77effc9419ac' into release 2025-03-17 16:46:17 +08:00
zkk
e3d668e0e5 Merge commit 'a5955157dbf3088822e82998511a001d11b7b113' into release 2025-03-03 15:30:17 +08:00
zkk
2dabfbf088 Merge commit 'aa375bcff05744d5d2ab3fd352777abdfb59d35b' into release 2025-02-14 15:29:11 +08:00
zkk
fd1a6a37cc Merge commit '440010b9cbf57bf805ef93b43fc0947746235033' into release 2025-01-17 14:44:27 +08:00
zkk
e2b26bb3fe Merge commit 'c7326be1837eda161c5a13cfd3d00ea74b7d4753' into release 2025-01-10 13:39:00 +08:00
zkk
3024b76663 Merge commit 'dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2' into release 2025-01-07 17:21:40 +08:00
zkk
03d11a16b3 Merge commit 'ba4f343e9430af5538610529dd400f1f954b0078' into release 2024-12-31 17:28:20 +08:00
zkk
e052ab0957 Merge commit 'b2b98c057a7d23f9c8b0aec4c14844f7c24d6bde' into release 2024-12-31 15:15:14 +08:00
zkk
25bc7c6d9e Merge commit '9b487abec3449dea3673618c1a8b9e88f16b4c40' into release 2024-12-19 16:23:07 +08:00
zkk
588ea44028 Merge commit '9be203c58f7c88e4f6963a1079d2dcfaa5401dde' into release 2024-12-12 10:39:56 +08:00
zkk
349f8f7a24 Merge branch 'develop' into release 2024-11-29 10:21:01 +08:00
zkk
e554ddb83c Merge branch 'develop' 2024-11-15 16:37:01 +08:00
zkk
cae8bdbf21 Merge branch 'develop' 2024-11-09 16:15:18 +08:00
zkk
249ce23f34 Merge branch 'develop' 2024-11-01 11:16:20 +08:00
zkk
a012f4d942 Merge branch 'develop' 2024-10-18 16:33:44 +08:00
zkk
436fc72a7a Merge branch 'develop' 2024-09-19 14:29:14 +08:00
zkk
98b74a2fc6 Merge branch 'develop' 2024-09-13 16:22:51 +08:00
zkk
f79c536524 Merge branch 'develop' 2024-09-12 14:28:16 +08:00
zkk
da791f9d98 Merge branch 'develop' 2024-09-07 17:22:24 +08:00

Diff Content Not Available