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

Jump to bottom

Delta: fix Status & add StatusReason #15983

Merged
merged 5 commits into from
Sep 14, 2024
Merged

Delta: fix Status & add StatusReason #15983

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5377d1
decorate
premultiply Sep 8, 2024
9ee0592
use var
premultiply Sep 9, 2024
b8d9203
wip
premultiply Sep 11, 2024
4da8463
Update delta.go
premultiply Sep 14, 2024
269f453
Update delta.go
premultiply Sep 14, 2024
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
13 changes: 8 additions & 5 deletions charger/delta.go
View file
Open in desktop
premultiply marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type Delta struct {
curr float64
base uint16
enabled bool
statusG func(uint16) (api.ChargeStatus, error)
isSmart bool
}

const (
Expand Down Expand Up @@ -104,11 +104,9 @@ func NewDelta(uri, device, comset string, baudrate int, proto modbus.Protocol, s

var statusReasonG func() (api.Reason, error)

wb.statusG = wb.statusBasic

// check for smart register set
if _, err := wb.conn.ReadInputRegisters(wb.base+deltaRegEvseChargerState, 1); err == nil {
wb.statusG = wb.statusSmart
wb.isSmart = true
statusReasonG = wb.statusReason
}

premultiply marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -163,7 +161,12 @@ func (wb *Delta) Status() (api.ChargeStatus, error) {
// 7: Suspended EVSE
// 8: Not ready
// 9: Faulted
return wb.statusG(encoding.Uint16(b))

if wb.isSmart {
return wb.statusSmart(encoding.Uint16(b))
}

return wb.statusBasic(encoding.Uint16(b))
}

func (wb *Delta) statusBasic(s uint16) (api.ChargeStatus, error) {
Expand Down