From 83b652cd2f1be2375d33a67366a7c359cf6e22c0 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期一, 18 九月 2023 14:56:09 +0800 Subject: [PATCH] 支持几个配置,支持按配置选择plc驱动包 --- service/plc.go | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 14 deletions(-) diff --git a/service/plc.go b/service/plc.go index 16c695c..b86c091 100644 --- a/service/plc.go +++ b/service/plc.go @@ -5,7 +5,9 @@ "apsClient/constvar" "apsClient/model" "apsClient/pkg/logx" + "apsClient/pkg/plc" "apsClient/pkg/plc/apacheplc4x" + "apsClient/pkg/plc/modbusx" "apsClient/pkg/plccom" "encoding/binary" "errors" @@ -102,17 +104,7 @@ ) if plcConfig.Method == constvar.PlcMethodModbusTCP { ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port) - //conn, err := plc.GetModbusConnection(ipAddr) - //if err != nil { - // plcConfig.CurrentErr = err - // return PlcReadDirect(plcConfig, address, dataLength, valueType) - //} - //value, err := plc.ReadHoldingRegister(conn, address, dataLength) - - //value, err := modbusx.Read(ipAddr, uint16(address), uint16(dataLength)) - - value, err := apacheplc4x.ReadHoldingRegister(ipAddr, address, dataLength) - + value, err := ReadHoldingRegister(ipAddr, address, dataLength) if err != nil { return nil, err } @@ -121,15 +113,16 @@ return string(value), nil case constvar.PlcStartAddressValueTypeInt: if len(value) == 2 { - return int(binary.BigEndian.Uint16(value)), nil + val = binary.BigEndian.Uint16(value) } else if len(value) == 4 { - return int32(value[2])<<8 + int32(value[3]), nil + 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)) } } - logx.Infof("plc read ok, address: %v, result: %v", address, value) + logx.Infof("plc read ok, address: %v, result: %v", address, val) + return val, nil } else if plcConfig.Method == constvar.PlcMethodSerial { ipAddr = conf.Conf.Services.Serial if ipAddr == "" { @@ -140,3 +133,33 @@ } return } + +func ReadHoldingRegister(ipAddr string, address, length int) ([]byte, error) { + if conf.Conf.PLC.Package == constvar.PlcPackageApache { + 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 + } + return plc.ReadHoldingRegister(conn, address, length) + } else { + return modbusx.Read(ipAddr, uint16(address), uint16(length)) + } +} + +func WriteHoldingRegister(ipAddr string, address int, value any) (err error) { + if conf.Conf.PLC.Package == constvar.PlcPackageApache { + _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value) + return err + } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection { + conn, err := plc.GetModbusConnection(ipAddr) + if err != nil { + return err + } + _, err = plc.WriteHoldingRegister(conn, address, value) + return err + } else { + return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value)) + } +} -- Gitblit v1.8.0