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

Merge branch 'develop' into release

Browse Source
This commit is contained in:
张开科 2024-11-29 10:09:56 +08:00
commit 56208e8318
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/moonraker.conf
View File

@ -64,9 +64,9 @@ on_press:
{% set print_state = data['status']['print_stats']['state'] %} {% set print_state = data['status']['print_stats']['state'] %}
# Judging the printer status # Judging the printer status
{% if print_state | string == 'printing' or print_state | string == 'paused' %} {% if print_state | string == 'printing' or print_state | string == 'paused' %}
{% set x_position = data['status']['gcode_move']['gcode_position'][0] %} {% set x_position = data['status']['gcode_move']['gcode_position'][0] | round(4) %}
{% set y_position = data['status']['gcode_move']['gcode_position'][1] %} {% set y_position = data['status']['gcode_move']['gcode_position'][1] | round(4) %}
{% set z_position = data['status']['gcode_move']['gcode_position'][2] %} {% set z_position = data['status']['gcode_move']['gcode_position'][2] | round(4) %}
{% set hotend = data['status']['toolhead']['extruder'] %} {% set hotend = data['status']['toolhead']['extruder'] %}
{% set filepath = data['status']['virtual_sdcard']['file_path'] %} {% set filepath = data['status']['virtual_sdcard']['file_path'] %}
{% set filename = filepath.split('/')[-1] %} {% set filename = filepath.split('/')[-1] %}

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

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