From 333a789469445f5cb60d29dc7ed24a2776db3385 Mon Sep 17 00:00:00 2001 From: zkk <1007518571@qq.com> Date: Tue, 26 Nov 2024 18:03:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dz=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/moonraker.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/moonraker.conf b/config/moonraker.conf index ab5a264..6b0462d 100644 --- a/config/moonraker.conf +++ b/config/moonraker.conf @@ -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] %} From 9c00be2f4e21f2738e4e59d92e5af4a335a258b6 Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Fri, 29 Nov 2024 08:57:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?gcode=E6=96=87=E4=BB=B6=E5=88=87=E7=89=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E9=80=82=E9=85=8DCreatWare?= =?UTF-8?q?=E5=88=87=E7=89=87=E8=BD=AF=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- moonraker/components/file_manager/metadata.py | 1 + 1 file changed, 1 insertion(+) diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py index 31c1e42..06c9985 100644 --- a/moonraker/components/file_manager/metadata.py +++ b/moonraker/components/file_manager/metadata.py @@ -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)