From 84925ada39fdef3f5bd7266005010103897713a6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 七月 2025 17:49:15 +0800
Subject: [PATCH] 1.EAP模拟器，启用或禁用警告上报功能实现和模拟测试； 2.Master端，收到EAP的启用或警告消息上报消息后，保存相关配置，如后续机器发生警告，根据配置决定是否上报警告消息；
---
SourceCode/Bond/Servo/CPin.cpp | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPin.cpp b/SourceCode/Bond/Servo/CPin.cpp
index ee11e1a..832e74a 100644
--- a/SourceCode/Bond/Servo/CPin.cpp
+++ b/SourceCode/Bond/Servo/CPin.cpp
@@ -53,7 +53,7 @@
// 返回 >= 0连接成功
int CPin::accpetConnect(CPin* pPin)
{
- assert(pPin);
+ ASSERT(pPin);
// 是否已经连接
@@ -73,7 +73,7 @@
int CPin::connectPin(CPin* pPin)
{
- assert(pPin);
+ ASSERT(pPin);
// 是否已经连接
@@ -105,26 +105,25 @@
return -1;
}
- assert(m_pConnectedPin->m_pConnectedPin == this);
+ ASSERT(m_pConnectedPin->m_pConnectedPin == this);
m_pConnectedPin->m_pConnectedPin = NULL;
m_pConnectedPin = NULL;
return 0;
}
- int CPin::sendSample(CSample* pSample)
+ int CPin::sendIntent(CIntent* pIntent)
{
if (m_pConnectedPin != NULL) {
- m_pConnectedPin->recvSample(pSample);
+ return m_pConnectedPin->recvIntent(pIntent);
}
return 0;
}
- int CPin::recvSample(CSample* pSample)
+ int CPin::recvIntent(CIntent* pIntent)
{
- assert(m_pEquipment);
- m_pEquipment->recvSample(this, pSample);
- return 0;
+ ASSERT(m_pEquipment);
+ return m_pEquipment->recvIntent(this, pIntent);
}
}
--
Gitblit v1.9.3