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/SGMeasurement/PLCSignalListener.cpp | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/SGMeasurement/PLCSignalListener.cpp b/SourceCode/Bond/SGMeasurement/PLCSignalListener.cpp
index 4176b59..ab32e61 100644
--- a/SourceCode/Bond/SGMeasurement/PLCSignalListener.cpp
+++ b/SourceCode/Bond/SGMeasurement/PLCSignalListener.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+锘�#include "pch.h"
#include "PLCSignalListener.h"
// === 鏃ュ織鎵撳嵃绫诲瀷 ===
@@ -247,13 +247,10 @@
// 涓婂崌娌胯Е鍙�
switch (i) {
case 0:
+ // Start 鍛戒护
if (m_cbStart) {
m_cbStart();
WriteOutValues(OutValuesArray{ 0.0, 0.0, 0.0, 0.0 });
- if (m_pPlc->SetBitDeviceEx(m_station, PLC_BIT_DEVICE_TYPE, PLC_ACK_BASE_BIT + i) == 0) {
- m_vecAckSent[i] = true;
- m_vecAckCounter[i] = 0;
- }
std::string strProductID;
if (ReadProductID(strProductID)) {
@@ -262,21 +259,31 @@
LOG_MSG(msg, LOG_TYPE_SUCCESS);
}
}
+
+ // 鍙戦�佸簲绛斾俊鍙�
+ if (m_pPlc->SetBitDeviceEx(m_station, PLC_BIT_DEVICE_TYPE, PLC_ACK_BASE_BIT + i) == 0) {
+ m_vecAckSent[i] = true;
+ m_vecAckCounter[i] = 0;
+ }
break;
case 1:
+ // Stop 鍛戒护
if (m_cbStop) {
m_cbStop();
- if (m_pPlc->SetBitDeviceEx(m_station, PLC_BIT_DEVICE_TYPE, PLC_ACK_BASE_BIT + i) == 0) {
- m_vecAckSent[i] = true;
- m_vecAckCounter[i] = 0;
- }
}
+ // Analyze 鍛戒护
if (m_cbAnalyze) {
auto results = m_cbAnalyze();
WriteOutValues(results);
}
+
+ // 鍙戦�佸簲绛斾俊鍙�
+ if (m_pPlc->SetBitDeviceEx(m_station, PLC_BIT_DEVICE_TYPE, PLC_ACK_BASE_BIT + i) == 0) {
+ m_vecAckSent[i] = true;
+ m_vecAckCounter[i] = 0;
+ }
break;
}
}
--
Gitblit v1.9.3