From 0d653996a057ae372ec630da0bad632341742b86 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 九月 2023 19:37:04 +0800
Subject: [PATCH] plc写用统一的方法

---
 service/plc.go |   25 ++-----------------------
 1 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/service/plc.go b/service/plc.go
index ec7c795..5388b0c 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -34,18 +34,7 @@
 
 	if plcConfig.Method == constvar.PlcMethodModbusTCP {
 		ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
-		//conn, err := plc.GetModbusConnection(ipAddr)
-		//if err != nil {
-		//	logx.Errorf("plc write failed, 杩炴帴plc澶辫触: %v", err.Error())
-		//	plcConfig.CurrentErr = err
-		//	return PlcWrite(plcConfig, fieldType, position, value)
-		//}
-		//
-		//result, err := plc.WriteHoldingRegister(conn, startAddress, value)
-
-		//err = modbusx.Write(ipAddr, uint16(startAddress), value)
-
-		_, err = apacheplc4x.WriteHoldingRegister(ipAddr, startAddress, value)
+		err = WriteHoldingRegister(ipAddr, startAddress, value)
 
 		if err != nil {
 			logx.Errorf("plc write failed, address: %v, value: %v, err: %v", startAddress, value, err.Error())
@@ -70,17 +59,7 @@
 	)
 	if plcConfig.Method == constvar.PlcMethodModbusTCP {
 		ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
-		//conn, err := plc.GetModbusConnection(ipAddr)
-		//if err != nil {
-		//	logx.Errorf("plc write failed, 杩炴帴plc澶辫触: %v", err.Error())
-		//	plcConfig.CurrentErr = err
-		//	return PlcWriteDirect(plcConfig, address, value)
-		//}
-		//result, err := plc.WriteHoldingRegister(conn, address, value)
-
-		//err = modbusx.Write(ipAddr, uint16(address), value)
-
-		_, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+		err = WriteHoldingRegister(ipAddr, address, value)
 
 		if err != nil {
 			logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())

--
Gitblit v1.8.0