From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CArm.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.h b/SourceCode/Bond/Servo/CArm.h
index 4a12834..5b7bfa6 100644
--- a/SourceCode/Bond/Servo/CArm.h
+++ b/SourceCode/Bond/Servo/CArm.h
@@ -15,6 +15,7 @@
virtual void init();
virtual void term();
virtual void initPins();
+ virtual void initSlots();
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void getAttributeVector(CAttributeVector& attrubutes);
@@ -25,6 +26,10 @@
// 调用tempFetchOut后，pGlass必须release一次
int tempFetchOut(OUT CGlass*& pGlass);
+
+ // 更新JobDataS
+ // Equipment在onReceivedJob事件时调用
+ int glassUpdateJobDataS(CJobDataS* pJobDataS);
};
}
--
Gitblit v1.9.3