release:1.45

main
Rice 2 weeks ago
parent 3f4d8854a1
commit 2847f0c08a

@ -3,6 +3,7 @@ package main
import ( import (
"fmt" "fmt"
"log" "log"
"tgk-touch/internal/module/maincontrollerClient"
"time" "time"
"github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/errors/gerror"
@ -15,7 +16,6 @@ import (
"tgk-touch/internal/core" "tgk-touch/internal/core"
g "tgk-touch/internal/global" g "tgk-touch/internal/global"
"tgk-touch/internal/initialize" "tgk-touch/internal/initialize"
"tgk-touch/internal/module/maincontrollerClient"
) )
func main() { func main() {

@ -142,8 +142,8 @@ type DeviceStatus struct {
// 实时监控数据 // 实时监控数据
func getDeviceStatus2(rpc towgo.JsonRpcConnection) { func getDeviceStatus2(rpc towgo.JsonRpcConnection) {
// 临时演示模式:原串口读取实现已保留在 getDeviceStatus2Real。 // 临时演示模式:原串口读取实现已保留在 getDeviceStatus2Real。
// getDeviceStatus2Real(rpc) getDeviceStatus2Real(rpc)
rpc.WriteResult(buildDemoDeviceStatus2()) //rpc.WriteResult(buildDemoDeviceStatus2())
} }
func getDeviceStatus2Real(rpc towgo.JsonRpcConnection) { func getDeviceStatus2Real(rpc towgo.JsonRpcConnection) {
@ -235,6 +235,8 @@ func buildDemoDeviceStatus2() *DeviceStatus {
loop.Faults = m9z.BuildLoopFaults(uint(i+1), 0x04, "04 03") loop.Faults = m9z.BuildLoopFaults(uint(i+1), 0x04, "04 03")
case 8: case 8:
loop.Faults = m9z.BuildLoopFaults(uint(i+1), 0x03, "03 00") 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.HasFault = len(loop.Faults) > 0
loop.FaultMsg = joinLoopFaultMessages(loop.Faults) loop.FaultMsg = joinLoopFaultMessages(loop.Faults)

Loading…
Cancel
Save