From 797c5aa322a14c312f59309352853408e13c665d Mon Sep 17 00:00:00 2001
From: zkk <1007518571@qq.com>
Date: Thu, 19 Dec 2024 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=AE=8F=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squashed commit of the following:

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 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高度保存的精度问题
---
 moonraker/components/job_state.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/moonraker/components/job_state.py b/moonraker/components/job_state.py
index 098382f..42b97eb 100644
--- a/moonraker/components/job_state.py
+++ b/moonraker/components/job_state.py
@@ -54,6 +54,7 @@ class JobState:
             logging.info(f"Job state initialized: {state}")
 
     async def _status_update(self, data: Dict[str, Any], _: float) -> None:
+        kapis: KlippyAPI = self.server.lookup_component('klippy_apis')
         if 'print_stats' not in data:
             return
         ps = data['print_stats']
@@ -78,6 +79,8 @@ class JobState:
                     f"Job State Changed - Prev State: {old_state}, "
                     f"New State: {new_state}"
                 )
+                if new_state == "cancelled":
+                    await kapis.run_gcode("_CANCEL_PRINT_BASE")
                 # NOTE: Individual job_state events are DEPRECATED.  New modules
                 # should register handlers for "job_state: status_changed" and
                 # match against the JobEvent object provided.