mirror of
https://github.com/meshtastic/firmware.git
synced 2026-03-29 20:43:23 -04:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
22 lines
478 B
C++
22 lines
478 B
C++
#include "UnitConversions.h"
|
|
|
|
float UnitConversions::CelsiusToFahrenheit(float celsius)
|
|
{
|
|
return (celsius * 9) / 5 + 32;
|
|
}
|
|
|
|
float UnitConversions::MetersPerSecondToKnots(float metersPerSecond)
|
|
{
|
|
return metersPerSecond * 1.94384;
|
|
}
|
|
|
|
float UnitConversions::MetersPerSecondToMilesPerHour(float metersPerSecond)
|
|
{
|
|
return metersPerSecond * 2.23694;
|
|
}
|
|
|
|
float UnitConversions::HectoPascalToInchesOfMercury(float hectoPascal)
|
|
{
|
|
return hectoPascal * 0.029529983071445;
|
|
}
|