From 6747bc043d0af20d6fa02a6cf385d81eb44643d0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 11:29:42 +0800
Subject: [PATCH] 1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志

---
 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