From d7c88780e1df54f34563d60bd7fa01011d2eef03 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 23:17:17 +0800
Subject: [PATCH] 1.CSVData.cpp 里 unserialize 用了 8*2、125*2，但 serialize 只写 8 + 125 字节。 m_svRawData.insert 的 end 指针是 pszBuffer + 125*2，没有用 index 计算，可能把无效区域一起拷进去。 一旦 size 实际是 133（不是 266），就会直接越界，堆会被破坏，m_svDatas.clear() 在销毁元素时崩。
---
SourceCode/Bond/Servo/CEFEM.h | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.h b/SourceCode/Bond/Servo/CEFEM.h
index 39b89d0..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 {
@@ -20,27 +21,53 @@
virtual void term();
virtual void initPins();
virtual void initSteps();
- virtual int onStepEvent(CStep* pStep, int code);
+ virtual void initSlots();
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
- virtual BOOL glassWillArrive(CGlass* pGlass);
virtual void onReceiveLBData(const char* pszData, size_t size);
- virtual int onFetchedOut(int port, const char* pszGlassId);
- virtual int onStore(int port, const char* pszGlassId);
+ virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
+ virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
+ virtual int onFetchedOutJob(int port, CJobDataB* pJobDataB);
+ virtual int onStoredJob(int port, CJobDataB* pJobDataB);
+ virtual int getIndexerOperationModeBaseValue();
public:
+ void setContext(CContext* pContext);
void setPort(unsigned int index, CLoadPort* pPort);
void setAligner(CAligner* pAligner);
void setFliper(CFliper* pFliper);
void setArmTray(unsigned int index, CArmTray* pArmTray);
+ int robotCmd(ROBOT_CMD_PARAM& robotCmdParam, ONWRITED onWritedBlock = nullptr);
+ int robotCmds(ROBOT_CMD_PARAM* robotCmdParam, unsigned int count, ONWRITED onWritedBlock = nullptr);
+ RMDATA& getRobotMonitoringData();
+
+ // 快捷封装
+ int robotSendHome(int seq, ONWRITED onWritedBlock = nullptr);
+ int robotSendTransfer(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToGet(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToPut(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendGet(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendPut(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendExchange(int seq, int armNo, int pos, int getSlot, int putSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendCommandClear(int seq, ONWRITED onWritedBlock = nullptr);
+ int robotSendBatchGet(int seq, int getPos, int getSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendBatchPut(int seq, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToGetAndHome(int seq, int armNo, int getPos, int getSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToPutAndHome(int seq, int armNo, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
+ 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];
CAligner* m_pAligner;
CFliper* m_pFliper;
CArmTray* m_pArmTray[2];
+ RMDATA m_robotData;
+ CContext* m_pActiveContext;
};
}
--
Gitblit v1.9.3