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

More changes
All checks were successful
Golan Testing / testing (1.24.x, ubuntu-latest) (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Alex Savin
2025-06-01 12:23:59 -04:00
parent 472bcd0723
commit 8cb2ae8835
2 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
vehicle.go
View File

@ -497,7 +497,7 @@ func (v *Vehicle) GetClimateQuickPresets() {
v.selectVehicle()
reqURL := MOBILE_API_VERSION + apiURLs["API_G2_FETCH_RES_QUICK_START_SETTINGS"]
resp := v.client.execute(reqURL, GET, map[string]string{}, "", false)
v.client.logger.Debug("http request output", "request", "GetClimateQuickPresets", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetClimateQuickPresets", "body", resp)
var r Response
err := json.Unmarshal(resp, &r)
@ -577,7 +577,7 @@ func (v *Vehicle) GetVehicleStatus() {
v.selectVehicle()
reqURL := MOBILE_API_VERSION + urlToGen(apiURLs["API_VEHICLE_STATUS"], v.getAPIGen())
resp := v.client.execute(reqURL, GET, map[string]string{}, "", false)
v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
var r Response
err := json.Unmarshal(resp, &r)
@ -586,31 +586,31 @@ func (v *Vehicle) GetVehicleStatus() {
}
if r.Success {
var vSta VehicleStatus
err = json.Unmarshal(r.Data, &vSta)
var vs VehicleStatus
err = json.Unmarshal(r.Data, &vs)
if err != nil {
v.client.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error())
}
v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", vs)
v.EngineState = vSta.VehicleStateType
v.Odometer.Miles = vSta.OdometerValue
v.Odometer.Kilometers = vSta.OdometerValueKm
v.DistanceToEmpty.Miles = int(vSta.DistanceToEmptyFuelMiles)
v.DistanceToEmpty.Kilometers = vSta.DistanceToEmptyFuelKilometers
v.DistanceToEmpty.Miles10s = vSta.DistanceToEmptyFuelMiles10s
v.DistanceToEmpty.Kilometers10s = vSta.DistanceToEmptyFuelKilometers10s
v.DistanceToEmpty.Percentage = vSta.RemainingFuelPercent
v.FuelConsumptionAvg.MPG = float64(vSta.AvgFuelConsumptionMpg)
v.FuelConsumptionAvg.LP100Km = float64(vSta.AvgFuelConsumptionLitersPer100Kilometers)
v.EngineState = vs.VehicleStateType
v.Odometer.Miles = vs.OdometerValue
v.Odometer.Kilometers = vs.OdometerValueKm
v.DistanceToEmpty.Miles = int(vs.DistanceToEmptyFuelMiles)
v.DistanceToEmpty.Kilometers = vs.DistanceToEmptyFuelKilometers
v.DistanceToEmpty.Miles10s = vs.DistanceToEmptyFuelMiles10s
v.DistanceToEmpty.Kilometers10s = vs.DistanceToEmptyFuelKilometers10s
v.DistanceToEmpty.Percentage = vs.RemainingFuelPercent
v.FuelConsumptionAvg.MPG = float64(vs.AvgFuelConsumptionMpg)
v.FuelConsumptionAvg.LP100Km = float64(vs.AvgFuelConsumptionLitersPer100Kilometers)
v.GeoLocation.Latitude = float64(vSta.Latitude)
v.GeoLocation.Longitude = float64(vSta.Longitude)
v.GeoLocation.Heading = vSta.Heading
v.GeoLocation.Latitude = float64(vs.Latitude)
v.GeoLocation.Longitude = float64(vs.Longitude)
v.GeoLocation.Heading = vs.Heading
// re := regexp.MustCompile(`[A-Z][^A-Z]*`)
val := reflect.ValueOf(vSta)
val := reflect.ValueOf(vs)
typeOfS := val.Type()
for i := 0; i < val.NumField(); i++ {
@ -786,7 +786,7 @@ func (v *Vehicle) GetVehicleCondition() {
v.selectVehicle()
reqURL := MOBILE_API_VERSION + urlToGen(apiURLs["API_CONDITION"], v.getAPIGen())
resp := v.client.execute(reqURL, GET, map[string]string{}, "", false)
v.client.logger.Debug("http request output", "request", "GetVehicleCondition", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetVehicleCondition", "body", resp)
var r Response
err := json.Unmarshal(resp, &r)
@ -800,14 +800,14 @@ func (v *Vehicle) GetVehicleCondition() {
if err != nil {
v.client.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error())
}
v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
var vc VehicleCondition
err = json.Unmarshal(sr.Result, &vc)
if err != nil {
v.client.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error())
}
v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp)
val := reflect.ValueOf(vc)
typeOfS := val.Type()
@ -950,7 +950,7 @@ func (v *Vehicle) GetVehicleHealth() {
"_": timestamp()}
reqURL := MOBILE_API_VERSION + apiURLs["API_VEHICLE_HEALTH"]
resp := v.client.execute(reqURL, GET, params, "", false)
v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "body", resp)
// v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "body", resp)
var r Response
err := json.Unmarshal(resp, &r)
@ -964,7 +964,7 @@ func (v *Vehicle) GetVehicleHealth() {
if err != nil {
v.client.logger.Error("error while parsing json", "request", "GetVehicleHealth", "error", err.Error())
}
v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "body", resp)
v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "vehicle health", vh)
// TODO: Loop over all the Vehicle Health Items