CreatBot/CreatBotMoonraker
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加支持CreatbotWare软件元数据的支持和修复断电保存z精度问题:

Browse Source 
commit 34c1604d8c5a79e95e94f13c34b5635672df47d1
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 3 14:33:32 2024 +0800

    关闭更新管理中指定节点的配置

commit d3355361dc7ff974a9fef25956adc2966ba58120
Merge: 333a789 9c00be2
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:04:34 2024 +0800

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

commit 9c00be2f4e21f2738e4e59d92e5af4a335a258b6
Author: ruipeng <1041589370@qq.com>
Date:   Fri Nov 29 08:57:23 2024 +0800

    gcode文件切片信息显示适配CreatWare切片软件

commit 333a789469445f5cb60d29dc7ed24a2776db3385
Author: zkk <1007518571@qq.com>
Date:   Tue Nov 26 18:03:29 2024 +0800

    修复z高度保存的精度问题
This commit is contained in:
张开科 2024-12-03 14:34:30 +08:00
parent c76a8e5748
commit 75d52f9f56
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/moonraker.conf
View File

@ -64,9 +64,9 @@ on_press:
{% set print_state = data['status']['print_stats']['state'] %}
# Judging the printer status
{% if print_state | string == 'printing' or print_state | string == 'paused' %}
{% set x_position = data['status']['gcode_move']['gcode_position'][0] %}
{% set y_position = data['status']['gcode_move']['gcode_position'][1] %}
{% set z_position = data['status']['gcode_move']['gcode_position'][2] %}
{% set x_position = data['status']['gcode_move']['gcode_position'][0] | round(4) %}
{% set y_position = data['status']['gcode_move']['gcode_position'][1] | round(4) %}
{% set z_position = data['status']['gcode_move']['gcode_position'][2] | round(4) %}
{% set hotend = data['status']['toolhead']['extruder'] %}
{% set filepath = data['status']['virtual_sdcard']['file_path'] %}
{% set filename = filepath.split('/')[-1] %}
@ -98,7 +98,6 @@ refresh_interval: 168
[update_manager klipper]
channel: stable
pinned_commit: e554ddb83c770a668a912d0e6ad23c1069bf6710
[update_manager KlipperScreen]
type: git_repo
@ -108,7 +107,6 @@ env: /home/klipper/.KlipperScreen-env/bin/python
requirements: scripts/KlipperScreen-requirements.txt
install_script: scripts/KlipperScreen-install.sh
channel: stable
pinned_commit: 629416d1f255f79f02a0341702bbc9bb8db694cb
[update_manager mainsail-config]
type: git_repo

1
moonraker/components/file_manager/metadata.py
View File

@ -313,6 +313,7 @@ class PrusaSlicer(BaseSlicer):
'SliCR-3D': r"SliCR-3D\s(.*)\son",
'BambuStudio': r"BambuStudio[^ ]*\s(.*)\n",
'A3dp-Slicer': r"A3dp-Slicer\s(.*)\son",
'CreatWare': r"CreatWare\s(.*)\son",
}
for name, expr in aliases.items():
match = re.search(expr, data)