From 83b652cd2f1be2375d33a67366a7c359cf6e22c0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 九月 2023 14:56:09 +0800
Subject: [PATCH] 支持几个配置，支持按配置选择plc驱动包
---
constvar/const.go | 6 +++
service/plc.go | 51 ++++++++++++++++++-------
pkg/plc/modbusx/modbus.go | 33 ++++++++++++++--
pkg/plc/apacheplc4x/modbus.go | 15 ++++++-
conf/config.go | 3 +
conf/apsClient.json | 5 ++
pkg/plc/modbusx/connection_manager.go | 7 +++
7 files changed, 96 insertions(+), 24 deletions(-)
diff --git a/conf/apsClient.json b/conf/apsClient.json
index 35472df..64f6ab7 100644
--- a/conf/apsClient.json
+++ b/conf/apsClient.json
@@ -30,7 +30,10 @@
},
"plc": {
"finishNumberTimeInterval": 0,
- "totalNumberTimeInterval": 0
+ "totalNumberTimeInterval": 0,
+ "modbusIntType": "DINT",
+ "slaveId": 0,
+ "package": "goburrow"
}
}
diff --git a/conf/config.go b/conf/config.go
index bf7ffbd..4307f1f 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -70,6 +70,9 @@
plc struct {
FinishNumberTimeInterval int
TotalNumberTimeInterval int
+ ModbusIntType string
+ SlaveId int
+ Package string
}
config struct {
diff --git a/constvar/const.go b/constvar/const.go
index eb2f630..8b56942 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -57,3 +57,9 @@
PlcCacheKeyFinishNumber = "finish_number"
PlcCacheKeyTotalNumber = "total_number"
)
+
+const (
+ PlcPackageApache = "apache"
+ PlcPackageGoBurrow = "goBurrow"
+ PlcPackageApacheLongConnection = "apacheLong"
+)
diff --git a/pkg/plc/apacheplc4x/modbus.go b/pkg/plc/apacheplc4x/modbus.go
index d9ef045..7555866 100644
--- a/pkg/plc/apacheplc4x/modbus.go
+++ b/pkg/plc/apacheplc4x/modbus.go
@@ -1,6 +1,7 @@
package apacheplc4x
import (
+ "apsClient/conf"
"apsClient/pkg/logx"
"context"
"errors"
@@ -52,7 +53,7 @@
func readHoldingRegisterSingle(connection plc4go.PlcConnection, address int) ([]byte, error) {
tag := fmt.Sprintf("tag:%v", address)
- tagAddress := fmt.Sprintf("holding-register:%d:DINT", address)
+ tagAddress := getTagAddress(address)
// 璇绘ā寮�
readRequest, err := connection.ReadRequestBuilder().AddTagAddress(tag, tagAddress).Build()
@@ -82,7 +83,7 @@
func readHoldingRegisterList(connection plc4go.PlcConnection, address, length int) ([]byte, error) {
tag := fmt.Sprintf("tag:%v:%v", address, length)
- tagAddress := fmt.Sprintf("holding-register:%d:DINT[%d]", address, length)
+ tagAddress := getTagAddress(address)
// 璇绘ā寮�
readRequest, err := connection.ReadRequestBuilder().AddTagAddress(tag, tagAddress).Build()
@@ -129,6 +130,14 @@
return readHoldingRegisterSingle(connection, address)
}
+func getTagAddress(address int) string {
+ intType := conf.Conf.PLC.ModbusIntType
+ if intType == "" {
+ intType = "DINT"
+ }
+ return fmt.Sprintf("holding-register:%d:%v", address, intType)
+}
+
func WriteHoldingRegister(ipAddr string, address int, value any) (string, error) {
connection, err := GetModbusConnection(ipAddr)
dealErr(err, ipAddr)
@@ -137,7 +146,7 @@
}
defer connection.Close()
tag := fmt.Sprintf("tag:%v:w", address)
- tagAddress := fmt.Sprintf("holding-register:%d:DINT", address)
+ tagAddress := getTagAddress(address)
// 鍐欐ā寮�
writeRequest, err := connection.WriteRequestBuilder().AddTagAddress(tag, tagAddress, value).Build()
diff --git a/pkg/plc/modbusx/connection_manager.go b/pkg/plc/modbusx/connection_manager.go
index 3757d34..0aef49b 100644
--- a/pkg/plc/modbusx/connection_manager.go
+++ b/pkg/plc/modbusx/connection_manager.go
@@ -1,8 +1,10 @@
package modbusx
import (
+ "apsClient/conf"
"github.com/goburrow/modbus"
"sync"
+ "time"
)
type ConnectionManager struct {
@@ -59,5 +61,8 @@
}
func newGetModbusConnection(ipAddr string) modbus.Client {
- return modbus.TCPClient(ipAddr)
+ handler := modbus.NewTCPClientHandler(ipAddr)
+ handler.Timeout = 10 * time.Second
+ handler.SlaveId = byte(conf.Conf.PLC.SlaveId)
+ return modbus.NewClient(handler)
}
diff --git a/pkg/plc/modbusx/modbus.go b/pkg/plc/modbusx/modbus.go
index 4bb3b64..edcea6f 100644
--- a/pkg/plc/modbusx/modbus.go
+++ b/pkg/plc/modbusx/modbus.go
@@ -1,7 +1,7 @@
package modbusx
import (
- "encoding/json"
+ "encoding/binary"
"sync/atomic"
)
@@ -12,10 +12,12 @@
return
}
-func Write(ipAddr string, address uint16, value interface{}) (err error) {
- bytesVal, err := json.Marshal(value)
- if err != nil {
- return err
+func Write(ipAddr string, address uint16, value int) (err error) {
+ var bytesVal []byte
+ if value <= 1<<16 {
+ uint16ToBytes(uint16(value))
+ } else {
+ bytesVal = intToBytes(value)
}
cli := getModbusConnection(ipAddr)
_, err = cli.WriteMultipleRegisters(address, uint16(len(bytesVal)), bytesVal)
@@ -23,6 +25,27 @@
return err
}
+func uint16ToBytes(value uint16) []byte {
+ // 鍒涘缓涓�涓暱搴︿负2鐨勫瓧鑺傚垏鐗�
+ bytes := make([]byte, 2)
+
+ // 灏� uint16 鐨勫�煎啓鍏ュ瓧鑺傚垏鐗囷紝鍙互閫夋嫨浣跨敤澶х鎴栧皬绔瓧鑺傚簭
+ bytes[0] = byte(value >> 8) // 鑾峰彇楂�8浣�
+ bytes[1] = byte(value) // 鑾峰彇浣�8浣�
+
+ return bytes
+}
+
+func intToBytes(value int) []byte {
+ // 鍒涘缓涓�涓暱搴︿负4鐨勫瓧鑺傚垏鐗囷紝鐢ㄤ簬瀛樺偍 int 鍊�
+ bytes := make([]byte, 4)
+
+ // 浣跨敤 binary 鍖呭皢 int 鍊艰浆鎹负瀛楄妭鍒囩墖
+ binary.BigEndian.PutUint32(bytes, uint32(value))
+
+ return bytes
+}
+
func dealErr(err error, ipAddr string) {
if err != nil {
unsetModbusConnection(ipAddr) //澶辫触鍒欏垹闄ょ紦瀛樼殑杩炴帴
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