From 4e70bcadac5d403a0b394ba0d7cbb41ef2635179 Mon Sep 17 00:00:00 2001 From: mjuhanne Date: Mon, 19 Aug 2019 22:55:08 +0300 Subject: [PATCH 1/2] Allow the lowest charging current to be 6 Amps (Volt/Ampera uses 6-12 Amps) --- OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m b/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m index 0517883..2207de1 100644 --- a/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m +++ b/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m @@ -43,7 +43,7 @@ - (void)loadView - (void)viewDidLoad { [super viewDidLoad]; - int cl_row = [ovmsAppDelegate myRef].car_chargelimit-10; + int cl_row = [ovmsAppDelegate myRef].car_chargelimit-6; if (cl_row<0) cl_row = 0; [m_charger_current selectRow:cl_row inComponent:0 animated:NO]; @@ -118,7 +118,7 @@ - (IBAction)DoneButton:(id)sender { int ncm = (int)m_charger_mode.selectedSegmentIndex; if (ncm>=2) ncm++; - int ncl = (int)[m_charger_current selectedRowInComponent:0] + 10; + int ncl = (int)[m_charger_current selectedRowInComponent:0] + 6; [self dismissViewControllerAnimated:YES completion:nil]; @@ -148,14 +148,14 @@ - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView - (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component { - return (70-10)+1; + return (70-6)+1; } - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component { - return [NSString stringWithFormat:@"%d Amps",10+(int)row]; + return [NSString stringWithFormat:@"%d Amps",6+(int)row]; } #pragma mark - From 55826e3d0e0ca9e24b049e6c56b739c829ed40e1 Mon Sep 17 00:00:00 2001 From: mjuhanne Date: Tue, 20 Aug 2019 00:22:38 +0300 Subject: [PATCH 2/2] Show cabin temperature and AC status. Add AC control button - Do not require tire temperature in order to show tire pressure - Do not show temperatures as stale if cooling pump is inactive --- .../MainStoryboard_iPhone.storyboard | 102 ++++++++++++++---- OpenVehicleApp/ovms/motortemp_letterbox.png | Bin 10336 -> 15456 bytes OpenVehicleApp/ovms/ovmsAppDelegate.h | 5 + OpenVehicleApp/ovms/ovmsAppDelegate.m | 29 ++++- OpenVehicleApp/ovms/ovmsBodyViewController.h | 7 +- OpenVehicleApp/ovms/ovmsBodyViewController.m | 89 ++++++++++++++- 6 files changed, 207 insertions(+), 25 deletions(-) diff --git a/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard b/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard index 460d5bd..37cbd28 100644 --- a/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard +++ b/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard @@ -1,9 +1,11 @@ - - + + + + - + @@ -855,7 +857,7 @@ + - + + + + + - + @@ -1066,7 +1113,7 @@