@@ -1405,6 +1405,7 @@ const char* OvmsMetricUnitLabel(metric_unit_t units)
1405
1405
case Kilometers: return " km" ;
1406
1406
case Miles: return " M" ;
1407
1407
case Meters: return " m" ;
1408
+ case Feet: return " ft" ;
1408
1409
case Celcius: return " °C" ;
1409
1410
case Fahrenheit: return " °F" ;
1410
1411
case kPa : return " kPa" ;
@@ -1449,13 +1450,23 @@ int UnitConvert(metric_unit_t from, metric_unit_t to, int value)
1449
1450
if (to == Kilometers) return (value*8 )/5 ;
1450
1451
else if (to == Meters) return (value*8000 )/5 ;
1451
1452
break ;
1453
+ case Meters:
1454
+ if (to == Feet) return (int )(value * 3.28084 );
1455
+ break ;
1456
+ case Feet:
1457
+ if (to == Meters) return (int )(value * 0.3048 );
1458
+ break ;
1452
1459
case KphPS:
1453
1460
if (to == MphPS) return (value*5 )/8 ;
1454
- else if (to == MetersPSS) return value/ 1000 ;
1461
+ else if (to == MetersPSS) return ( value* 1000 )/ 3600 ;
1455
1462
break ;
1456
1463
case MphPS:
1457
1464
if (to == KphPS) return (value*8 )/5 ;
1458
- else if (to == MetersPSS) return (value*8000 )/5 ;
1465
+ else if (to == MetersPSS) return (value*8000 )/(5 *3600 );
1466
+ break ;
1467
+ case MetersPSS:
1468
+ if (to == KphPS) return (int ) (value*3.6 );
1469
+ else if (to == MphPS) return (int ) (value*3.6 /1.60934 );
1459
1470
break ;
1460
1471
case kW :
1461
1472
if (to == Watts) return (value*1000 );
@@ -1548,13 +1559,23 @@ float UnitConvert(metric_unit_t from, metric_unit_t to, float value)
1548
1559
if (to == Kilometers) return (value*1.60934 );
1549
1560
else if (to == Meters) return (value*1609.34 );
1550
1561
break ;
1562
+ case Meters:
1563
+ if (to == Feet) return (value * 3.28084 );
1564
+ break ;
1565
+ case Feet:
1566
+ if (to == Meters) return (value * 0.3048 );
1567
+ break ;
1551
1568
case KphPS:
1552
1569
if (to == MphPS) return (value/1.60934 );
1553
- else if (to == MetersPSS) return value/1000 ;
1570
+ else if (to == MetersPSS) return value/3.6 ;
1554
1571
break ;
1555
1572
case MphPS:
1556
1573
if (to == KphPS) return (value*8 )/5 ;
1557
- else if (to == MetersPSS) return (value*1.60934 );
1574
+ else if (to == MetersPSS) return (value*1.60934 /3.6 );
1575
+ break ;
1576
+ case MetersPSS:
1577
+ if (to == KphPS) return (value*3.6 );
1578
+ else if (to == MphPS) return (value*3.6 /1.60934 );
1558
1579
break ;
1559
1580
case kW :
1560
1581
if (to == Watts) return (value*1000 );
0 commit comments