Add Translate Fahrenheit

Signed-off-by: Mickael Gaillard <mick.gaillard@gmail.com>
This commit is contained in:
Mickael Gaillard 2020-05-08 00:53:13 +02:00
parent 2ddfb2da07
commit b6165d5a18
24 changed files with 25 additions and 1 deletions

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "hod" #define D_UNIT_HOUR "hod"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "o" #define D_UNIT_HOUR "o"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "시" #define D_UNIT_HOUR "시"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "Godz" #define D_UNIT_HOUR "Godz"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "H" #define D_UNIT_HOUR "H"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "Ч" #define D_UNIT_HOUR "Ч"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "hod" #define D_UNIT_HOUR "hod"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "Tim" #define D_UNIT_HOUR "Tim"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cм" #define D_UNIT_CENTIMETER "cм"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Гц" #define D_UNIT_HERTZ "Гц"
#define D_UNIT_HOUR "г" #define D_UNIT_HOUR "г"
#define D_UNIT_GALLONS "гал" #define D_UNIT_GALLONS "гал"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "厘米" #define D_UNIT_CENTIMETER "厘米"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "赫兹" #define D_UNIT_HERTZ "赫兹"
#define D_UNIT_HOUR "时" #define D_UNIT_HOUR "时"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -693,6 +693,7 @@
#define D_UNIT_CELSIUS "C" #define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°" #define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "時" #define D_UNIT_HOUR "時"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"

View File

@ -620,7 +620,8 @@ float ConvertTempToCelsius(float c)
char TempUnit(void) char TempUnit(void)
{ {
return (Settings.flag.temperature_conversion) ? 'F' : 'C'; // SetOption8 - Switch between Celsius or Fahrenheit // SetOption8 - Switch between Celsius or Fahrenheit
return (Settings.flag.temperature_conversion) ? D_UNIT_FAHRENHEIT : D_UNIT_CELSIUS;
} }
float ConvertHumidity(float h) float ConvertHumidity(float h)