From 62a56d6003638a7c0a477cc549d1811e6b17a4a4 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期四, 03 七月 2025 11:06:34 +0800 Subject: [PATCH] 1.增加下载的map和efem扫描的map的比较,如果不一致,则Cassette Process Cancel 并抛出到应用层。一致则Cassette Process Start。 --- SourceCode/Bond/Servo/CReadStep.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h index 2b0df3b..dcb3c56 100644 --- a/SourceCode/Bond/Servo/CReadStep.h +++ b/SourceCode/Bond/Servo/CReadStep.h @@ -12,7 +12,8 @@ public: unsigned WorkingProc(); virtual void setWriteSignalDev(int dev); - virtual void onReadSignal(BOOL bSignal); + virtual void setReturnDev(int dev); + virtual void onReadSignal(int nSignalType); virtual int onReadData(); virtual void init(); virtual void term(); @@ -21,6 +22,8 @@ virtual int onTimeout(); inline void nextStep(); inline void resetStep(); + virtual int setReturnCode(short code); + virtual int setReturnData(const char* pszData, unsigned int size); protected: HANDLE m_hWorkThreadHandle; @@ -28,8 +31,15 @@ HANDLE m_hWorkStop; HANDLE m_hReadSignalOn; HANDLE m_hReadSignalOff; + int m_nSignalType; int m_nCurStep; int m_nWriteSignalDev; // 对方BIT地址 + + // return code or data + protected: + char m_szReturnBuf[1024]; + int m_nReturnDataSize; + int m_nReturnDevNo; }; } -- Gitblit v1.9.3