From 8322172ad4e6d5636b8c32b94d95f8abbce1ed54 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 28 三月 2025 17:40:59 +0800
Subject: [PATCH] 1.修改CReadStep::onReadSignal信号为多类型，以便适应其它场景（如 Port type,mode）等使用。
---
SourceCode/Bond/Servo/CReadStep.cpp | 8 ++-
SourceCode/Bond/Servo/CEquipment.cpp | 70 +++++++++++++++++++----------------
SourceCode/Bond/Servo/CReadStep.h | 3 +
SourceCode/Bond/Servo/CEquipment.h | 3 +
4 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index fa4bb1a..d7fd776 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -358,42 +358,39 @@
// Equipment Status Change Report(0x361)
// Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- index = 0x360 + i;;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CReadStep*)pStep)->onReadSignal(bFlag);
- }
+ checkReadStepSignalStepSignal(0x360 + i, pszData, size);
}
+
// CIM Mode
- checkStepSignalStepSignal(0x350, pszData, size);
+ checkWriteStepSignalStepSignal(0x350, pszData, size);
+
// Port1 ~ Port4
- checkStepSignalStepSignal(0x3e0, pszData, size);
- checkStepSignalStepSignal(0x3e1, pszData, size);
- checkStepSignalStepSignal(0x3e2, pszData, size);
- checkStepSignalStepSignal(0x3e3, pszData, size);
- checkStepSignalStepSignal(0x3e8, pszData, size);
- checkStepSignalStepSignal(0x3e9, pszData, size);
- checkStepSignalStepSignal(0x3ea, pszData, size);
- checkStepSignalStepSignal(0x3eb, pszData, size);
- checkStepSignalStepSignal(0x3f0, pszData, size);
- checkStepSignalStepSignal(0x3f1, pszData, size);
- checkStepSignalStepSignal(0x3f2, pszData, size);
- checkStepSignalStepSignal(0x3f3, pszData, size);
- checkStepSignalStepSignal(0x3f8, pszData, size);
- checkStepSignalStepSignal(0x3f9, pszData, size);
- checkStepSignalStepSignal(0x3fa, pszData, size);
- checkStepSignalStepSignal(0x3fb, pszData, size);
- checkStepSignalStepSignal(0x400, pszData, size);
- checkStepSignalStepSignal(0x401, pszData, size);
- checkStepSignalStepSignal(0x402, pszData, size);
- checkStepSignalStepSignal(0x403, pszData, size);
- checkStepSignalStepSignal(0x408, pszData, size);
- checkStepSignalStepSignal(0x409, pszData, size);
- checkStepSignalStepSignal(0x40a, pszData, size);
- checkStepSignalStepSignal(0x40b, pszData, size);
+ checkReadStepSignalStepSignal(0x3e0, pszData, size);
+ checkReadStepSignalStepSignal(0x3e1, pszData, size);
+ checkReadStepSignalStepSignal(0x3e2, pszData, size);
+ checkReadStepSignalStepSignal(0x3e3, pszData, size);
+ checkReadStepSignalStepSignal(0x3e8, pszData, size);
+ checkReadStepSignalStepSignal(0x3e9, pszData, size);
+ checkReadStepSignalStepSignal(0x3ea, pszData, size);
+ checkReadStepSignalStepSignal(0x3eb, pszData, size);
+ checkReadStepSignalStepSignal(0x3f0, pszData, size);
+ checkReadStepSignalStepSignal(0x3f1, pszData, size);
+ checkReadStepSignalStepSignal(0x3f2, pszData, size);
+ checkReadStepSignalStepSignal(0x3f3, pszData, size);
+ checkReadStepSignalStepSignal(0x3f8, pszData, size);
+ checkReadStepSignalStepSignal(0x3f9, pszData, size);
+ checkReadStepSignalStepSignal(0x3fa, pszData, size);
+ checkReadStepSignalStepSignal(0x3fb, pszData, size);
+ checkReadStepSignalStepSignal(0x400, pszData, size);
+ checkReadStepSignalStepSignal(0x401, pszData, size);
+ checkReadStepSignalStepSignal(0x402, pszData, size);
+ checkReadStepSignalStepSignal(0x403, pszData, size);
+ checkReadStepSignalStepSignal(0x408, pszData, size);
+ checkReadStepSignalStepSignal(0x409, pszData, size);
+ checkReadStepSignalStepSignal(0x40a, pszData, size);
+ checkReadStepSignalStepSignal(0x40b, pszData, size);
}
@@ -678,7 +675,16 @@
return pGlass;
}
- void CEquipment::checkStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size)
+ void CEquipment::checkReadStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size)
+ {
+ BOOL bFlag = isBitOn(pszData, size, addr);
+ SERVO::CStep* pStep = getStep(addr);
+ if (pStep != nullptr) {
+ ((CReadStep*)pStep)->onReadSignal(bFlag ? 1 : 0);
+ }
+ }
+
+ void CEquipment::checkWriteStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size)
{
BOOL bFlag = isBitOn(pszData, size, addr);
SERVO::CStep* pStep = getStep(addr);
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index e03061d..57eed85 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -114,7 +114,8 @@
private:
BOOL isBitOn(const char* pszData, size_t size, int index);
inline BOOL equalBool(BOOL b1, BOOL b2);
- void checkStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size);
+ void checkReadStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size);
+ void checkWriteStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index 6c948de..c633c2f 100644
--- a/SourceCode/Bond/Servo/CReadStep.cpp
+++ b/SourceCode/Bond/Servo/CReadStep.cpp
@@ -19,6 +19,7 @@
m_hWorkThreadHandle = nullptr;
m_hReadSignalOn = ::CreateEvent(NULL, TRUE, FALSE, NULL);
m_hReadSignalOff = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+ m_nSignalType = 0;
m_nCurStep = 0;
}
@@ -38,13 +39,14 @@
m_nWriteSignalDev = dev;
}
- void CReadStep::onReadSignal(BOOL bSignal)
+ void CReadStep::onReadSignal(int nSignalType)
{
Lock();
- if (m_nCurStep == 0 && bSignal) {
+ m_nSignalType = nSignalType;
+ if (m_nCurStep == 0 && nSignalType != 0) {
SetEvent(m_hReadSignalOn);
}
- else if (m_nCurStep == 3 && !bSignal) {
+ else if (m_nCurStep == 3 && nSignalType == 0) {
SetEvent(m_hReadSignalOff);
}
diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h
index 2b0df3b..e5c88d2 100644
--- a/SourceCode/Bond/Servo/CReadStep.h
+++ b/SourceCode/Bond/Servo/CReadStep.h
@@ -12,7 +12,7 @@
public:
unsigned WorkingProc();
virtual void setWriteSignalDev(int dev);
- virtual void onReadSignal(BOOL bSignal);
+ virtual void onReadSignal(int nSignalType);
virtual int onReadData();
virtual void init();
virtual void term();
@@ -28,6 +28,7 @@
HANDLE m_hWorkStop;
HANDLE m_hReadSignalOn;
HANDLE m_hReadSignalOff;
+ int m_nSignalType;
int m_nCurStep;
int m_nWriteSignalDev; // 对方BIT地址
};
--
Gitblit v1.9.3