alex/mysubaru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed windows trim
All checks were successful
Golan Testing / testing (1.24.x, ubuntu-latest) (push) Successful in 24s
Details

Browse Source
This commit is contained in:
Alex Savin
2025-05-29 10:58:00 -04:00
parent 3d808eb3b9
commit ed2495ee5c
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysubaru.go
View File

@ -200,20 +200,20 @@ type VehicleStatus struct {
// "remoteServiceType":"condition" // "remoteServiceType":"condition"
type VehicleCondition struct { type VehicleCondition struct {
VehicleStateType string `json:"vehicleStateType"` // "IGNITION_OFF", VehicleStateType string `json:"vehicleStateType"` // "IGNITION_OFF",
AvgFuelConsumption float64 `json:"avgFuelConsumption"` // null, AvgFuelConsumption float64 `json:"avgFuelConsumption,omitempty"` // null,
AvgFuelConsumptionUnit string `json:"avgFuelConsumptionUnit"` // "MPG", AvgFuelConsumptionUnit string `json:"avgFuelConsumptionUnit"` // "MPG",
DistanceToEmptyFuel int `json:"distanceToEmptyFuel"` // null, DistanceToEmptyFuel int `json:"distanceToEmptyFuel,omitempty"` // null,
DistanceToEmptyFuelUnit string `json:"distanceToEmptyFuelUnit"` // "MILES", DistanceToEmptyFuelUnit string `json:"distanceToEmptyFuelUnit"` // "MILES",
RemainingFuelPercent int `json:"remainingFuelPercent"` // "66", RemainingFuelPercent int `json:"remainingFuelPercent"` // "66",
Odometer int `json:"odometer"` // 92, Odometer int `json:"odometer"` // 92,
OdometerUnit string `json:"odometerUnit"` // "MILES", OdometerUnit string `json:"odometerUnit"` // "MILES",
TirePressureFrontLeft float64 `json:"tirePressureFrontLeft"` // null, TirePressureFrontLeft float64 `json:"tirePressureFrontLeft,omitempty"` // null,
TirePressureFrontLeftUnit string `json:"tirePressureFrontLeftUnit"` // "PSI", TirePressureFrontLeftUnit string `json:"tirePressureFrontLeftUnit"` // "PSI",
TirePressureFrontRight float64 `json:"tirePressureFrontRight"` // null, TirePressureFrontRight float64 `json:"tirePressureFrontRight,omitempty"` // null,
TirePressureFrontRightUnit string `json:"tirePressureFrontRightUnit"` // "PSI", TirePressureFrontRightUnit string `json:"tirePressureFrontRightUnit"` // "PSI",
TirePressureRearLeft float64 `json:"tirePressureRearLeft"` // null, TirePressureRearLeft float64 `json:"tirePressureRearLeft,omitempty"` // null,
TirePressureRearLeftUnit string `json:"tirePressureRearLeftUnit"` // "PSI", TirePressureRearLeftUnit string `json:"tirePressureRearLeftUnit"` // "PSI",
TirePressureRearRight float64 `json:"tirePressureRearRight"` // null, TirePressureRearRight float64 `json:"tirePressureRearRight,omitempty"` // null,
TirePressureRearRightUnit string `json:"tirePressureRearRightUnit"` // "PSI", TirePressureRearRightUnit string `json:"tirePressureRearRightUnit"` // "PSI",
DoorBootPosition string `json:"doorBootPosition"` // "CLOSED", DoorBootPosition string `json:"doorBootPosition"` // "CLOSED",
DoorEngineHoodPosition string `json:"doorEngineHoodPosition"` // "CLOSED", DoorEngineHoodPosition string `json:"doorEngineHoodPosition"` // "CLOSED",
@ -226,13 +226,13 @@ type VehicleCondition struct {
WindowRearLeftStatus string `json:"windowRearLeftStatus"` // "CLOSE", WindowRearLeftStatus string `json:"windowRearLeftStatus"` // "CLOSE",
WindowRearRightStatus string `json:"windowRearRightStatus"` // "CLOSE", WindowRearRightStatus string `json:"windowRearRightStatus"` // "CLOSE",
WindowSunroofStatus string `json:"windowSunroofStatus"` // "CLOSE", WindowSunroofStatus string `json:"windowSunroofStatus"` // "CLOSE",
EvDistanceToEmpty int `json:"evDistanceToEmpty"` // null, EvDistanceToEmpty int `json:"evDistanceToEmpty,omitempty"` // null,
EvDistanceToEmptyUnit string `json:"evDistanceToEmptyUnit"` // null, EvDistanceToEmptyUnit string `json:"evDistanceToEmptyUnit,omitempty"` // null,
EvChargerStateType string `json:"evChargerStateType"` // null, EvChargerStateType string `json:"evChargerStateType,omitempty"` // null,
EvIsPluggedIn bool `json:"evIsPluggedIn"` // null, EvIsPluggedIn bool `json:"evIsPluggedIn,omitempty"` // null,
EvStateOfChargeMode string `json:"evStateOfChargeMode"` // null, EvStateOfChargeMode string `json:"evStateOfChargeMode,omitempty"` // null,
EvTimeToFullyCharged string `json:"evTimeToFullyCharged"` // null, EvTimeToFullyCharged string `json:"evTimeToFullyCharged,omitempty"` // null,
EvStateOfChargePercent int `json:"evStateOfChargePercent"` // null, EvStateOfChargePercent int `json:"evStateOfChargePercent,omitempty"` // null,
LastUpdatedTime string `json:"lastUpdatedTime,string"` // "2023-04-10T17:50:54+0000", LastUpdatedTime string `json:"lastUpdatedTime,string"` // "2023-04-10T17:50:54+0000",
} }

4
vehicle.go
View File

@ -629,7 +629,7 @@ func (v *Vehicle) GetVehicleStatus() {
} }
} }
if strings.HasPrefix(key, "window") && strings.HasSuffix(key, "Status") { if strings.HasPrefix(key, "window") && strings.HasSuffix(key, "Status") {
pos := strings.TrimPrefix(key, "door") pos := strings.TrimPrefix(key, "window")
pos = strings.TrimSuffix(pos, "Status") pos = strings.TrimSuffix(pos, "Status")
submatchall := re.FindAllString(pos, -1) submatchall := re.FindAllString(pos, -1)
v.client.logger.Debug("VEHICLE COND", "key", key, "data", child.Data(), "number", len(submatchall)) v.client.logger.Debug("VEHICLE COND", "key", key, "data", child.Data(), "number", len(submatchall))
@ -801,7 +801,7 @@ func (v *Vehicle) GetVehicleCondition() {
} }
} }
if strings.HasPrefix(key, "window") && strings.HasSuffix(key, "Status") { if strings.HasPrefix(key, "window") && strings.HasSuffix(key, "Status") {
pos := strings.TrimPrefix(key, "door") pos := strings.TrimPrefix(key, "window")
pos = strings.TrimSuffix(pos, "Status") pos = strings.TrimSuffix(pos, "Status")
submatchall := re.FindAllString(pos, -1) submatchall := re.FindAllString(pos, -1)
v.client.logger.Debug("VEHICLE COND", "key", key, "data", child.Data(), "number", len(submatchall)) v.client.logger.Debug("VEHICLE COND", "key", key, "data", child.Data(), "number", len(submatchall))