From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CReadStep.h | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h
index 2b0df3b..8d048a4 100644
--- a/SourceCode/Bond/Servo/CReadStep.h
+++ b/SourceCode/Bond/Servo/CReadStep.h
@@ -11,8 +11,10 @@
public:
unsigned WorkingProc();
+ virtual void setReadContinue(BOOL bContinue) { m_bReadContinue = bContinue; };
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 +23,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 +32,16 @@
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;
+ BOOL m_bReadContinue{ FALSE };
};
}
--
Gitblit v1.9.3