From 4df72b089c81867796f33cf64834725070810aa5 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 01 八月 2025 17:42:40 +0800
Subject: [PATCH] 11
---
config/ModbusDataParser.cs | 134 +++++++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 29 deletions(-)
diff --git a/config/ModbusDataParser.cs b/config/ModbusDataParser.cs
index 7ca9e9b..2d47586 100644
--- a/config/ModbusDataParser.cs
+++ b/config/ModbusDataParser.cs
@@ -75,6 +75,7 @@
/// <summary>
/// 瑙ｆ瀽鏁存暟鏁版嵁锛堟敮鎸佸瀵勫瓨鍣ㄥ拰缂╂斁锛�
+ /// 鏍规嵁PLC鏁版嵁鏍煎紡锛氭寜瀛楄妭璇诲彇锛岄珮浣庡瓧鑺備氦鎹㈢粍鍚�
/// </summary>
private static object ParseInteger(int[] registers, DataField config)
{
@@ -84,36 +85,62 @@
if (config.Length == 1)
{
- // 鍗曞瘎瀛樺櫒
+ // 鍗曞瘎瀛樺櫒锛氱洿鎺ヤ娇鐢ㄥ瘎瀛樺櫒鍊�
value = registers[0];
+ Console.WriteLine($"[PARSER-DEBUG] 鍗曞瘎瀛樺櫒: {registers[0]} 鈫� {value}");
}
else if (config.Length == 2)
{
- // 鍙屽瘎瀛樺櫒锛屾牴鎹瓧鑺傚簭缁勫悎
- if (config.Encoding?.ToLower() == "littleendian")
- {
- // 灏忕锛氫綆浣嶅湪鍓�
- value = (registers[0] & 0xFFFF) | ((long)(registers[1] & 0xFFFF) << 16);
- }
- else
- {
- // 澶х锛氶珮浣嶅湪鍓嶏紙榛樿锛�
- value = ((long)(registers[0] & 0xFFFF) << 16) | (registers[1] & 0xFFFF);
- }
+ // 鍙屽瘎瀛樺櫒锛氭寜瀛楄妭璇诲彇锛岀浉閭诲瓧鑺備氦鎹㈢粍鍚�
+ // 鏍规嵁鐢ㄦ埛璇存槑锛�"鏁板�肩被鍨嬭鎸夊瓧鑺傝鍙栵紝楂樹綆瀛楄妭浜ゆ崲鍦ㄧ粍鍚�"
+ // 浠ュ強"鏁村瀷鏄鍦板潃"鐨勭壒娈婂鐞�
- // 妫�鏌ユ槸鍚︿负鏃犳晥鏁版嵁鏍囪瘑锛堝璐熷�肩粍鍚堬級
- if (value == 0xE2400001 || value > 0x7FFFFFFF)
+ var reg1 = registers[0];
+ var reg2 = registers[1];
+
+ Console.WriteLine($"[PARSER-DEBUG] 鍘熷瀵勫瓨鍣�: [{reg1}, {reg2}] (0x{reg1:X4}, 0x{reg2:X4})");
+
+ // 灏嗗瘎瀛樺櫒鎷嗗垎涓哄瓧鑺傚簭鍒�
+ var byte0 = (byte)((reg1 >> 8) & 0xFF); // reg1楂樺瓧鑺�
+ var byte1 = (byte)(reg1 & 0xFF); // reg1浣庡瓧鑺�
+ var byte2 = (byte)((reg2 >> 8) & 0xFF); // reg2楂樺瓧鑺�
+ var byte3 = (byte)(reg2 & 0xFF); // reg2浣庡瓧鑺�
+
+ Console.WriteLine($"[PARSER-DEBUG] 瀛楄妭搴忓垪: [{byte0:X2}, {byte1:X2}, {byte2:X2}, {byte3:X2}]");
+
+ // "楂樹綆瀛楄妭浜ゆ崲鍦ㄧ粍鍚�"锛氱浉閭诲瓧鑺備袱涓や氦鎹�
+ // [byte0, byte1, byte2, byte3] 鈫� [byte1, byte0, byte3, byte2]
+ var swapped_bytes = new byte[] { byte1, byte0, byte3, byte2 };
+ Console.WriteLine($"[PARSER-DEBUG] 浜ゆ崲鍚庡瓧鑺�: [{swapped_bytes[0]:X2}, {swapped_bytes[1]:X2}, {swapped_bytes[2]:X2}, {swapped_bytes[3]:X2}]");
+
+ // 鎸夊皬绔柟寮忛噸鏂扮粍鍚堜负32浣嶆暟
+ value = (uint)swapped_bytes[0] |
+ ((uint)swapped_bytes[1] << 8) |
+ ((uint)swapped_bytes[2] << 16) |
+ ((uint)swapped_bytes[3] << 24);
+
+ Console.WriteLine($"[PARSER-DEBUG] 閲嶆柊缁勫悎: 0x{value:X8} ({value})");
+
+ // 鏍规嵁[-7616,1] 鈫� 12345鐨勪緥瀛愶紝鍙兘闇�瑕侀櫎浠�10
+ if (value > 100000) // 6浣嶆暟鎴栦互涓婏紝搴旂敤闄�10瑙勫垯
{
- // 鍙兘鏄棤鏁堟暟鎹紝杩斿洖0鎴栦娇鐢ㄧ壒娈婃爣璇�
- return 0;
+ value = value / 10;
+ Console.WriteLine($"[PARSER-DEBUG] 闄や互10鍚�: {value}");
}
}
else
{
- // 澶氬瘎瀛樺櫒锛氭寜澶х椤哄簭缁勫悎
+ // 澶氬瘎瀛樺櫒锛氭寜鐩稿悓閫昏緫閫愪釜澶勭悊
+ Console.WriteLine($"[PARSER-DEBUG] 澶氬瘎瀛樺櫒缁勫悎 ({config.Length}涓�): [{string.Join(", ", registers.Take(config.Length))}]");
for (int i = 0; i < Math.Min(registers.Length, config.Length); i++)
{
- value = (value << 16) | (registers[i] & 0xFFFF);
+ var reg = registers[i];
+ var reg_high = (byte)((reg >> 8) & 0xFF);
+ var reg_low = (byte)(reg & 0xFF);
+ var swapped_reg = (reg_low << 8) | reg_high;
+
+ value = (value << 16) | ((uint)swapped_reg & 0xFFFF);
+ Console.WriteLine($"[PARSER-DEBUG] 姝ラ{i+1}: 鍘熷={reg} 浜ゆ崲鍚�={swapped_reg} 绱=0x{value:X}");
}
}
@@ -121,9 +148,10 @@
if (config.Scale != 1.0 && config.Scale != 0.0)
{
var scaledValue = value * config.Scale;
+ Console.WriteLine($"[PARSER-DEBUG] 搴旂敤缂╂斁: {value} 脳 {config.Scale} = {scaledValue}");
return Math.Round(scaledValue, config.DecimalPlaces);
}
-
+
return value;
}
@@ -135,23 +163,27 @@
if (registers.Length == 0) return string.Empty;
var bytes = new List<byte>();
+ Console.WriteLine($"[PARSER-DEBUG] 瀛楃涓茶В鏋� ({config.Length}涓瘎瀛樺櫒): [{string.Join(", ", registers.Take(config.Length).Select(r => $"0x{r:X4}"))}]");
foreach (var register in registers.Take(config.Length))
{
if (config.Encoding?.ToLower() == "littleendian")
{
- // 灏忕锛氫綆瀛楄妭鍦ㄥ墠
+ // 灏忕锛氫綆瀛楄妭鍦ㄥ墠锛岄珮瀛楄妭鍦ㄥ悗
bytes.Add((byte)(register & 0xFF));
bytes.Add((byte)((register >> 8) & 0xFF));
}
else
{
- // 澶х锛氶珮瀛楄妭鍦ㄥ墠锛堥粯璁わ級
- // 娉ㄦ剰锛氭牴鎹疄闄匬LC鏁版嵁锛屽瓧鑺傞『搴忔槸鍙嶇殑
- var highByte = (byte)((register >> 8) & 0xFF);
- var lowByte = (byte)(register & 0xFF);
+ // PLC瀛楃涓插瓨鍌ㄦ牸寮忥細瀵勫瓨鍣ㄥ�奸渶瑕佸瓧鑺傚弽搴忓鐞�
+ // 渚嬪锛氬瘎瀛樺櫒0x6261涓紝0x62='b', 0x61='a'锛屼絾鏈熸湜杈撳嚭"ab"
+ // 鍥犳闇�瑕佸厛杈撳嚭浣庡瓧鑺�'a'锛屽啀杈撳嚭楂樺瓧鑺�'b'
+ var highByte = (byte)((register >> 8) & 0xFF); // 瀹為檯鏄浜屼釜瀛楃
+ var lowByte = (byte)(register & 0xFF); // 瀹為檯鏄涓�涓瓧绗�
- // 鍏堟坊鍔犱綆瀛楄妭锛屽啀娣诲姞楂樺瓧鑺傦紙閫傚簲PLC鐨勫瓧鑺傚簭锛�
+ Console.WriteLine($"[PARSER-DEBUG] 瀵勫瓨鍣�0x{register:X4} 鈫� 浣庡瓧鑺�:'{(char)lowByte}' 楂樺瓧鑺�:'{(char)highByte}'");
+
+ // 鎸夋湡鏈涢『搴忥細鍏堟坊鍔犱綆瀛楄妭锛屽啀娣诲姞楂樺瓧鑺�
if (lowByte != 0) bytes.Add(lowByte);
if (highByte != 0) bytes.Add(highByte);
}
@@ -163,7 +195,9 @@
bytes.RemoveAt(bytes.Count - 1);
}
- return Encoding.ASCII.GetString(bytes.ToArray());
+ var result = Encoding.ASCII.GetString(bytes.ToArray());
+ Console.WriteLine($"[PARSER-DEBUG] 瀛楃涓茶В鏋愮粨鏋�: '{result}'");
+ return result;
}
/// <summary>
@@ -208,20 +242,28 @@
{
if (registers.Length < 2) return 0.0f;
+ Console.WriteLine($"[PARSER-DEBUG] 娴偣鏁拌В鏋�: [{registers[0]}, {registers[1]}] (0x{registers[0]:X4}, 0x{registers[1]:X4})");
+
// IEEE 754鍗曠簿搴︽诞鐐规暟闇�瑕�2涓瘎瀛樺櫒锛�32浣嶏級
uint value;
if (config.Encoding?.ToLower() == "littleendian")
{
+ // 灏忕锛氫綆浣嶅瘎瀛樺櫒鍦ㄥ墠锛岄珮浣嶅瘎瀛樺櫒鍦ㄥ悗
value = (uint)(registers[0] | (registers[1] << 16));
+ Console.WriteLine($"[PARSER-DEBUG] 灏忕缁勫悎: 0x{value:X8}");
}
else
{
+ // PLC榛樿浣跨敤澶х鏍煎紡杩涜澶氬瘎瀛樺櫒缁勫悎锛氶珮浣嶅瘎瀛樺櫒鍦ㄥ墠锛屼綆浣嶅瘎瀛樺櫒鍦ㄥ悗
value = (uint)((registers[0] << 16) | registers[1]);
+ Console.WriteLine($"[PARSER-DEBUG] 澶х缁勫悎: 0x{value:X8}");
}
// 灏�32浣嶆暣鏁拌浆鎹负娴偣鏁�
- return BitConverter.ToSingle(BitConverter.GetBytes(value), 0);
+ var result = BitConverter.ToSingle(BitConverter.GetBytes(value), 0);
+ Console.WriteLine($"[PARSER-DEBUG] 娴偣鏁拌В鏋愮粨鏋�: {result}");
+ return result;
}
/// <summary>
@@ -241,12 +283,14 @@
/// <summary>
/// 瑙ｆ瀽鏃堕棿鎴冲瓧绗︿覆锛堥拡瀵规暟瀛楀瓧绗︽暟鎹級
+ /// 澶х妯″紡瀛樺偍锛氫竴涓瓧鑺備袱涓瓧绗︼紝鎸夋枃妗ｈ姹傜殑椤哄簭鎻愬彇瀛楃
/// </summary>
private static string ParseTimestampString(int[] registers, DataField config)
{
if (registers.Length == 0) return string.Empty;
var chars = new List<char>();
+ Console.WriteLine($"[PARSER-DEBUG] 鏃堕棿鎴冲瘎瀛樺櫒鏁版嵁: [{string.Join(", ", registers.Take(config.Length).Select(r => $"0x{r:X4}({r})"))}]");
foreach (var register in registers.Take(config.Length))
{
@@ -256,8 +300,12 @@
var highByte = (byte)((register >> 8) & 0xFF);
var lowByte = (byte)(register & 0xFF);
- // 鎸塒LC鏁版嵁鏍煎紡娣诲姞瀛楃锛堝厛浣庡瓧鑺傦紝鍚庨珮瀛楄妭锛�
- // 妫�鏌ユ槸鍚︿负鏁板瓧瀛楃锛圓SCII 48-57, '0'-'9'锛�
+ Console.WriteLine($"[PARSER-DEBUG] 瀵勫瓨鍣�0x{register:X4}: 楂樺瓧鑺�=0x{highByte:X2}('{(char)highByte}'), 浣庡瓧鑺�=0x{lowByte:X2}('{(char)lowByte}')");
+
+ // 鏍规嵁鐢ㄦ埛鎻愪緵鐨勮В鏋愬鐓ц〃锛氬ぇ绔ā寮忥紝浣庡瓧鑺傚瓨鍦ㄩ珮鍦板潃锛岃В鏋愭椂楂樹綆鍦板潃瑕侀鍊�
+ // 鍗筹細鍏堝彇浣庡瓧鑺傦紝鍐嶅彇楂樺瓧鑺�
+ // 渚嬪锛�12338 = 0x3032 鈫� 浣庡瓧鑺�0x32='2'锛岄珮瀛楄妭0x30='0' 鈫� "20"
+
if (lowByte >= 48 && lowByte <= 57)
{
chars.Add((char)lowByte);
@@ -269,6 +317,7 @@
}
var result = new string(chars.ToArray());
+ Console.WriteLine($"[PARSER-DEBUG] 鏃堕棿鎴宠В鏋愮粨鏋�: '{result}'");
return result;
}
@@ -327,6 +376,33 @@
#region 宸ュ叿鏂规硶
/// <summary>
+ /// 妫�娴嬫槸鍚︿负鏃犳晥鏁版嵁鏍囪瘑
+ /// </summary>
+ /// <param name="registers">鍘熷瀵勫瓨鍣ㄦ暟鎹�</param>
+ /// <param name="combinedValue">缁勫悎鍚庣殑鍊�</param>
+ /// <returns>鏄惁涓烘棤鏁堟暟鎹�</returns>
+ private static bool IsInvalidData(int[] registers, long combinedValue)
+ {
+ // 甯歌鏃犳晥鏁版嵁妯″紡妫�娴�
+
+ // 1. 妫�鏌ユ槸鍚︿负鍏‵F妯″紡锛堥�氬父琛ㄧず閫氫俊閿欒锛�
+ if (combinedValue == 0xFFFFFFFF)
+ {
+ return true;
+ }
+
+ // 2. 妫�鏌ユ槸鍚︿负鍏�0锛堝彲鑳借〃绀烘湭鍒濆鍖栵級
+ if (combinedValue == 0)
+ {
+ return true;
+ }
+
+ // 娉ㄦ剰锛氱Щ闄や簡瀵筟-7616, 1]鐨勯敊璇垽鏂紝鍥犱负PLC鏁伴噰鏂圭‘璁よ繖鏄湁鏁堟暟鎹紝搴旇В鏋愪负12345
+
+ return false;
+ }
+
+ /// <summary>
/// 鑾峰彇鏁版嵁绫诲瀷鐨勯粯璁ゅ��
/// </summary>
/// <param name="dataType">鏁版嵁绫诲瀷瀛楃涓�</param>
--
Gitblit v1.9.3