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

Bluelink: fix refresh for old bluelink API (#13785)

Browse source
This commit is contained in:
Simon Schenk 2024-05-07 13:50:42 +02:00 • committed by GitHub
parent 59519ada19
commit 1ff1513c38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vehicle/bluelink/api.go
View file

@ -108,5 +108,5 @@ func (v *API) StatusPartial(vehicle Vehicle) (BluelinkVehicleStatus, error) {
if err == nil && res.RetCode != resOK {
err = fmt.Errorf("unexpected response: %s", res.RetCode)
}
return res, err
return res.ResMsg, err
}

10
vehicle/bluelink/provider.go
View file

@ -30,7 +30,7 @@ func NewProvider(api *API, vehicle Vehicle, expiry, cache time.Duration) *Provid
v.statusG = provider.Cached(func() (BluelinkVehicleStatus, error) {
return v.status(
func() (BluelinkVehicleStatus, error) { return api.StatusPartial(vehicle) },
func() (BluelinkVehicleStatusLatest, error) { return api.StatusLatest(vehicle) },
)
}, cache)
@ -42,20 +42,20 @@ func NewProvider(api *API, vehicle Vehicle, expiry, cache time.Duration) *Provid
}
// status wraps the api status call and adds status refresh
func (v *Provider) status(statusG func() (BluelinkVehicleStatus, error)) (BluelinkVehicleStatus, error) {
func (v *Provider) status(statusG func() (BluelinkVehicleStatusLatest, error)) (BluelinkVehicleStatus, error) {
res, err := statusG()
var ts time.Time
if err == nil {
ts, err = res.Updated()
ts, err = res.BluelinkVehicleStatus().Updated()
if err != nil {
return res, err
return res.BluelinkVehicleStatus(), err
}
// return the current value
if time.Since(ts) <= v.expiry {
v.refreshTime = time.Time{}
return res, nil
return res.BluelinkVehicleStatus(), nil
}
}

51
vehicle/bluelink/types.go
View file

@ -17,6 +17,7 @@ type BluelinkVehicleStatus interface {
}
type BluelinkVehicleStatusLatest interface {
BluelinkVehicleStatus() BluelinkVehicleStatus
Odometer() (float64, error)
Position() (float64, float64, error)
}
@ -83,10 +84,6 @@ const (
plugTypeAC = 1
)
func (d *VehicleStatus) Updated() (time.Time, error) {
return time.Parse(timeFormat, d.Time+timeOffset)
}
type DrivingDistance struct {
RangeByFuel struct {
EvModeRange struct {
@ -104,25 +101,25 @@ type TargetSoc struct {
PlugType int
}
func (d StatusResponse) Updated() (time.Time, error) {
return time.Parse(timeFormat, d.ResMsg.Time+timeOffset)
func (d VehicleStatus) Updated() (time.Time, error) {
return time.Parse(timeFormat, d.Time+timeOffset)
}
func (d StatusResponse) SoC() (float64, error) {
if d.ResMsg.EvStatus != nil {
return d.ResMsg.EvStatus.BatteryStatus, nil
func (d VehicleStatus) SoC() (float64, error) {
if d.EvStatus != nil {
return d.EvStatus.BatteryStatus, nil
}
return 0, api.ErrNotAvailable
}
func (d StatusResponse) Status() (api.ChargeStatus, error) {
if d.ResMsg.EvStatus != nil {
func (d VehicleStatus) Status() (api.ChargeStatus, error) {
if d.EvStatus != nil {
status := api.StatusA
if d.ResMsg.EvStatus.BatteryPlugin > 0 || d.ResMsg.EvStatus.ChargePortDoorOpenStatus == 1 {
if d.EvStatus.BatteryPlugin > 0 || d.EvStatus.ChargePortDoorOpenStatus == 1 {
status = api.StatusB
}
if d.ResMsg.EvStatus.BatteryCharge {
if d.EvStatus.BatteryCharge {
status = api.StatusC
}
return status, nil
@ -131,12 +128,12 @@ func (d StatusResponse) Status() (api.ChargeStatus, error) {
return api.StatusNone, api.ErrNotAvailable
}
func (d StatusResponse) FinishTime() (time.Time, error) {
if d.ResMsg.EvStatus != nil {
remaining := d.ResMsg.EvStatus.RemainTime2.Atc.Value
func (d VehicleStatus) FinishTime() (time.Time, error) {
if d.EvStatus != nil {
remaining := d.EvStatus.RemainTime2.Atc.Value
if remaining != 0 {
ts, err := d.ResMsg.Updated()
ts, err := d.Updated()
return ts.Add(time.Duration(remaining) * time.Minute), err
}
}
@ -144,18 +141,18 @@ func (d StatusResponse) FinishTime() (time.Time, error) {
return time.Time{}, api.ErrNotAvailable
}
func (d StatusResponse) Range() (int64, error) {
if d.ResMsg.EvStatus != nil {
if dist := d.ResMsg.EvStatus.DrvDistance; len(dist) == 1 {
func (d VehicleStatus) Range() (int64, error) {
if d.EvStatus != nil {
if dist := d.EvStatus.DrvDistance; len(dist) == 1 {
return int64(dist[0].RangeByFuel.EvModeRange.Value), nil
}
}
return 0, api.ErrNotAvailable
}
func (d StatusResponse) GetLimitSoc() (int64, error) {
if d.ResMsg.EvStatus != nil {
for _, targetSOC := range d.ResMsg.EvStatus.ReservChargeInfos.TargetSocList {
func (d VehicleStatus) GetLimitSoc() (int64, error) {
if d.EvStatus != nil {
for _, targetSOC := range d.EvStatus.ReservChargeInfos.TargetSocList {
if targetSOC.PlugType == plugTypeAC {
return int64(targetSOC.TargetSocLevel), nil
}
@ -164,6 +161,10 @@ func (d StatusResponse) GetLimitSoc() (int64, error) {
return 0, api.ErrNotAvailable
}
func (d StatusLatestResponse) BluelinkVehicleStatus() BluelinkVehicleStatus {
return d.ResMsg.VehicleStatusInfo.VehicleStatus
}
func (d StatusLatestResponse) Odometer() (float64, error) {
if d.ResMsg.VehicleStatusInfo.Odometer != nil {
return d.ResMsg.VehicleStatusInfo.Odometer.Value, nil
@ -271,6 +272,10 @@ type VehicleStatusCCS struct {
}
}
func (d StatusLatestResponseCCS) BluelinkVehicleStatus() BluelinkVehicleStatus {
return d
}
func (d StatusLatestResponseCCS) Updated() (time.Time, error) {
epoch, err := strconv.ParseInt(d.ResMsg.LastUpdateTime, 10, 64)
if err != nil {