Merge branch 'refs/heads/main' into clean_beep

This commit is contained in:
2024-12-19 10:54:06 +08:00
30 changed files with 661 additions and 149 deletions

View File

@@ -175,12 +175,12 @@ func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
defer cancel()
}
device, err := relay.New(item.Data, nil)
r, err := relay.New(item.Data)
if err != nil {
zap.S().Errorln("继电器初始化异常: ", err)
return
}
defer device.Close()
defer r.Close()
select {
case <-c.Done():
@@ -189,9 +189,9 @@ func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
zap.S().Infoln("待机继电器供电")
defer zap.S().Infoln("待机继电器断电")
device.On(1)
r.On(0)
<-c.Done()
device.Off(1)
r.Off(0)
}
}
}