Merge branch 'refs/heads/main' into clean_beep
This commit is contained in:
@@ -109,11 +109,14 @@ func Run() {
|
||||
tts.DefaultTTS = tts.New(ctx, config.C.Aliyun)
|
||||
|
||||
// 构建继电器对象
|
||||
r, err := relay.New(config.C.Relay)
|
||||
if err != nil {
|
||||
zap.S().Panicln("串口连接异常: ", err)
|
||||
var r relay.Relay
|
||||
if config.C.Relay != "" {
|
||||
r, err = relay.New(config.C.Relay)
|
||||
if err != nil {
|
||||
zap.S().Panicln("继电器连接异常: ", err)
|
||||
}
|
||||
defer r.Close()
|
||||
}
|
||||
defer r.Close()
|
||||
|
||||
// 构建全局设备变量
|
||||
device := common.DefaultDevice(ctx, publishTopic)
|
||||
@@ -127,7 +130,7 @@ func Run() {
|
||||
middleware.DeviceLock(device),
|
||||
middleware.EmergencyStop(common.GlobalStopper),
|
||||
middleware.SoundStart(),
|
||||
middleware.RelayMaster(nil),
|
||||
middleware.RelayMaster(r),
|
||||
middleware.TimeoutOver(config.C.MaxTimeout),
|
||||
middleware.TickerAction(),
|
||||
middleware.PlayBgm(),
|
||||
|
||||
Reference in New Issue
Block a user