From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）

---
 SourceCode/Bond/Servo/CReadStep.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h
index e5c88d2..dcb3c56 100644
--- a/SourceCode/Bond/Servo/CReadStep.h
+++ b/SourceCode/Bond/Servo/CReadStep.h
@@ -12,6 +12,7 @@
 	public:
 		unsigned WorkingProc();
 		virtual void setWriteSignalDev(int dev);
+		virtual void setReturnDev(int dev);
 		virtual void onReadSignal(int nSignalType);
 		virtual int onReadData();
 		virtual void init();
@@ -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;
@@ -31,6 +34,12 @@
 		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