Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions OpenVehicleApp/ovms/ovmsBodyViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -399,49 +399,41 @@ -(void) update
m_car_wheel_rl_temp.textColor = [UIColor whiteColor];
}

if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
{
if ([ovmsAppDelegate myRef].car_tpms_fr_pressure_s > 0)
m_car_wheel_fr_pressure.text = [ovmsAppDelegate myRef].car_tpms_fr_pressure_s;
m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
}
else
{
m_car_wheel_fr_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
else
m_car_wheel_fr_temp.text = @"";
}

if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
{
if ([ovmsAppDelegate myRef].car_tpms_rr_pressure_s > 0)
m_car_wheel_rr_pressure.text = [ovmsAppDelegate myRef].car_tpms_rr_pressure_s;
m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
}
else
{
m_car_wheel_rr_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
else
m_car_wheel_rr_temp.text = @"";
}

if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
{
if ([ovmsAppDelegate myRef].car_tpms_fl_pressure_s > 0)
m_car_wheel_fl_pressure.text = [ovmsAppDelegate myRef].car_tpms_fl_pressure_s;
m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
}
else
{
m_car_wheel_fl_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
else
m_car_wheel_fl_temp.text = @"";
}

if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
{

if ([ovmsAppDelegate myRef].car_tpms_rl_pressure_s > 0)
m_car_wheel_rl_pressure.text = [ovmsAppDelegate myRef].car_tpms_rl_pressure_s;
m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
}
else
{
m_car_wheel_rl_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
else
m_car_wheel_rl_temp.text = @"";
}

m_car_aux_battery.text = [NSString stringWithFormat:@"%0.1fV",
[ovmsAppDelegate myRef].car_aux_battery_voltage];
Expand Down
46 changes: 19 additions & 27 deletions OpenVehicleApp/ovms/ovmsStatusViewControllerPad.m
Original file line number Diff line number Diff line change
Expand Up @@ -819,49 +819,41 @@ -(void) updateCar
m_car_wheel_rl_temp.textColor = [UIColor whiteColor];
}

if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
{
if ([ovmsAppDelegate myRef].car_tpms_fr_pressure_s > 0)
m_car_wheel_fr_pressure.text = [ovmsAppDelegate myRef].car_tpms_fr_pressure_s;
m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
}
else
{
m_car_wheel_fr_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
else
m_car_wheel_fr_temp.text = @"";
}

if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
{

if ([ovmsAppDelegate myRef].car_tpms_rr_pressure_s > 0)
m_car_wheel_rr_pressure.text = [ovmsAppDelegate myRef].car_tpms_rr_pressure_s;
m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
}
else
{
m_car_wheel_rr_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
else
m_car_wheel_rr_temp.text = @"";
}

if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
{

if ([ovmsAppDelegate myRef].car_tpms_fl_pressure_s > 0)
m_car_wheel_fl_pressure.text = [ovmsAppDelegate myRef].car_tpms_fl_pressure_s;
m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
}
else
{
m_car_wheel_fl_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
else
m_car_wheel_fl_temp.text = @"";
}

if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
{

if ([ovmsAppDelegate myRef].car_tpms_rl_pressure_s > 0)
m_car_wheel_rl_pressure.text = [ovmsAppDelegate myRef].car_tpms_rl_pressure_s;
m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
}
else
{
m_car_wheel_rl_pressure.text = @"";
if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
else
m_car_wheel_rl_temp.text = @"";
}

m_car_aux_battery.text = [NSString stringWithFormat:@"%0.1fV",
[ovmsAppDelegate myRef].car_aux_battery_voltage];
Expand Down