95cfe455b8
#429 introduced a bug when KEBA was configured using serial number. The TCH :OK messages received from KEBA could not be routed to the subscriber since they don't contain serial numbers. This PR adds a serial<->address cache to the listener for maintaining this mapping and hence make the OK responses routable.
86 lines
1.3 KiB
Go
86 lines
1.3 KiB
Go
package detect
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/andig/evcc/charger/keba"
|
|
"github.com/andig/evcc/util"
|
|
)
|
|
|
|
type KebaResult struct {
|
|
Addr, Serial string
|
|
}
|
|
|
|
func init() {
|
|
registry.Add("keba", KEBAHandlerFactory)
|
|
}
|
|
|
|
func KEBAHandlerFactory(conf map[string]interface{}) (TaskHandler, error) {
|
|
handler := KEBAHandler{
|
|
Timeout: 5 * timeout,
|
|
}
|
|
|
|
err := util.DecodeOther(conf, &handler)
|
|
|
|
return &handler, err
|
|
}
|
|
|
|
type KEBAHandler struct {
|
|
mux sync.Mutex
|
|
listener *keba.Listener
|
|
Timeout time.Duration
|
|
}
|
|
|
|
func (h *KEBAHandler) Test(log *util.Logger, ip string) []interface{} {
|
|
h.mux.Lock()
|
|
|
|
if h.listener == nil {
|
|
var err error
|
|
if h.listener, err = keba.New(log); err != nil {
|
|
log.ERROR.Println("keba:", err)
|
|
}
|
|
|
|
h.mux.Unlock()
|
|
return nil
|
|
}
|
|
|
|
h.mux.Unlock()
|
|
|
|
resC := make(chan keba.UDPMsg)
|
|
h.listener.Subscribe(ip, resC)
|
|
|
|
sender, err := keba.NewSender(log, ip)
|
|
if err != nil {
|
|
log.ERROR.Println("keba:", err)
|
|
return nil
|
|
}
|
|
|
|
timer := time.NewTimer(h.Timeout)
|
|
WAIT:
|
|
for {
|
|
go func() {
|
|
_ = sender.Send("report 1")
|
|
}()
|
|
|
|
select {
|
|
case t := <-resC:
|
|
log.INFO.Println(t)
|
|
if t.Report == nil {
|
|
continue
|
|
}
|
|
|
|
r := KebaResult{
|
|
Addr: t.Addr,
|
|
Serial: t.Report.Serial,
|
|
}
|
|
|
|
return []interface{}{r}
|
|
|
|
case <-timer.C:
|
|
break WAIT
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|