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

Polestar: fix api car telemetry (#18594)

Browse source
This commit is contained in:
Sebastian Löb 2025-02-04 08:58:49 +01:00 • committed by GitHub
parent 6fdda39e68
commit a726bbba04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 57 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

20
vehicle/polestar/api.go
View file

@ -49,26 +49,14 @@ func (v *API) Vehicles(ctx context.Context) ([]ConsumerCar, error) {
return res.GetConsumerCarsV2, err
}
func (v *API) Status(ctx context.Context, vin string) (BatteryData, error) {
func (v *API) CarTelemetry(ctx context.Context, vin string) (CarTelemetryData, error) {
var res struct {
BatteryData `graphql:"getBatteryData(vin: $vin)"`
CarTelemetryData `graphql:"carTelematics(vin: $vin)"`
}
err := v.client.Query(ctx, &res, map[string]any{
"vin": vin,
}, graphql.OperationName("GetBatteryData"))
}, graphql.OperationName("CarTelematics"))
return res.BatteryData, err
}
func (v *API) Odometer(ctx context.Context, vin string) (OdometerData, error) {
var res struct {
OdometerData `graphql:"getOdometerData(vin: $vin)"`
}
err := v.client.Query(ctx, &res, map[string]any{
"vin": vin,
}, graphql.OperationName("GetOdometerData"))
return res.OdometerData, err
return res.CarTelemetryData, err
}

44
vehicle/polestar/provider.go
View file

@ -9,44 +9,38 @@ import (
)
type Provider struct {
statusG func() (BatteryData, error)
odoG func() (OdometerData, error)
telemetryG func() (CarTelemetryData, error)
}
func NewProvider(log *util.Logger, api *API, vin string, timeout, cache time.Duration) *Provider {
v := &Provider{
statusG: util.Cached(func() (BatteryData, error) {
telemetryG: util.Cached(func() (CarTelemetryData, error) {
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
return api.Status(ctx, vin)
}, cache),
odoG: util.Cached(func() (OdometerData, error) {
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
return api.Odometer(ctx, vin)
return api.CarTelemetry(ctx, vin)
}, cache),
}
return v
}
// Soc implements the api.Vehicle interface
// SOC via car telemetry
func (v *Provider) Soc() (float64, error) {
res, err := v.statusG()
return res.BatteryChargeLevelPercentage, err
res, err := v.telemetryG()
return res.Battery.BatteryChargeLevelPercentage, err
}
var _ api.ChargeState = (*Provider)(nil)
// Range implements the api.VehicleRange interface
// Range via car telemetry
func (v *Provider) Status() (api.ChargeStatus, error) {
status, err := v.statusG()
status, err := v.telemetryG()
res := api.StatusA
if status.ChargerConnectionStatus == "CHARGER_CONNECTION_STATUS_CONNECTED" {
if status.Battery.ChargerConnectionStatus == "CHARGER_CONNECTION_STATUS_CONNECTED" {
res = api.StatusB
}
if status.ChargingStatus == "CHARGING_STATUS_CHARGING" {
if status.Battery.ChargingStatus == "CHARGING_STATUS_CHARGING" {
res = api.StatusB
}
@ -55,27 +49,27 @@ func (v *Provider) Status() (api.ChargeStatus, error) {
var _ api.VehicleRange = (*Provider)(nil)
// Range implements the api.VehicleRange interface
// Range via car telemetry
func (v *Provider) Range() (int64, error) {
res, err := v.statusG()
return int64(res.EstimatedDistanceToEmptyKm), err
res, err := v.telemetryG()
return int64(res.Battery.EstimatedDistanceToEmptyKm), err
}
var _ api.VehicleOdometer = (*Provider)(nil)
// Odometer implements the api.VehicleOdometer interface
// Odometer via car telemetry
func (v *Provider) Odometer() (float64, error) {
res, err := v.odoG()
return res.OdometerMeters / 1e3, err
res, err := v.telemetryG()
return res.Odometer.OdometerMeters / 1e3, err
}
var _ api.VehicleFinishTimer = (*Provider)(nil)
// FinishTime implements the api.VehicleFinishTimer interface
// FinishTime via car telemetry
func (v *Provider) FinishTime() (time.Time, error) {
res, err := v.statusG()
res, err := v.telemetryG()
if err != nil {
return time.Time{}, err
}
return time.Now().Add(time.Duration(res.EstimatedChargingTimeToFullMinutes) * time.Minute), nil
return time.Now().Add(time.Duration(res.Battery.EstimatedChargingTimeToFullMinutes) * time.Minute), nil
}

59
vehicle/polestar/query.gql
View file

@ -27,38 +27,37 @@ query getCars {
}
}
query GetBatteryData($vin: String!) {
getBatteryData(vin: $vin) {
averageEnergyConsumptionKwhPer100Km
batteryChargeLevelPercentage
chargerConnectionStatus
chargingCurrentAmps
chargingPowerWatts
chargingStatus
estimatedChargingTimeMinutesToTargetDistance
estimatedChargingTimeToFullMinutes
estimatedDistanceToEmptyKm
estimatedDistanceToEmptyMiles
eventUpdatedTimestamp {
iso
unix
query CarTelematics($vin: String!) {
carTelematics(vin: $vin) {
battery {
averageEnergyConsumptionKwhPer100Km
batteryChargeLevelPercentage
chargerConnectionStatus
chargingCurrentAmps
chargingPowerWatts
chargingStatus
estimatedChargingTimeMinutesToTargetDistance
estimatedChargingTimeToFullMinutes
estimatedDistanceToEmptyKm
estimatedDistanceToEmptyMiles
eventUpdatedTimestamp {
iso
unix
__typename
}
__typename
}
__typename
}
}
query GetOdometerData($vin: String!) {
getOdometerData(vin: $vin) {
averageSpeedKmPerHour
eventUpdatedTimestamp {
iso
unix
odometer {
averageSpeedKmPerHour
eventUpdatedTimestamp {
iso
unix
__typename
}
odometerMeters
tripMeterAutomaticKm
tripMeterManualKm
__typename
}
odometerMeters
tripMeterAutomaticKm
tripMeterManualKm
__typename
}
}
}

5
vehicle/polestar/types.go
View file

@ -21,6 +21,11 @@ type OdometerData struct {
EventUpdatedTimestamp EventUpdatedTimestamp
}
type CarTelemetryData struct {
Battery BatteryData
Odometer OdometerData
}
type EventUpdatedTimestamp struct {
ISO time.Time
// Unix int64 `json:",string"`