Commit df369687376753099858e3c0d3251162bd91a765
1 parent
3ad210f9
perf: modbus_rtu 16位有符号无符号计算值时,对于整数不做特殊处理,只乘以缩放因子
(cherry picked from commit 78201e0a)
Showing
1 changed file
with
1 additions
and
1 deletions
@@ -254,7 +254,7 @@ public class HexConvertUtils { | @@ -254,7 +254,7 @@ public class HexConvertUtils { | ||
254 | case UINT16_BA: | 254 | case UINT16_BA: |
255 | hex = convertHexOrder(hex, dataTypeEnum); | 255 | hex = convertHexOrder(hex, dataTypeEnum); |
256 | if((int16OrUint16ToShort(hex) * scaleFactor) % 1 == FastIotConstants.MagicNumber.ZERO){ | 256 | if((int16OrUint16ToShort(hex) * scaleFactor) % 1 == FastIotConstants.MagicNumber.ZERO){ |
257 | - value = int16OrUint16ToShort(hex); | 257 | + value = (int)(int16OrUint16ToShort(hex) * scaleFactor); |
258 | }else{ | 258 | }else{ |
259 | value = intFormat.format(int16OrUint16ToShort(hex) * scaleFactor); | 259 | value = intFormat.format(int16OrUint16ToShort(hex) * scaleFactor); |
260 | } | 260 | } |