From 2847f0c08a7859ab5fb021e0697a656a2a216f17 Mon Sep 17 00:00:00 2001 From: Rice <1840169763@qq.com> Date: Tue, 28 Jul 2026 22:28:58 +0800 Subject: [PATCH] release:1.45 --- apps/m9zCtrlTty/m9zCtrlTty.go | 2 +- internal/module/m9zTtyApi/read.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/m9zCtrlTty/m9zCtrlTty.go b/apps/m9zCtrlTty/m9zCtrlTty.go index 7a9cff5..5fbaffb 100644 --- a/apps/m9zCtrlTty/m9zCtrlTty.go +++ b/apps/m9zCtrlTty/m9zCtrlTty.go @@ -3,6 +3,7 @@ package main import ( "fmt" "log" + "tgk-touch/internal/module/maincontrollerClient" "time" "github.com/gogf/gf/v2/errors/gerror" @@ -15,7 +16,6 @@ import ( "tgk-touch/internal/core" g "tgk-touch/internal/global" "tgk-touch/internal/initialize" - "tgk-touch/internal/module/maincontrollerClient" ) func main() { diff --git a/internal/module/m9zTtyApi/read.go b/internal/module/m9zTtyApi/read.go index d95d1ec..486de44 100644 --- a/internal/module/m9zTtyApi/read.go +++ b/internal/module/m9zTtyApi/read.go @@ -142,8 +142,8 @@ type DeviceStatus struct { // 实时监控数据 func getDeviceStatus2(rpc towgo.JsonRpcConnection) { // 临时演示模式：原串口读取实现已保留在 getDeviceStatus2Real。 - // getDeviceStatus2Real(rpc) - rpc.WriteResult(buildDemoDeviceStatus2()) + getDeviceStatus2Real(rpc) + //rpc.WriteResult(buildDemoDeviceStatus2()) } func getDeviceStatus2Real(rpc towgo.JsonRpcConnection) { @@ -235,6 +235,8 @@ func buildDemoDeviceStatus2() *DeviceStatus { loop.Faults = m9z.BuildLoopFaults(uint(i+1), 0x04, "04 03") case 8: loop.Faults = m9z.BuildLoopFaults(uint(i+1), 0x03, "03 00") + default: + loop.Faults = m9z.BuildLoopFaults(uint(i+1), 0x02, "02 00") } loop.HasFault = len(loop.Faults) > 0 loop.FaultMsg = joinLoopFaultMessages(loop.Faults)