From 7c26c11c2a1ab4034e9f18fa72b5016bfc3774df Mon Sep 17 00:00:00 2001 From: zkk <1007518571@qq.com> Date: Fri, 14 Feb 2025 15:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=831.1.2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解决舵机的一些已知问题 Squashed commit of the following: commit 2dabfbf08816eafda51ba62b9a69d11801343952 Merge: fd1a6a37c aa375bcff Author: zkk <1007518571@qq.com> Date: Fri Feb 14 15:29:11 2025 +0800 Merge commit 'aa375bcff05744d5d2ab3fd352777abdfb59d35b' into release commit aa375bcff05744d5d2ab3fd352777abdfb59d35b Author: ruipeng <1041589370@qq.com> Date: Fri Feb 14 10:41:22 2025 +0800 全系调整关闭舵机的延时，防止探针刮平台 commit 90aab9ebdc41917ea9ffadd9c09767090c3f4feb Author: ruipeng <1041589370@qq.com> Date: Thu Feb 6 10:51:40 2025 +0800 修复F430NX二头打印完成，停靠到指定位置时报错的问题 commit 2e214ce02ce915cb782ae44df300c33ef8929249 Author: zkk <1007518571@qq.com> Date: Thu Feb 6 09:33:50 2025 +0800 修复零位舵机极小概率初始化角度不对问题 commit bda68396865757cdb5694b90f5268f6ace9ada7f Author: zkk <1007518571@qq.com> Date: Fri Jan 17 15:55:14 2025 +0800 修复设置舵机信号时长参数后，连续不停开关舵机 可能会造成出错的问题 commit fd1a6a37cc2149b4ff9f56609dc5f96d8882cb71 Merge: e2b26bb3f 440010b9c Author: zkk <1007518571@qq.com> Date: Fri Jan 17 14:44:27 2025 +0800 Merge commit '440010b9cbf57bf805ef93b43fc0947746235033' into release commit 440010b9cbf57bf805ef93b43fc0947746235033 Author: zkk <1007518571@qq.com> Date: Fri Jan 17 14:32:11 2025 +0800 增加舵机信号持续时间变量，优化零位舵机信号不持续发送 commit a15d96ff28c1f8e4a3a052f5ca9044d33d699900 Author: zkk <1007518571@qq.com> Date: Fri Jan 17 14:12:17 2025 +0800 优化外置驱动的支持 commit fe7244707827bc5da4b0ac22d8016c67cb0bf025 Merge: c7326be18 32fc128f9 Author: zkk <1007518571@qq.com> Date: Fri Jan 17 11:05:04 2025 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit 32fc128f991b4a336793a451da30273652b827f7 Author: ruipeng <1041589370@qq.com> Date: Fri Jan 17 10:42:44 2025 +0800 修复F430NX停靠喷头与偏移值的计算逻辑 commit 75da8e8e634d4b65f1c8834421ae5638c7b479e0 Author: ruipeng <1041589370@qq.com> Date: Fri Jan 17 09:10:15 2025 +0800 修复V0版机型T_fan逻辑问题 commit e2b26bb3fe3992b5f4eb25bffe9ea82c450cde7a Merge: 3024b7666 c7326be18 Author: zkk <1007518571@qq.com> Date: Fri Jan 10 13:39:00 2025 +0800 Merge commit 'c7326be1837eda161c5a13cfd3d00ea74b7d4753' into release commit c7326be1837eda161c5a13cfd3d00ea74b7d4753 Merge: d0dcac451 9da7304dc Author: zkk <1007518571@qq.com> Date: Fri Jan 10 13:38:31 2025 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit d0dcac45196e9012caea32ee8099ee266f5777a2 Author: zkk <1007518571@qq.com> Date: Fri Jan 10 10:56:34 2025 +0800 全系降低探测舵机的速度 commit 9da7304dc2911e3180e8fd92ef281dd9280ef289 Author: ruipeng <1041589370@qq.com> Date: Thu Jan 9 16:39:13 2025 +0800 修复F430NX在DUAL模式下，耗材触发提示不准确的问题 commit ea3e219f503c3086fd13ff5e68ee57bc49b1e354 Author: ruipeng <1041589370@qq.com> Date: Thu Jan 9 10:09:21 2025 +0800 1、修复F430NX断料自动切头时，喷头偏移值未应用的问题 2、修复喷头一停靠位置不对的问题 commit 3024b76663d614ef8da0d0d5fcd0add3cdca4d39 Merge: 03d11a16b dda0962b9 Author: zkk <1007518571@qq.com> Date: Tue Jan 7 17:21:40 2025 +0800 Merge commit 'dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2' into release commit dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2 Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 16:40:43 2025 +0800 修复F430NX回零后，切换喷头会报错的问题 commit 95d20c9b6357a444871ea9dce5f5ad35d74c1990 Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 16:33:54 2025 +0800 1、修复F430NX触发耗材检测，喷头超时冷却，手动设置温度并装载耗材后，恢复打印时二头温度不恢复的问题。 2、修改等待温度恢复的提示内容 commit 2c2d0c7be12d6c497a1a479ec3aa08499f6bba0f Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 16:33:31 2025 +0800 优化F430NX驱动散热风扇启停逻辑 commit 3e5c530975dfa058be7db31c15116d46e6aaad84 Author: ruipeng <1041589370@qq.com> Date: Tue Jan 7 13:56:48 2025 +0800 调整F30NX网床调平时探针提升的高度 规避offset过大时未移动床即触发的报错 commit c7cb4b97c26c14806b1bbc131510f792ab15b66a Author: ruipeng <1041589370@qq.com> Date: Thu Jan 2 17:57:20 2025 +0800 全系添加_CANCEL_PRINT_BASE宏支持 commit 03d11a16b3edc1f440251420b1105d20872ebdd7 Merge: e052ab095 ba4f343e9 Author: zkk <1007518571@qq.com> Date: Tue Dec 31 17:28:20 2024 +0800 Merge commit 'ba4f343e9430af5538610529dd400f1f954b0078' into release commit ba4f343e9430af5538610529dd400f1f954b0078 Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 17:25:28 2024 +0800 F430NX：Y驱动细分由128->64 commit e052ab0957f7991a78b90e9974ae07d60d266226 Merge: 25bc7c6d9 b2b98c057 Author: zkk <1007518571@qq.com> Date: Tue Dec 31 15:15:14 2024 +0800 Merge commit 'b2b98c057a7d23f9c8b0aec4c14844f7c24d6bde' into release commit b2b98c057a7d23f9c8b0aec4c14844f7c24d6bde Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:56:18 2024 +0800 F430NX状态灯功能 commit f3cdc1dd75d96f976502946e752e9f7831288469 Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:55:48 2024 +0800 全系支持PRINT_START，PRINT_END宏 commit ecbde51331316e6c454c09d03d93c3337ae17d8a Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:54:11 2024 +0800 F430NX二喷头静音阈值由200->300 commit 40985b8d9a7a8e26fb3c448f0794dab82d866382 Author: ruipeng <1041589370@qq.com> Date: Tue Dec 31 10:53:55 2024 +0800 f430NX增加驱动器散热风扇控制 commit 682e343d6176c1c0764a7befd12d7971374b2b29 Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 17:27:29 2024 +0800 修复必须回零后才能取消打印的问题 commit e941884b8ec1d5aec058a6fdc2a2aa94f40bf8b5 Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 16:29:08 2024 +0800 修复F430NX机型Y轴在零位时回零报错的问题 commit e2a9ff2bfe2f9d4971045ce6fbd6f9835cf6475a Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 13:36:54 2024 +0800 优化F430NX复制、镜像模式，解决坐标超范围问题 commit 4fe4b7f67dc4b09b67dfb930e3bae80a525e164f Author: ruipeng <1041589370@qq.com> Date: Mon Dec 30 13:32:25 2024 +0800 调整F430NX喷头二X电流，由1->1.5 commit f8f7aabbe226d987bea3ba9033569b12eb00f182 Author: zkk <1007518571@qq.com> Date: Fri Dec 27 17:15:17 2024 +0800 关闭F430NX热风校验功能 commit 7f532dc1019ad4ade1992c835b925f162c80ba1a Author: zkk <1007518571@qq.com> Date: Fri Dec 27 17:14:51 2024 +0800 删除旧的设置offset宏定义 commit 34b6971b41e0b6a7bce978901404cec1e80b17a4 Author: ruipeng <1041589370@qq.com> Date: Fri Dec 27 15:29:04 2024 +0800 修复自动切头开关逻辑，优化恢复打印弹窗内容 commit 765bc8dc22cad7f75f2d8d76f0add94dc0ab802a Author: ruipeng <1041589370@qq.com> Date: Thu Dec 26 11:41:34 2024 +0800 优化耗材检测弹窗内容及格式 commit 25bc7c6d9ee89e6cd4e326bb8497faf6a6256fcd Merge: 588ea4402 9b487abec Author: zkk <1007518571@qq.com> Date: Thu Dec 19 16:23:07 2024 +0800 Merge commit '9b487abec3449dea3673618c1a8b9e88f16b4c40' into release commit 9b487abec3449dea3673618c1a8b9e88f16b4c40 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 19 16:03:04 2024 +0800 F430NX更换为闭环Y电机 commit 641f767175387cacf9820affd616dcdb017590b9 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 19 10:42:11 2024 +0800 F430NX复制、镜像模式优化 commit ef148604da4f925305939e74cfb0edc7fbd261d1 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 19 10:40:25 2024 +0800 自动切头功能 commit fa74a82184caa6a914a32578b31aeb21f8299c7c Merge: 9307b8957 93efb1abd Author: zkk <1007518571@qq.com> Date: Wed Dec 18 15:53:46 2024 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit 9307b89570a63040259b457ef7ff8969b394b527 Author: zkk <1007518571@qq.com> Date: Wed Dec 18 15:49:41 2024 +0800 修复重启时候有概率出现温度数值异常的问题 commit 9925c7864471f1f9f7b1e22f45dc4d1421c1245a Author: zkk <1007518571@qq.com> Date: Tue Dec 17 15:55:28 2024 +0800 实现二喷头的偏移值校准功能 commit 93efb1abdea67a732b17351b8c31ae5387eaaf91 Author: ruipeng <1041589370@qq.com> Date: Fri Dec 13 09:55:41 2024 +0800 配置网床调平淡出高度 commit 30b77165a7bdae2cd338c283fbab3c8baa37c694 Author: ruipeng <1041589370@qq.com> Date: Thu Dec 12 14:03:30 2024 +0800 调整F430NX探测舵机角度，由90°->120° commit 588ea4402812b09100b2417b040d7daa2d2fbfaa Merge: 349f8f7a2 9be203c58 Author: zkk <1007518571@qq.com> Date: Thu Dec 12 10:39:56 2024 +0800 Merge commit '9be203c58f7c88e4f6963a1079d2dcfaa5401dde' into release commit 9be203c58f7c88e4f6963a1079d2dcfaa5401dde Author: ruipeng <1041589370@qq.com> Date: Wed Dec 11 15:24:05 2024 +0800 新增D600pro2、D1000的V0版机型 commit 349f8f7a249ac113700eed2b4a234473016d32c0 Merge: e554ddb83 401da556f Author: zkk <1007518571@qq.com> Date: Fri Nov 29 10:21:01 2024 +0800 Merge branch 'develop' into release commit 401da556f58df5e917a379dd54565ef5775f7ed2 Merge: 508378825 52ea64cf8 Author: zkk <1007518571@qq.com> Date: Fri Nov 29 10:12:48 2024 +0800 Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop commit 52ea64cf83535c84c378239b43a7f0a6a362a517 Author: ruipeng <1041589370@qq.com> Date: Thu Nov 28 10:55:09 2024 +0800 修复暂停掉温后，恢复时喷头温度不能恢复的问题 commit 508378825da2881043b88427a6df03230c9f66c0 Author: zkk <1007518571@qq.com> Date: Wed Nov 27 14:47:23 2024 +0800 D1000 z轴最大速度设置成7 commit 41c2cd39275dfecafd85a0cbe504f2f5f1cdeec6 Author: zkk <1007518571@qq.com> Date: Mon Nov 25 17:12:23 2024 +0800 优化热电偶最大报错次数 # Conflicts: # config/CreatBot_D1000_V0/base.cfg resolved by 2dabfbf08816eafda51ba62b9a69d11801343952 version # config/CreatBot_D600Pro2_V0/base.cfg resolved by 2dabfbf08816eafda51ba62b9a69d11801343952 version # config/CreatBot_F430NX/base.cfg resolved by 2dabfbf08816eafda51ba62b9a69d11801343952 version # klippy/extras/servo.py resolved by 2dabfbf08816eafda51ba62b9a69d11801343952 version --- config/CreatBot_D1000/base.cfg | 1 + config/CreatBot_D1000_V0/base.cfg | 1 + config/CreatBot_D600Pro2/base.cfg | 1 + config/CreatBot_D600Pro2_V0/base.cfg | 1 + config/CreatBot_F430NX/base.cfg | 7 +++++-- klippy/extras/servo.py | 6 ++++-- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg index 946ba385a..b02424fe0 100644 --- a/config/CreatBot_D1000/base.cfg +++ b/config/CreatBot_D1000/base.cfg @@ -419,6 +419,7 @@ gcode: [gcode_macro PROBE_SERVO_CLOSE] gcode: SET_SERVO SERVO=probe_servo angle=130 + G4 P2000 [gcode_macro _START_PRINT_BASE] description: Call when starting to print diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg index 0e245940f..925cadd87 100644 --- a/config/CreatBot_D1000_V0/base.cfg +++ b/config/CreatBot_D1000_V0/base.cfg @@ -355,6 +355,7 @@ gcode: [gcode_macro PROBE_SERVO_CLOSE] gcode: SET_SERVO SERVO=probe_servo angle=130 + G4 P2000 [gcode_macro _START_PRINT_BASE] description: Call when starting to print diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg index c87325575..d594d5f67 100644 --- a/config/CreatBot_D600Pro2/base.cfg +++ b/config/CreatBot_D600Pro2/base.cfg @@ -419,6 +419,7 @@ gcode: [gcode_macro PROBE_SERVO_CLOSE] gcode: SET_SERVO SERVO=probe_servo angle=130 + G4 P2000 [gcode_macro _START_PRINT_BASE] description: Call when starting to print diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg index 536808ca6..b32caee74 100644 --- a/config/CreatBot_D600Pro2_V0/base.cfg +++ b/config/CreatBot_D600Pro2_V0/base.cfg @@ -356,6 +356,7 @@ gcode: [gcode_macro PROBE_SERVO_CLOSE] gcode: SET_SERVO SERVO=probe_servo angle=130 + G4 P2000 [gcode_macro _START_PRINT_BASE] description: Call when starting to print diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 1169e773a..531d0b9bb 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -570,8 +570,8 @@ gcode: [gcode_macro PROBE_SERVO_CLOSE] gcode: - G4 P500 SET_SERVO SERVO=probe_servo angle=165 + G4 P2000 [gcode_macro _START_PRINT_BASE] description: Call when starting to print @@ -625,6 +625,8 @@ gcode: [gcode_macro END_PRINT] gcode: + {% set svv = printer.save_variables.variables %} + {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %} M400 G92 E0 G1 E-10.0 F3600 @@ -633,6 +635,7 @@ gcode: {% set dual_mode = printer['gcode_macro _SET_DUAL_MODE'].dual_mode|default("primary") %} {% if dual_mode == "copy" or dual_mode == "mirror" %} G0 Z1.00 F6000 + _ACTIVATE_PRIMARY_MODE G90 _PARK_extruder _PARK_extruder1 @@ -645,7 +648,7 @@ gcode: M107 G1 Z2 F3000 G90 - G0 Y300 F3600 + G0 Y{300-(y_offset if printer.toolhead.extruder == 'extruder1' else 0)} F3600 # BED_MESH_CLEAR [gcode_macro PRINT_END] diff --git a/klippy/extras/servo.py b/klippy/extras/servo.py index 99b5cb6e4..b0163956a 100644 --- a/klippy/extras/servo.py +++ b/klippy/extras/servo.py @@ -74,11 +74,12 @@ class PrinterServo: if self.signal_duration: if abs(self.signal_duration / 0.02 - round(self.signal_duration / 0.02)) < 1e-9: self.signal_duration -= 0.001 - print_time = max(print_time, print_time + self.signal_duration) + print_time = max(print_time + SERVO_SIGNAL_PERIOD, print_time + self.signal_duration) self.mcu_servo.set_pwm(print_time, 0) + self.last_value_time = print_time def _handle_ready(self): print_time = self.printer.lookup_object('toolhead').get_last_move_time() - self._handle_signal_duration(print_time) + self._set_pwm(print_time, self.initial_pwm) def _get_pwm_from_angle(self, angle): angle = max(0., min(self.max_angle, angle)) width = self.min_width + angle * self.angle_to_width @@ -90,6 +91,7 @@ class PrinterServo: cmd_SET_SERVO_help = "Set servo angle" def cmd_SET_SERVO(self, gcmd): print_time = self.printer.lookup_object('toolhead').get_last_move_time() + print_time = max(print_time, self.last_value_time) width = gcmd.get_float('WIDTH', None) if width is not None: if self.steps_decomposed: