Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correction/totalenergy for tasmota and tplink charger #2484

Merged
merged 6 commits into from
Feb 4, 2022
Merged

Correction/totalenergy for tasmota and tplink charger #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
372dbee
Change wakeup timeout to 60s
andig Feb 1, 2022
84ddc4f
Merge remote-tracking branch 'upstream/master'
Feb 3, 2022
bdbff2b
Merge remote-tracking branch 'upstream/master'
Feb 3, 2022
48e34c5
correct tasmota total energy
Feb 3, 2022
aa2b5e7
correct tp-link total energy + tasmota trimright
Feb 3, 2022
38e3b77
func TotalEnergy power => energy
Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions charger/tasmota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@ func NewTasmota(uri, user, password string, standbypower float64) (*Tasmota, err
log := util.NewLogger("tasmota")
c := &Tasmota{
Helper: request.NewHelper(log),
uri: strings.TrimRight(uri, "/"),
uri: util.DefaultScheme(strings.TrimRight(uri, "/"), "http"),
user: user,
password: password,
standbypower: standbypower,
}

c.Client.Transport = request.NewTripper(log, transport.Insecure())

return c, nil
Expand Down Expand Up @@ -132,7 +133,7 @@ func (c *Tasmota) TotalEnergy() (float64, error) {
var resp tasmota.StatusSNSResponse
err := c.GetJSON(c.cmdUri("Status 8"), &resp)

return resp.StatusSNS.Energy.Today, err
return resp.StatusSNS.Energy.Total, err
}

// cmdUri creates the Tasmota command web request
Expand Down
14 changes: 6 additions & 8 deletions charger/tplink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,18 @@ var _ api.MeterEnergy = (*TPLink)(nil)

// TotalEnergy implements the api.MeterEnergy interface
func (c *TPLink) TotalEnergy() (float64, error) {
var resp tplink.DayStatResponse
year, month, day := time.Now().Date()
cmd := fmt.Sprintf(`{"emeter":{"get_daystat":{"day":%v,"month":%v,"year":%v}}}`, day, int(month), year)
if err := c.execCmd(cmd, &resp); err != nil {
var resp tplink.EmeterResponse
if err := c.execCmd(`{"emeter":{"get_realtime":null}}`, &resp); err != nil {
return 0, err
}

if err := resp.Emeter.GetDaystat.ErrCode; err != 0 {
return 0, fmt.Errorf("get_daystat error %d", err)
if err := resp.Emeter.GetRealtime.ErrCode; err != 0 {
return 0, fmt.Errorf("get_realtime error %d", err)
}

energy := resp.Emeter.GetDaystat.DayList[len(resp.Emeter.GetDaystat.DayList)-1].EnergyWh / 1000
energy := resp.Emeter.GetRealtime.TotalWh / 1000
if energy == 0 {
energy = resp.Emeter.GetDaystat.DayList[len(resp.Emeter.GetDaystat.DayList)-1].Energy
energy = resp.Emeter.GetRealtime.Total
}

return energy, nil
Expand Down