From be40c6bbad18cee0444c50069d98967cd26b6c3b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 十二月 2023 20:10:24 +0800
Subject: [PATCH] plc读写参数调整，读写方式调整
---
service/plc.go | 143 +++++++++++++++++++++++++++--------------------
1 files changed, 82 insertions(+), 61 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index c577998..98efc26 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -21,24 +21,20 @@
var lock sync.Mutex
func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
- var (
- startAddress int
- )
-
if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
return plcConfig.CurrentErr
}
plcConfig.CurrentTryTimes++
-
+ var targetConfig *model.DevicePlcAddress
for _, pc := range plcConfig.Details {
if pc.FieldName == fieldType && pc.Channel == channel {
- startAddress = pc.StartAddress
+ targetConfig = pc
}
}
- return PlcWriteDirect(plcConfig, startAddress, value)
+ return PlcWriteDirect(plcConfig, value, targetConfig)
}
-func PlcWriteDirect(plcConfig *model.DevicePlc, address int, value interface{}) (err error) {
+func PlcWriteDirect(plcConfig *model.DevicePlc, value interface{}, c *model.DevicePlcAddress) (err error) {
lock.Lock()
defer lock.Unlock()
var (
@@ -49,34 +45,35 @@
}()
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- err = WriteByModbusTCP(ipAddr, address, value)
+ err = WriteByModbusTCP(ipAddr, c.StartAddress, value, c.Endian, c.Length)
if err != nil {
- logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
+ logx.Errorf("plc write failed, address: %v, value: %v, err: %v", c.StartAddress, value, err.Error())
return err
}
- logx.Infof("plc write ok, address: %v, value: %v", address, value)
+ logx.Infof("plc write ok, address: %v, value: %v", c.StartAddress, value)
} else if plcConfig.Method == constvar.PlcMethodModbusRTU {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- err = WriteByModbusRTU(plcConfig, address, value)
+ err = WriteByModbusRTU(plcConfig, c.StartAddress, value, c.Endian, c.Length)
if err != nil {
- logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
+ logx.Errorf("plc write failed, address: %v, value: %v, err: %v", c.StartAddress, value, err.Error())
return err
}
- logx.Infof("plc write ok, address: %v, value: %v", address, value)
+ logx.Infof("plc write ok, address: %v, value: %v", c.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", address)
+ label := fmt.Sprintf("D%d", c.StartAddress)
return plccom.WritePLC(plccom.DeviceTypeMitsubishi, ipAddr, label, cast.ToInt(value))
}
return
}
-func PlcReadDirect(plcConfig *model.DevicePlc, address int, dataLength int, valueType constvar.PlcStartAddressValueType) (val interface{}, err error) {
+func PlcReadDirect(plcConfig *model.DevicePlc, addressConfig *model.DevicePlcAddress) (val interface{}, err error) {
+ address, dataLength, endian := addressConfig.StartAddress, addressConfig.Length, addressConfig.Endian
lock.Lock()
defer lock.Unlock()
var (
@@ -89,7 +86,7 @@
var value []byte
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- value, err = ReadByModbusTCP(ipAddr, address, dataLength)
+ value, err = ReadByModbusTCP(ipAddr, address, dataLength, endian)
if err != nil {
return nil, err
}
@@ -99,33 +96,7 @@
return nil, err
}
}
-
- switch valueType {
- case constvar.PlcStartAddressValueTypeString:
- return string(value), nil
- case constvar.PlcStartAddressValueTypeInt32:
- if len(value) == 2 {
- val = binary.BigEndian.Uint16(value)
- } else if len(value) == 4 {
- val = binary.BigEndian.Uint32(value)
- } 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))
- }
- default:
- if len(value) == 2 {
- val = binary.BigEndian.Uint16(value)
- } else if len(value) == 4 {
- 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))
- }
- }
- logx.Infof("plc read ok, address: %v, result: %v, dataLength: %v, value: %v", address, val, dataLength, value)
- return val, nil
+ return Convert(value, addressConfig)
} else if plcConfig.Method == constvar.PlcMethodSerial {
ipAddr = conf.Conf.Services.Serial
if ipAddr == "" {
@@ -137,9 +108,15 @@
return
}
-func ReadByModbusTCP(ipAddr string, address, length int) ([]byte, error) {
+func ReadByModbusTCP(ipAddr string, address, length int, endian constvar.EndianType) ([]byte, error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.ReadHoldingRegister(ipAddr, address, length)
+ var intType string
+ if endian == constvar.EndianTypeMix {
+ intType = "UINT"
+ } else {
+ intType = "DINT"
+ }
+ return apacheplc4x.ReadHoldingRegister(ipAddr, address, length, intType)
} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
conn, err := plc.GetModbusConnection(ipAddr)
if err != nil {
@@ -151,9 +128,23 @@
}
}
-func WriteByModbusTCP(ipAddr string, address int, value any) (err error) {
+func WriteByModbusTCP(ipAddr string, address int, value any, endian constvar.EndianType, length int) (err error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+ var intType string
+ if endian == constvar.EndianTypeMix {
+ intType = "UINT"
+ int32Value := cast.ToInt32(value)
+ highVal := int32Value / (1 << 16)
+ lowValue := int32Value % (1 << 16)
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, lowValue, intType)
+ if err != nil {
+ return err
+ }
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address+1, highVal, intType)
+ } else {
+ intType = "DINT"
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value, intType)
+ }
return err
} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
conn, err := plc.GetModbusConnection(ipAddr)
@@ -163,7 +154,7 @@
_, err = plc.WriteHoldingRegister(conn, address, value)
return err
} else {
- return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value))
+ return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value), string(endian), length)
}
}
@@ -175,14 +166,10 @@
StopBit: plcConfig.StopBit,
Parity: plcConfig.Parity,
}
- if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.ReadHoldingRegisterByRTU(rtuConfig, address, length)
- } else {
- return modbusx.ReadByRTU(rtuConfig, uint16(address), uint16(length))
- }
+ return modbusx.ReadByRTU(rtuConfig, uint16(address), uint16(length))
}
-func WriteByModbusRTU(plcConfig *model.DevicePlc, address int, value any) (err error) {
+func WriteByModbusRTU(plcConfig *model.DevicePlc, address int, value any, endian constvar.EndianType, length int) (err error) {
rtuConfig := &common.RTUConfig{
BaudRate: plcConfig.BaudRate,
SerialName: plcConfig.SerialName,
@@ -190,12 +177,7 @@
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))
- }
+ return modbusx.WriteByRTU(rtuConfig, uint16(address), cast.ToInt(value), string(endian), length)
}
func PlcIsConnect() bool {
@@ -246,3 +228,42 @@
}
return
}
+
+func Convert(rawValue []byte, c *model.DevicePlcAddress) (value interface{}, err error) {
+ switch c.Type {
+ case constvar.PlcStartAddressValueTypeString:
+ return string(rawValue), nil
+ case constvar.PlcStartAddressValueTypeInt16:
+ if c.Endian == constvar.EndianTypeLittle {
+ value = binary.LittleEndian.Uint16(rawValue)
+ } else {
+ value = binary.BigEndian.Uint16(rawValue)
+ }
+ default:
+ if len(rawValue) == 2 {
+ if c.Endian == constvar.EndianTypeLittle {
+ value = binary.LittleEndian.Uint16(rawValue)
+ } else {
+ value = binary.BigEndian.Uint16(rawValue)
+ }
+ } else if len(rawValue) == 4 {
+ if c.Endian == constvar.EndianTypeBig {
+ value = binary.BigEndian.Uint32(rawValue)
+ } else if c.Endian == constvar.EndianTypeLittle {
+ value = binary.LittleEndian.Uint32(rawValue)
+ } else {
+ highBts := rawValue[2:]
+ lowBts := rawValue[:2]
+ highVal := uint32(binary.BigEndian.Uint16(highBts)) << 16
+ lowVal := uint32(binary.BigEndian.Uint16(lowBts))
+ value = highVal + lowVal
+ }
+ } else {
+ logx.Errorf("plc read get an unknown int value: %v, address:%v", rawValue, c.StartAddress)
+ return nil, errors.New(fmt.Sprintf("unknown value锛�%v", rawValue))
+ }
+ }
+
+ logx.Infof("plc read ok, address: %v, result: %v, value: %v, c:%+v", c.StartAddress, rawValue, value, c)
+ return
+}
--
Gitblit v1.8.0