Cleanup vehicle state request, and initial setValues()
This commit is contained in:
26
main.go
26
main.go
@ -52,7 +52,7 @@ var (
|
|||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
flag.StringVar(&vehicleSearch, "v", "", "Vehicle Identifier")
|
flag.StringVar(&vehicleSearch, "v", "", "Vehicle Identifier")
|
||||||
flag.IntVar(&refresh, "r", -1, "Auto-refresh (every \"r\" minutes)")
|
flag.IntVar(&refresh, "r", -1, "Auto-refresh (every \"r\" minutes) WARNING: Vehicle can not sleep while refreshing.")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
}
|
}
|
||||||
func main() {
|
func main() {
|
||||||
@ -117,14 +117,15 @@ func main() {
|
|||||||
centralWidget := widgets.NewQWidget(window, 0)
|
centralWidget := widgets.NewQWidget(window, 0)
|
||||||
|
|
||||||
// Set Values for everything
|
// Set Values for everything
|
||||||
setValues()
|
|
||||||
if refresh >= 1{
|
if refresh >= 1{
|
||||||
go func() {
|
go func() {
|
||||||
for {
|
for {
|
||||||
time.Sleep(time.Duration(refresh) * time.Minute)
|
|
||||||
setValues()
|
setValues()
|
||||||
|
time.Sleep(time.Duration(refresh) * time.Minute)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
} else {
|
||||||
|
setValues()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Some adjustments
|
// Some adjustments
|
||||||
@ -236,28 +237,19 @@ func main() {
|
|||||||
|
|
||||||
func setValues() {
|
func setValues() {
|
||||||
vehicle = getVehicle(vehicleSearch)
|
vehicle = getVehicle(vehicleSearch)
|
||||||
var err error
|
|
||||||
if vehicle == nil {
|
if vehicle == nil {
|
||||||
showDialogue(false, "Unable to get vehicle")
|
showDialogue(false, "Unable to get vehicle")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
vehicleState, err = vehicle.VehicleState()
|
test, err := vehicle.Data(vehicle.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
showDialogue(false, "Unable to get Vehicle State")
|
showDialogue(false, "Unable to get Vehicle State")
|
||||||
}
|
}
|
||||||
chargeStats, err = vehicle.ChargeState()
|
vehicleState = test.Response.VehicleState
|
||||||
if err != nil {
|
chargeStats = test.Response.ChargeState
|
||||||
|
climateState = test.Response.ClimateState
|
||||||
|
guiSettings = test.Response.GuiSettings
|
||||||
|
|
||||||
showDialogue(false, "Unable to get Vehicle Charge State")
|
|
||||||
}
|
|
||||||
climateState, err = vehicle.ClimateState()
|
|
||||||
if err != nil {
|
|
||||||
showDialogue(false, "Unable to get Vehicle Climate")
|
|
||||||
}
|
|
||||||
guiSettings, err = vehicle.GuiSettings()
|
|
||||||
if err != nil {
|
|
||||||
showDialogue(false, "Unable to get Gui Settings")
|
|
||||||
}
|
|
||||||
window.SetWindowTitle(fmt.Sprintf("%+v: %+v", vehicle.DisplayName, vehicle.Vin))
|
window.SetWindowTitle(fmt.Sprintf("%+v: %+v", vehicle.DisplayName, vehicle.Vin))
|
||||||
tempSettingVal := climateState.DriverTempSetting
|
tempSettingVal := climateState.DriverTempSetting
|
||||||
insideTempVal := climateState.InsideTemp
|
insideTempVal := climateState.InsideTemp
|
||||||
|
|||||||
Reference in New Issue
Block a user