From 3404823d074a08b8c0824b505db16168f7e66201 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 六月 2025 09:49:10 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/CMaster.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 9d00447..8a879dd 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -63,6 +63,7 @@
         std::list<CEquipment*>& getEquipmentList();
         CEquipment* getEquipment(int id);
         void setCacheFilepath(const char* pszFilepath);
+        int abortCurrentTask();
 
     private:
         inline void lock() { EnterCriticalSection(&m_criticalSection); }

--
Gitblit v1.9.3