From 20bbbcc1d14536ddaa498ac84a6008828df8dc1c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 十二月 2023 20:23:11 +0800
Subject: [PATCH] 往plc写目标数时，优先往写入地址写，没有写入地址再往读取地址写
---
constvar/const.go | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index 8ab136b..152d582 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -8,20 +8,24 @@
NsqTopicDeviceUpdate = "aps.%v.device.update" //璁惧淇℃伅鏇存敼
NsqTopicPullDataRequest = "aps.%v.pull.data.request" //鎷夊彇鏁版嵁璇锋眰
NsqTopicPullDataResponse = "aps.%v.pull.data.response" //鎷夊彇鏁版嵁鍝嶅簲
+ NsqTopicApsClientReportData = "aps.%v.apsClient.report.data" //apsClient涓婃姤鏁版嵁
+ NsqTopicSendDashboardData = "aps.%v.apsClient.dashboard" //涓嬪彂dashboard鏁版嵁
)
type PlcStartAddressType int
const (
- PlcStartAddressTypeFinishNumber PlcStartAddressType = 1
- PlcStartAddressTypeTotalNumber PlcStartAddressType = 2
+ PlcStartAddressTypeFinishNumber PlcStartAddressType = 1
+ PlcStartAddressTypeTotalNumber PlcStartAddressType = 2
+ PlcStartAddressTypeTotalNumberWrite PlcStartAddressType = 3
)
type PlcStartAddressValueType string
const (
PlcStartAddressValueTypeString PlcStartAddressValueType = "string"
- PlcStartAddressValueTypeInt PlcStartAddressValueType = "int"
+ PlcStartAddressValueTypeInt16 PlcStartAddressValueType = "int16"
+ PlcStartAddressValueTypeInt32 PlcStartAddressValueType = "int32"
)
const (
@@ -80,7 +84,7 @@
ParityNull Parity = 3 //鏃犳牎楠�
)
-func (p Parity) String() string {
+func (p Parity) ToString() string {
switch p {
case ParityEven:
return "E"
@@ -126,3 +130,17 @@
SystemStatusValueNormal SystemStatusValue = "1"
SystemStatusValueUnNormal SystemStatusValue = "2"
)
+
+type ReportType int //涓婃姤绫诲瀷
+
+const (
+ ReportTypeSystemDeviceID ReportType = 1
+ ReportTypeReportWork ReportType = 2
+)
+
+type SyncStatus int //鍚屾鐘舵��
+
+const (
+ SyncStatusWait SyncStatus = 1 //寰呭悓姝�
+ SyncStatusOk SyncStatus = 2 //宸插畬鎴�
+)
--
Gitblit v1.8.0