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/CBonder.cpp | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index f927d55..98e2164 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -349,23 +349,6 @@
}
{
- // Panel Data Report
- CEqReadStep* pStep = new CEqReadStep(0xA17f, 386 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- decodePanelDataReport((CStep*)pFrom, pszData, size);
- }
- return -1;
- });
- pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
- pStep->setProp("Port", (void*)1);
- pStep->setWriteSignalDev(0x45e);
- if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
- delete pStep;
- }
- }
-
- {
// FAC Data Report
CEqReadStep* pStep = new CEqReadStep(0xA60E, 108 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
@@ -436,16 +419,17 @@
{
CEquipment::onTimer(nTimerid);
- // test
- /*
+ // test
static int i[2] = { 0, 0 };
i[m_nIndex]++;
-
- if (i[m_nIndex] == 15) {
- char szBuffer[26];
- decodeJobProcessStartReport(getStep(STEP_ID_JOB_PROCESS_START_REPORT), szBuffer, 26);
+ if (m_nIndex == 0 && i[m_nIndex] % 20 == 0) {
+ if (m_listener.onAlarm != nullptr) {
+ m_listener.onAlarm(this, 1,
+ i[m_nIndex],
+ getID(),
+ 1);
+ }
}
- */
}
void CBonder::serialize(CArchive& ar)
--
Gitblit v1.9.3