OpenPDU/openpdu
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Update board.go and board_mqtt.go

Browse Source
This commit is contained in:
Paolo Asperti 2021-01-05 16:59:31 +01:00
parent bcfbbaba80
commit 5e2a7c46bc
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/board.go
View File

@ -13,7 +13,6 @@ type Channel interface {
Off() error Off() error
ToString() string ToString() string
UpdateMQTT() UpdateMQTT()
OnChange()
Status() bool Status() bool
Parent() Board Parent() Board
Dump() Dump()

50
src/board_mqtt.go
View File

@ -7,6 +7,7 @@ import (
"time" "time"
MQTT "github.com/eclipse/paho.mqtt.golang" MQTT "github.com/eclipse/paho.mqtt.golang"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -115,19 +116,25 @@ func newMQTTBoard(v *viper.Viper, id string) *MQTTBoard {
func (c *MQTTChannel) Toggle() (bool, error) { func (c *MQTTChannel) Toggle() (bool, error) {
c.Value = !c.Value c.Value = !c.Value
c.OnChange() c.SaveLastState()
c.UpdateMQTT()
c.UpdateRemoteMQTT()
return c.Value, nil return c.Value, nil
} }
func (c *MQTTChannel) On() error { func (c *MQTTChannel) On() error {
c.Value = true c.Value = true
c.OnChange() c.SaveLastState()
c.UpdateMQTT()
c.UpdateRemoteMQTT()
return nil return nil
} }
func (c *MQTTChannel) Off() error { func (c *MQTTChannel) Off() error {
c.Value = true c.Value = true
c.OnChange() c.SaveLastState()
c.UpdateMQTT()
c.UpdateRemoteMQTT()
return nil return nil
} }
@ -140,18 +147,20 @@ func (c *MQTTChannel) ToString() string {
func (c *MQTTChannel) UpdateMQTT() { func (c *MQTTChannel) UpdateMQTT() {
MQTTpublish(c.MQTTTopic, c.ToString()) MQTTpublish(c.MQTTTopic, c.ToString())
if c.parent.MQTTClient.IsConnected() {
c.parent.MQTTClient.Publish(c.MQTTRemoteTopic, 0, false, c.ToString())
}
} }
func (c *MQTTChannel) OnChange() { func (c *MQTTChannel) SaveLastState() {
if c.onboot == "last" { if c.onboot == "last" {
s := fmt.Sprintf("boards.%s.channels.%s.lastvalue", c.parent.ID, c.ID) s := fmt.Sprintf("boards.%s.channels.%s.lastvalue", c.parent.ID, c.ID)
viper.Set(s, c.Value) viper.Set(s, c.Value)
viper.WriteConfig() viper.WriteConfig()
} }
c.UpdateMQTT() }
func (c *MQTTChannel) UpdateRemoteMQTT() {
if c.parent.MQTTClient.IsConnected() {
c.parent.MQTTClient.Publish(c.MQTTRemoteTopic, 0, false, c.ToString())
}
} }
func (c *MQTTChannel) Status() bool { func (c *MQTTChannel) Status() bool {
@ -212,6 +221,31 @@ func (b *MQTTBoard) Init() {
} }
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
} }
for i := range b.Channels {
topic := b.Channels[i].MQTTRemoteTopic
if topic == "" {
continue
}
b.MQTTClient.Subscribe(topic, 1, b.Channels[i].MQTTSubHandler)
}
}
func (c *MQTTChannel) MQTTSubHandler(client mqtt.Client, msg mqtt.Message) {
switch string(msg.Payload()) {
case "on":
if !c.Value {
c.Value = true
c.SaveLastState()
c.UpdateMQTT()
}
case "off":
if c.Value {
c.Value = false
c.SaveLastState()
c.UpdateMQTT()
}
}
} }
func (b *MQTTBoard) Channel(num uint64) Channel { func (b *MQTTBoard) Channel(num uint64) Channel {