aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-21 08:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix calculating mph on CSC profile

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-03-22 13:10:22 +01:00
parent aa36bf8dcb
commit 78845ab424
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt
View File

@@ -34,15 +34,15 @@ internal fun CSCData.displayDistance(speedUnit: SpeedUnit): String {
return when (speedUnit) {
SpeedUnit.M_S -> String.format("%.0f m", distance)
SpeedUnit.KM_H -> String.format("%.0f m", distance)
SpeedUnit.MPH -> String.format("%.0f yd", distance)
SpeedUnit.MPH -> String.format("%.0f yd", distance.toYards())
}
}
internal fun CSCData.displayTotalDistance(speedUnit: SpeedUnit): String {
return when (speedUnit) {
SpeedUnit.M_S -> String.format("%.2f km", totalDistance)
SpeedUnit.KM_H -> String.format("%.2f km", totalDistance)
SpeedUnit.MPH -> String.format("%.2f mile", totalDistance)
SpeedUnit.M_S -> String.format("%.2f m", totalDistance)
SpeedUnit.KM_H -> String.format("%.2f km", totalDistance.toKilometers())
SpeedUnit.MPH -> String.format("%.2f mile", totalDistance.toMiles())
}
}
@@ -77,3 +77,15 @@ private fun displayTemperature(unit: SpeedUnit): String {
}
}
private fun Float.toYards(): Float {
return this*1.0936f
}
private fun Float.toKilometers(): Float {
return this/1000f
}
private fun Float.toMiles(): Float {
return this*0.0006f
}