From 5efff0895ad06eb0c5f04df7efe67a22b358beb3 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 18 二月 2025 16:10:23 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/CEquipment.cpp | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 6534f88..2101fc0 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -5,10 +5,11 @@
namespace SERVO {
- CEquipment::CEquipment()
+ CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
+ m_listener = { nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
- m_listener.onAlive = {nullptr};
+ m_bCimState = FALSE;
InitializeCriticalSection(&m_criticalSection);
}
@@ -20,6 +21,7 @@
void CEquipment::setListener(EquipmentListener listener)
{
m_listener.onAlive = listener.onAlive;
+ m_listener.onCimStateChanged = listener.onCimStateChanged;
}
void CEquipment::init()
@@ -30,6 +32,16 @@
void CEquipment::term()
{
+ }
+
+ void CEquipment::setID(int nID)
+ {
+ m_nID = nID;
+ }
+
+ int CEquipment::getID()
+ {
+ return m_nID;
}
void CEquipment::setName(const char* pszName)
@@ -121,7 +133,10 @@
}
- // 解释数据
+ // 以下解释和处理数据
+
+ // alive
+ /*
BOOL bAliveFlag = isBitOn(pszData, size, 0x340);
if (m_alive.flag != bAliveFlag) {
m_alive.flag = bAliveFlag;
@@ -135,6 +150,15 @@
}
}
}
+ */
+ // CIM State
+ BOOL bCimState = isBitOn(pszData, size, 0x341);
+ if ((bCimState && !m_bCimState) || (!bCimState && m_bCimState)) {
+ m_bCimState = bCimState;
+ if (m_listener.onCimStateChanged != nullptr) {
+ m_listener.onCimStateChanged(this, m_bCimState);
+ }
+ }
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
--
Gitblit v1.9.3