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/CEFEM.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.h b/SourceCode/Bond/Servo/CEFEM.h
index aade245..12603d3 100644
--- a/SourceCode/Bond/Servo/CEFEM.h
+++ b/SourceCode/Bond/Servo/CEFEM.h
@@ -4,6 +4,7 @@
#include "CAligner.h"
#include "CFliper.h"
#include "CArmTray.h"
+#include "Context.h"
namespace SERVO {
@@ -33,6 +34,7 @@
virtual int getIndexerOperationModeBaseValue();
public:
+ void setContext(CContext* pContext);
void setPort(unsigned int index, CLoadPort* pPort);
void setAligner(CAligner* pAligner);
void setFliper(CFliper* pFliper);
@@ -57,6 +59,7 @@
int robotSendTransferAndHome(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot, ONWRITED onWritedBlock = nullptr);
int robotSendGetAndPut(int seq, int armNo, int getPos, int getSlot, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
int robotSendPutAndHome(int seq, int armNo, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
+ void printDebugRobotState();
private:
CLoadPort* m_pPort[4];
@@ -64,6 +67,7 @@
CFliper* m_pFliper;
CArmTray* m_pArmTray[2];
RMDATA m_robotData;
+ CContext* m_pActiveContext;
};
}
--
Gitblit v1.9.3