CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复打印时没有修改探针偏移值显示保存探针偏移按钮问题，修改自适应调平默认为关闭状态，新增套件机型配置

Browse Source 
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
This commit is contained in:
张开科 2024-12-12 10:34:30 +08:00
parent 15ae010974
commit af5d755ff2
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/model_menu.conf
View File

@ -1,4 +1,6 @@
CreatBot_F430NX CreatBot_F430NX
CreatBot_D600Pro2 CreatBot_D600Pro2
CreatBot_D600Pro2_V0
CreatBot_D1000 CreatBot_D1000
CreatBot_D1000_V0
CreatBot_P800 CreatBot_P800

5
panels/advanced.py
View File

@ -15,7 +15,7 @@ class Panel(ScreenPanel):
self.advanced_options = [ self.advanced_options = [
{"adaptive_leveling": {"section": "main", "name": _("Adaptive Bed Leveling"), "type": "binary", {"adaptive_leveling": {"section": "main", "name": _("Adaptive Bed Leveling"), "type": "binary",
"tooltip": _("Leveling Only in the Actual Print Area"), "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", {"power_loss_recovery": {"section": "main", "name": _("Power Loss Recovery"), "type": "binary",
"tooltip": _("Restores your print job after a power outage"), "tooltip": _("Restores your print job after a power outage"),
"value": "True", "callback": self.set_power_loss_recovery}}, "value": "True", "callback": self.set_power_loss_recovery}},
@ -50,5 +50,8 @@ class Panel(ScreenPanel):
variables = data['save_variables']['variables'] variables = data['save_variables']['variables']
if 'adaptive_meshing' in variables: if 'adaptive_meshing' in variables:
self.menu_list['adaptive_leveling'].set_active(variables['adaptive_meshing']) 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: if 'power_loss_recovery' in variables:
self.menu_list['power_loss_recovery'].set_active(variables['power_loss_recovery']) self.menu_list['power_loss_recovery'].set_active(variables['power_loss_recovery'])

3
panels/job_status.py
View File

@ -739,9 +739,10 @@ class Panel(ScreenPanel):
self.enable_button("resume", "cancel") self.enable_button("resume", "cancel")
self.can_close = False self.can_close = False
else: else:
active_extruder = self._printer.get_stat("toolhead", "extruder")
offset = self._printer.get_stat("gcode_move", "homing_origin") offset = self._printer.get_stat("gcode_move", "homing_origin")
self.zoffset = float(offset[2]) if offset else 0 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: if "Z_OFFSET_APPLY_ENDSTOP" in self._printer.available_commands:
self.buttons['button_grid'].attach(self.buttons["save_offset_endstop"], 0, 0, 1, 1) self.buttons['button_grid'].attach(self.buttons["save_offset_endstop"], 0, 0, 1, 1)
else: else: