From af5d755ff296402e3666a8f20c8bccd33c7cfeca Mon Sep 17 00:00:00 2001 From: zkk <1007518571@qq.com> Date: Thu, 12 Dec 2024 10:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BF=AE=E6=94=B9=E6=8E=A2=E9=92=88=E5=81=8F?= =?UTF-8?q?=E7=A7=BB=E5=80=BC=E6=98=BE=E7=A4=BA=E4=BF=9D=E5=AD=98=E6=8E=A2?= =?UTF-8?q?=E9=92=88=E5=81=8F=E7=A7=BB=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=87=AA=E9=80=82=E5=BA=94=E8=B0=83?= =?UTF-8?q?=E5=B9=B3=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=85=B3=E9=97=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A5=97=E4=BB=B6=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squashed commit of the following: commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea Merge: 1a87ced3 4f3aa9aa Author: zkk <1007518571@qq.com> Date: Thu Dec 12 10:33:58 2024 +0800 Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release commit 4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f 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 1a69b5180de733f15550a1294a7221d6070306a0 Author: ruipeng <1041589370@qq.com> Date: Wed Dec 11 11:44:36 2024 +0800 新增D600pro2、D1000的V0版机型 commit e3fd413d6256414441e9fe653c1132b1799a5cb2 Author: zkk <1007518571@qq.com> Date: Tue Dec 10 14:34:13 2024 +0800 修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug commit 594fb668fe94fe907c028bf65ecced43ea8660cb Author: zkk <1007518571@qq.com> Date: Tue Dec 10 14:25:04 2024 +0800 设置自适应调平选项默认为关闭状态 commit 1a87ced3f5725569a6b9a7ee5f5250044d01d852 Merge: 629416d1 6064a6e1 Author: zkk <1007518571@qq.com> Date: Fri Nov 29 10:18:32 2024 +0800 Merge branch 'develop' into release --- config/model_menu.conf | 2 ++ panels/advanced.py | 5 ++++- panels/job_status.py | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/model_menu.conf b/config/model_menu.conf index 24fe3bd8..aca36403 100644 --- a/config/model_menu.conf +++ b/config/model_menu.conf @@ -1,4 +1,6 @@ CreatBot_F430NX CreatBot_D600Pro2 +CreatBot_D600Pro2_V0 CreatBot_D1000 +CreatBot_D1000_V0 CreatBot_P800 diff --git a/panels/advanced.py b/panels/advanced.py index 903a9c02..adbe4216 100644 --- a/panels/advanced.py +++ b/panels/advanced.py @@ -15,7 +15,7 @@ class Panel(ScreenPanel): self.advanced_options = [ {"adaptive_leveling": {"section": "main", "name": _("Adaptive Bed Leveling"), "type": "binary", "tooltip": _("Leveling Only in the Actual Print Area"), - "value": "True", "callback": self.set_adaptive_leveling}}, + "value": "False", "callback": self.set_adaptive_leveling}}, {"power_loss_recovery": {"section": "main", "name": _("Power Loss Recovery"), "type": "binary", "tooltip": _("Restores your print job after a power outage"), "value": "True", "callback": self.set_power_loss_recovery}}, @@ -50,5 +50,8 @@ class Panel(ScreenPanel): variables = data['save_variables']['variables'] if 'adaptive_meshing' in variables: self.menu_list['adaptive_leveling'].set_active(variables['adaptive_meshing']) + else: + self.menu_list["adaptive_leveling"].set_active(False) + if 'power_loss_recovery' in variables: self.menu_list['power_loss_recovery'].set_active(variables['power_loss_recovery']) diff --git a/panels/job_status.py b/panels/job_status.py index 515afa6a..b325db48 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -739,9 +739,10 @@ class Panel(ScreenPanel): self.enable_button("resume", "cancel") self.can_close = False else: + active_extruder = self._printer.get_stat("toolhead", "extruder") offset = self._printer.get_stat("gcode_move", "homing_origin") self.zoffset = float(offset[2]) if offset else 0 - if self.zoffset != 0: + if self.zoffset != 0 and active_extruder == "extruder": if "Z_OFFSET_APPLY_ENDSTOP" in self._printer.available_commands: self.buttons['button_grid'].attach(self.buttons["save_offset_endstop"], 0, 0, 1, 1) else: