Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tasmota: set fix power in static mode (#3177)

Browse source
This commit is contained in:
Markus Thierolf 2022-04-19 09:34:45 +02:00 • committed by GitHub
parent 2cb91bd040
commit 3bf708f9e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
charger/tasmota.go
View file

@ -66,27 +66,27 @@ func NewTasmota(uri, user, password string, standbypower float64) (*Tasmota, err
// Enabled implements the api.Charger interface
func (c *Tasmota) Enabled() (bool, error) {
var resp tasmota.StatusResponse
err := c.GetJSON(c.cmdUri("Status 0"), &resp)
var res tasmota.StatusResponse
err := c.GetJSON(c.cmdUri("Status 0"), &res)
return resp.Status.Power == 1, err
return res.Status.Power == 1, err
}
// Enable implements the api.Charger interface
func (c *Tasmota) Enable(enable bool) error {
var resp tasmota.PowerResponse
var res tasmota.PowerResponse
cmd := "Power off"
if enable {
cmd = "Power on"
}
err := c.GetJSON(c.cmdUri(cmd), &resp)
err := c.GetJSON(c.cmdUri(cmd), &res)
switch {
case err != nil:
return err
case enable && resp.Power != "ON":
case enable && res.Power != "ON":
return errors.New("switchOn failed")
case !enable && resp.Power != "OFF":
case !enable && res.Power != "OFF":
return errors.New("switchOff failed")
default:
return nil
@ -125,11 +125,23 @@ var _ api.Meter = (*Tasmota)(nil)
// CurrentPower implements the api.Meter interface
func (c *Tasmota) CurrentPower() (float64, error) {
var resp tasmota.StatusSNSResponse
err := c.GetJSON(c.cmdUri("Status 8"), &resp)
power := float64(resp.StatusSNS.Energy.Power)
var power float64
// static mode
if c.standbypower < 0 {
on, err := c.Enabled()
if on {
power = -c.standbypower
}
return power, err
}
// standby power mode
var res tasmota.StatusSNSResponse
err := c.GetJSON(c.cmdUri("Status 8"), &res)
// ignore standby power
power = float64(res.StatusSNS.Energy.Power)
if power < c.standbypower {
power = 0
}