Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
18 changes: 15 additions & 3 deletions vehicle/bluelink/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,15 @@ const (
timeOffset = " +0100"

plugTypeAC = 1
unitMiles = 3
kmPerMile = 1.60934
)

type DrivingDistance struct {
RangeByFuel struct {
EvModeRange struct {
Value float64
Unit int
}
}
}
Expand Down Expand Up @@ -144,7 +147,12 @@ func (d VehicleStatus) FinishTime() (time.Time, error) {
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
evRange := dist[0].RangeByFuel.EvModeRange
value := evRange.Value
if evRange.Unit == unitMiles {
value *= kmPerMile
}
return int64(value + 0.5), nil
Comment thread
andig marked this conversation as resolved.
Outdated
}
}
return 0, api.ErrNotAvailable
Expand Down Expand Up @@ -194,8 +202,12 @@ func (d StatusLatestResponse) GetLimitSoc() (int64, error) {
}

func (d StatusLatestResponse) Odometer() (float64, error) {
if d.ResMsg.VehicleStatusInfo.Odometer != nil {
return d.ResMsg.VehicleStatusInfo.Odometer.Value, nil
if odo := d.ResMsg.VehicleStatusInfo.Odometer; odo != nil {
value := odo.Value
if odo.Unit == unitMiles {
value *= kmPerMile
}
return value, nil
}
return 0, api.ErrNotAvailable
}
Expand Down
90 changes: 90 additions & 0 deletions vehicle/bluelink/types_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
package bluelink

import (
"encoding/json"
"testing"

"github.com/evcc-io/evcc/api"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestVehicleStatusRange(t *testing.T) {
tc := []struct {
name string
json string
want int64
err error
}{
{
// real payload from issue #29728: UK Hyundai with miles unit
name: "miles (unit=3)",
json: `{"evStatus":{"drvDistance":[{"rangeByFuel":{"evModeRange":{"value":168.38834951456312,"unit":3}}}]}}`,
want: 271, // 168.38834951456312 * 1.60934 ≈ 271.04
},
{
name: "kilometers (unit=1)",
json: `{"evStatus":{"drvDistance":[{"rangeByFuel":{"evModeRange":{"value":271,"unit":1}}}]}}`,
want: 271,
},
{
name: "no evStatus",
json: `{}`,
err: api.ErrNotAvailable,
},
}

for _, c := range tc {
t.Run(c.name, func(t *testing.T) {
var s VehicleStatus
require.NoError(t, json.Unmarshal([]byte(c.json), &s))
got, err := s.Range()
if c.err != nil {
assert.ErrorIs(t, err, c.err)
return
}
require.NoError(t, err)
assert.Equal(t, c.want, got)
})
}
}

func TestStatusLatestResponseOdometer(t *testing.T) {
tc := []struct {
name string
json string
want float64
err error
}{
{
// real payload from issue #29728: km unit, returned as-is
name: "kilometers (unit=1)",
json: `{"resMsg":{"vehicleStatusInfo":{"odometer":{"value":88038.5,"unit":1}}}}`,
want: 88038.5,
},
{
name: "miles (unit=3)",
json: `{"resMsg":{"vehicleStatusInfo":{"odometer":{"value":1000,"unit":3}}}}`,
want: 1609.34,
},
{
name: "no odometer",
json: `{}`,
err: api.ErrNotAvailable,
},
}

for _, c := range tc {
t.Run(c.name, func(t *testing.T) {
var r StatusLatestResponse
require.NoError(t, json.Unmarshal([]byte(c.json), &r))
got, err := r.Odometer()
if c.err != nil {
assert.ErrorIs(t, err, c.err)
return
}
require.NoError(t, err)
assert.InDelta(t, c.want, got, 0.001)
})
}
}
Loading