From 3fb5f541891e3aa69060a1ea9b3808cc42bbbfa8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 十一月 2023 10:51:26 +0800
Subject: [PATCH] add log
---
service/plc.go | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index 68258b8..42ad54d 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -112,28 +112,20 @@
return nil, errors.New("conf.Conf.Services.Serial config not set yet")
}
label := fmt.Sprintf("D%d", address)
- return plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label)
+ return plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label, dataLength)
}
return
}
func ReadByModbusTCP(ipAddr string, address, length int) ([]byte, error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- newLength := length / 2
- if newLength == 0 {
- newLength = 1
- }
- return apacheplc4x.ReadHoldingRegister(ipAddr, address, newLength)
+ return apacheplc4x.ReadHoldingRegister(ipAddr, address, length)
} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
conn, err := plc.GetModbusConnection(ipAddr)
if err != nil {
return nil, err
}
- newLength := length / 2
- if newLength == 0 {
- newLength = 1
- }
- return plc.ReadHoldingRegister(conn, address, newLength)
+ return plc.ReadHoldingRegister(conn, address, length)
} else {
return modbusx.Read(ipAddr, uint16(address), uint16(length))
}
@@ -164,11 +156,7 @@
Parity: plcConfig.Parity,
}
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- newLength := length / 2
- if newLength == 0 {
- newLength = 1
- }
- return apacheplc4x.ReadHoldingRegisterByRTU(rtuConfig, address, newLength)
+ return apacheplc4x.ReadHoldingRegisterByRTU(rtuConfig, address, length)
} else {
return modbusx.ReadByRTU(rtuConfig, uint16(address), uint16(length))
}
--
Gitblit v1.8.0