diff --git a/config/moonraker.conf b/config/moonraker.conf index ab5a264..b2c96f4 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] %} @@ -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 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)