fix temperature conversion

WildernessLabs · Mar 7, 2024 · 3825edc · 3825edc
1 parent 5790d89
commit 3825edc
Showing 1 changed file with 35 additions and 27 deletions.
diff --git a/Source/Meadow.Units/Conversions/TempConversions.cs b/Source/Meadow.Units/Conversions/TempConversions.cs
@@ -3,36 +3,44 @@ namespace Meadow.Units.Conversions
 {
     internal static class TempConversions
     {
-        // To Base (`C°`)
-        public static Func<double, double> FToC = (value) => (value - 32D) * (5D / 9D);
-        public static Func<double, double> KToC = (value) => value - 273.15D;
+        public static Func<double, double> FToC = (value) => (value - 32d) * (5d / 9d);
+        public static Func<double, double> KToC = (value) => value - 273.15d;
+        public static Func<double, double> CToF = (value) => value * (9d / 5d) + 32d;
+        public static Func<double, double> CToK = (value) => value + 273.15d;
+        public static Func<double, double> FToK = (value) => FToC(value) + 273.15d;
+        public static Func<double, double> KToF = (value) => CToF(value - 273.15);
 
-        // From Base
-        public static Func<double, double> CToF = (value) => value * (9D / 5D) + 32D;
-        public static Func<double, double> CToK = (value) => value + 273.15D;
 
+        public static double Convert(double value, Temperature.UnitType from, Temperature.UnitType to)
+        {
+            if (from == to) { return value; }
 
-		public static double Convert(double value, Temperature.UnitType from, Temperature.UnitType to)
-		{
-			if (from == to) { return value; }
-
-			if (from == Temperature.UnitType.Celsius && to == Temperature.UnitType.Fahrenheit) {
-				return CToK(value);
-			}
-			if (from == Temperature.UnitType.Fahrenheit && to == Temperature.UnitType.Celsius) {
-
+            switch (from)
+            {
+                case Temperature.UnitType.Celsius:
+                    return to switch
+                    {
+                        Temperature.UnitType.Kelvin => CToK(value),
+                        Temperature.UnitType.Fahrenheit => CToF(value),
+                        _ => value
+                    };
+                case Temperature.UnitType.Fahrenheit:
+                    return to switch
+                    {
+                        Temperature.UnitType.Kelvin => FToK(value),
+                        Temperature.UnitType.Celsius => FToC(value),
+                        _ => value
+                    };
+                case Temperature.UnitType.Kelvin:
+                    return to switch
+                    {
+                        Temperature.UnitType.Fahrenheit => KToF(value),
+                        Temperature.UnitType.Celsius => KToC(value),
+                        _ => value
+                    };
             }
 
-			return value * temperatureConversions[(int)to] / temperatureConversions[(int)from];
-		}
-
-		//must align to enum
-		private static readonly double[] temperatureConversions =
-		{
-			1,//Celsius,
-			-32*(5D/9D),//Fahrenheit, // NO WAY TO GET THIS TO WORK?
-			//(9D / 5D) + 32D,
-			273.15D//Kelvin,
-		};
-	}
+            throw new NotSupportedException();
+        }
+    }
 }