From 2df84cdc7faf29cc8a2512b627a36a3881276b9f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 26 十月 2023 16:29:15 +0800
Subject: [PATCH] plc4x读写加入长度
---
service/plc.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index f73ec58..01b95a5 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -13,6 +13,7 @@
"errors"
"fmt"
"github.com/spf13/cast"
+ "sync/atomic"
)
func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
@@ -57,6 +58,7 @@
var (
ipAddr string
)
+ defer dealErr(err)
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
err = WriteHoldingRegister(ipAddr, address, value)
@@ -81,6 +83,7 @@
var (
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)
@@ -94,13 +97,15 @@
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))
}
}
- logx.Infof("plc read ok, address: %v, result: %v", address, val)
+ logx.Infof("plc read ok, address: %v, result: %v, dataLength: %v, valueLength: %v", address, val, dataLength, len(value))
return val, nil
} else if plcConfig.Method == constvar.PlcMethodSerial {
ipAddr = conf.Conf.Services.Serial
@@ -144,11 +149,50 @@
}
func PlcIsConnect() bool {
- if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.IsConnect()
- } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
- return false
+ 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) {
+ if err != nil {
+ FailureRemainingOpportunitiesDecr() //鍑忓皯澶辫触鍓╀綑鏈轰細
} else {
- return modbusx.IsConnect()
+ FailureRemainingOpportunitiesReset() //閲嶇疆澶辫触鍓╀綑鏈轰細
}
}
+
+var connectionStatus atomic.Bool
+
+var failureRemainingOpportunities atomic.Int64
+
+const (
+ defaultFailureRemainingOpportunities = 20
+)
+
+func IsConnect() bool {
+ return connectionStatus.Load()
+}
+
+func FailureRemainingOpportunitiesDecr() {
+ newValue := failureRemainingOpportunities.Add(-1)
+ if newValue <= 0 {
+ connectionStatus.Store(false)
+ }
+ return
+}
+
+func FailureRemainingOpportunitiesReset() {
+ if failureRemainingOpportunities.Load() < defaultFailureRemainingOpportunities {
+ failureRemainingOpportunities.Store(defaultFailureRemainingOpportunities)
+ }
+ if connectionStatus.Load() == false {
+ connectionStatus.Store(true)
+ }
+ return
+}
--
Gitblit v1.8.0