From 10c65da3d2af7056f48d9301e83f53f102f76e18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 14:52:11 +0800
Subject: [PATCH] fix
---
service/plc.go | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 39 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index a0240ab..68258b8 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -4,6 +4,7 @@
"apsClient/conf"
"apsClient/constvar"
"apsClient/model"
+ "apsClient/model/common"
"apsClient/pkg/logx"
"apsClient/pkg/plc"
"apsClient/pkg/plc/apacheplc4x"
@@ -19,7 +20,6 @@
func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
var (
startAddress int
- ipAddr string
)
if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
@@ -32,26 +32,7 @@
startAddress = pc.StartAddress
}
}
-
- if plcConfig.Method == constvar.PlcMethodModbusTCP {
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- err = WriteHoldingRegister(ipAddr, startAddress, value)
-
- if err != nil {
- logx.Errorf("plc write failed, address: %v, value: %v, err: %v", startAddress, value, err.Error())
- plcConfig.CurrentErr = err
- return PlcWrite(plcConfig, fieldType, channel, value)
- }
- logx.Infof("plc write ok, address: %v, value: %v", startAddress, value)
- } else if plcConfig.Method == constvar.PlcMethodSerial {
- ipAddr = conf.Conf.Services.Serial
- if ipAddr == "" {
- return errors.New("conf.Conf.Services.Serial config not set yet")
- }
- label := fmt.Sprintf("D%d", startAddress)
- return plccom.WritePLC(plccom.DeviceTypeMitsubishi, ipAddr, label, cast.ToInt(value))
- }
- return
+ return PlcWriteDirect(plcConfig, startAddress, value)
}
func PlcWriteDirect(plcConfig *model.DevicePlc, address int, value interface{}) (err error) {
@@ -61,7 +42,16 @@
defer dealErr(err)
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- err = WriteHoldingRegister(ipAddr, address, value)
+ err = WriteByModbusTCP(ipAddr, address, value)
+
+ if err != nil {
+ logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
+ return err
+ }
+ logx.Infof("plc write ok, address: %v, value: %v", address, value)
+ } else if plcConfig.Method == constvar.PlcMethodModbusRTU {
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ err = WriteByModbusRTU(plcConfig, address, value)
if err != nil {
logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
@@ -84,12 +74,21 @@
ipAddr string
)
defer dealErr(err)
- if plcConfig.Method == constvar.PlcMethodModbusTCP {
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- value, err := ReadHoldingRegister(ipAddr, address, dataLength)
- if err != nil {
- return nil, err
+ if plcConfig.Method == constvar.PlcMethodModbusTCP || plcConfig.Method == constvar.PlcMethodModbusRTU {
+ var value []byte
+ if plcConfig.Method == constvar.PlcMethodModbusTCP {
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ value, err = ReadByModbusTCP(ipAddr, address, dataLength)
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ value, err = ReadByModbusRTU(plcConfig, address, dataLength)
+ if err != nil {
+ return nil, err
+ }
}
+
switch valueType {
case constvar.PlcStartAddressValueTypeString:
return string(value), nil
@@ -97,7 +96,9 @@
if len(value) == 2 {
val = binary.BigEndian.Uint16(value)
} else if len(value) == 4 {
- val = binary.BigEndian.Uint32(value)
+ low16Val := uint32(binary.BigEndian.Uint16(value[:2]))
+ high16 := uint32(binary.BigEndian.Uint16(value[2:])) << 16
+ val = low16Val + high16
} else {
logx.Errorf("plc read get an unknown int value: %v, address:%v", value, address)
return nil, errors.New(fmt.Sprintf("unknown int value锛�%v", value))
@@ -116,21 +117,29 @@
return
}
-func ReadHoldingRegister(ipAddr string, address, length int) ([]byte, error) {
+func ReadByModbusTCP(ipAddr string, address, length int) ([]byte, error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.ReadHoldingRegister(ipAddr, address, length)
+ newLength := length / 2
+ if newLength == 0 {
+ newLength = 1
+ }
+ return apacheplc4x.ReadHoldingRegister(ipAddr, address, newLength)
} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
conn, err := plc.GetModbusConnection(ipAddr)
if err != nil {
return nil, err
}
- return plc.ReadHoldingRegister(conn, address, length)
+ newLength := length / 2
+ if newLength == 0 {
+ newLength = 1
+ }
+ return plc.ReadHoldingRegister(conn, address, newLength)
} else {
return modbusx.Read(ipAddr, uint16(address), uint16(length))
}
}
-func WriteHoldingRegister(ipAddr string, address int, value any) (err error) {
+func WriteByModbusTCP(ipAddr string, address int, value any) (err error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
_, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
return err
@@ -146,15 +155,43 @@
}
}
+func ReadByModbusRTU(plcConfig *model.DevicePlc, address, length int) ([]byte, error) {
+ rtuConfig := &common.RTUConfig{
+ BaudRate: plcConfig.BaudRate,
+ SerialName: plcConfig.SerialName,
+ DataBit: plcConfig.DataBit,
+ StopBit: plcConfig.StopBit,
+ Parity: plcConfig.Parity,
+ }
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ newLength := length / 2
+ if newLength == 0 {
+ newLength = 1
+ }
+ return apacheplc4x.ReadHoldingRegisterByRTU(rtuConfig, address, newLength)
+ } else {
+ return modbusx.ReadByRTU(rtuConfig, uint16(address), uint16(length))
+ }
+}
+
+func WriteByModbusRTU(plcConfig *model.DevicePlc, address int, value any) (err error) {
+ rtuConfig := &common.RTUConfig{
+ BaudRate: plcConfig.BaudRate,
+ SerialName: plcConfig.SerialName,
+ DataBit: plcConfig.DataBit,
+ StopBit: plcConfig.StopBit,
+ Parity: plcConfig.Parity,
+ }
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ _, err = apacheplc4x.WriteHoldingRegisterByRTU(rtuConfig, address, value)
+ return err
+ } else {
+ return modbusx.WriteByRTU(rtuConfig, uint16(address), cast.ToInt(value))
+ }
+}
+
func PlcIsConnect() bool {
return IsConnect()
- //if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- // return apacheplc4x.IsConnect()
- //} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
- // return false
- //} else {
- // return modbusx.IsConnect()
- //}
}
func dealErr(err error) {
--
Gitblit v1.8.0