From f2a5494421e20bff0cc915bc7f77608d3d032130 Mon Sep 17 00:00:00 2001
From: zkk <1007518571@qq.com>
Date: Mon, 3 Mar 2025 15:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=91=E7=9C=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E5=85=B3=E6=9C=BA=E6=B5=81=E7=A8=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squashed commit of the following:

commit c953613611f35e88fe2c30e93848ae9a1050edc4
Merge: 5fed721 8e870f1
Author: zkk <1007518571@qq.com>
Date:   Mon Mar 3 15:48:57 2025 +0800

    Merge commit '8e870f15e6cfedd3d15f0aa6a784718473665d01' into release

commit 8e870f15e6cfedd3d15f0aa6a784718473665d01
Author: zkk <1007518571@qq.com>
Date:   Mon Mar 3 15:47:45 2025 +0800

    修复休眠模式下关机流程不对问题

commit 5fed72185c65680a01b741eedf3ebd9dea83d46c
Merge: c9cbdcc f806fa6
Author: zkk <1007518571@qq.com>
Date:   Fri Jan 10 13:53:11 2025 +0800

    Merge commit 'f806fa6b438d7c2c7cfdddc8b33ee3f17c21ce76' into release

commit f806fa6b438d7c2c7cfdddc8b33ee3f17c21ce76
Author: zkk <1007518571@qq.com>
Date:   Tue Jan 7 17:21:16 2025 +0800

    优化休眠时关闭摄像头服务

commit c9cbdccb3a940d191c1b2e92f0b79601859e3b95
Merge: 56208e8 3dbd8d3
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 19 17:09:15 2024 +0800

    Merge commit '3dbd8d3355059b4bb39d680b1a6deff9f6277c7e' into release

commit 3dbd8d3355059b4bb39d680b1a6deff9f6277c7e
Merge: 34c1604 ef2e38b
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 19 17:07:14 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatbotMoonraker into develop

commit ef2e38b870357e74fd69710fa3b09fa38604feff
Author: ruipeng <1041589370@qq.com>
Date:   Thu Dec 19 11:01:45 2024 +0800

    新增取消打印宏命令

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

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

commit 56208e831841feb3ab4ec7cd0bdca905b96c7a17
Merge: c76a8e5 d335536
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:09:56 2024 +0800

    Merge branch 'develop' into release

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高度保存的精度问题
---
 config/moonraker.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/moonraker.conf b/config/moonraker.conf
index e195b2d..b0ac533 100644
--- a/config/moonraker.conf
+++ b/config/moonraker.conf
@@ -58,6 +58,9 @@ pin: ^!gpiochip4/gpio19
 debounce_period: .01
 minimum_event_time: 0
 on_press:
+    {% set server_info = call_method("server.info") %}
+    {% set server_info_data = server_info | tojson | fromjson %}
+    {% if server_info_data['klippy_state'] == "ready" %}
     {% set query_objs = {"print_stats": ["state"], "toolhead": ["extruder"], "gcode_move": ["gcode_position"], "virtual_sdcard": ["file_path"]} %}
     {% set status = call_method("printer.objects.query", objects=query_objs) %}
     {% do call_method("printer.emergency_stop") %}
@@ -89,6 +92,7 @@ on_press:
         {% do call_method("printer.gcode.script", script="SAVE_VARIABLE VARIABLE=was_interrupted VALUE=True") %}
     {% else %}
         {% do call_method("printer.gcode.script", script="SAVE_VARIABLE VARIABLE=was_interrupted VALUE=False") %}
+      {% endif %}
     {% endif %}
     # shutdown
     {% do call_method("machine.shutdown") %}