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 | 110 +++++++++++++++++++++++--------------------------------
1 files changed, 46 insertions(+), 64 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index 8b00c7d..b86c091 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -6,6 +6,7 @@
"apsClient/model"
"apsClient/pkg/logx"
"apsClient/pkg/plc"
+ "apsClient/pkg/plc/apacheplc4x"
"apsClient/pkg/plc/modbusx"
"apsClient/pkg/plccom"
"encoding/binary"
@@ -13,59 +14,6 @@
"fmt"
"github.com/spf13/cast"
)
-
-func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int) (val interface{}, err error) {
- var (
- startAddress int
- valueType constvar.PlcStartAddressValueType
- dataLength int
- ipAddr string
- )
-
- for _, pc := range plcConfig.Details {
- if pc.FieldName == fieldType && pc.Position == position {
- startAddress = pc.StartAddress
- valueType = pc.Type
- dataLength = pc.Length
- }
- }
-
- if plcConfig.Method == constvar.PlcMethodModbusTCP {
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
-
- conn, err := plc.GetModbusConnection(ipAddr)
- if err != nil {
- logx.Errorf("PlcRead 杩炴帴plc澶辫触: %v", err.Error())
- return nil, err
- }
-
- rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
- if err != nil {
- logx.Errorf("PlcRead 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
- return nil, err
- }
- switch valueType {
- case constvar.PlcStartAddressValueTypeString:
- return string(rawData), nil
- case constvar.PlcStartAddressValueTypeInt:
- if len(rawData) == 2 {
- return int(binary.BigEndian.Uint16(rawData)), nil
- } else {
- logx.Errorf("plc read get an unknown int value: %v, address:%v", rawData, startAddress)
- return nil, errors.New(fmt.Sprintf("unknown int value锛�%v", rawData))
- }
- }
- return nil, errors.New("undefined value type")
- } else if plcConfig.Method == constvar.PlcMethodSerial {
- ipAddr = conf.Conf.Services.Serial
- if ipAddr == "" {
- return nil, errors.New("conf.Conf.Services.Serial config not set yet")
- }
- label := fmt.Sprintf("D%d", startAddress)
- return plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label)
- }
- return nil, errors.New("interface type not support")
-}
func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int, value interface{}) (err error) {
var (
@@ -94,7 +42,11 @@
//}
//
//result, err := plc.WriteHoldingRegister(conn, startAddress, value)
- err = modbusx.Write(ipAddr, uint16(startAddress), value)
+
+ //err = modbusx.Write(ipAddr, uint16(startAddress), value)
+
+ _, err = apacheplc4x.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
@@ -126,7 +78,10 @@
//}
//result, err := plc.WriteHoldingRegister(conn, address, value)
- err = modbusx.Write(ipAddr, uint16(address), value)
+ //err = modbusx.Write(ipAddr, uint16(address), value)
+
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+
if err != nil {
logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
return err
@@ -149,13 +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 := ReadHoldingRegister(ipAddr, address, dataLength)
if err != nil {
return nil, err
}
@@ -164,13 +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 {
+ 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 == "" {
@@ -181,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