Addressed (most of) Issue #531

socs/agents/vantagepro2/drivers.py

@@ -52,6 +52,12 @@ def calc_crc(data):
     return crc
 
 
+def F_to_C(temp):
+    """Function to convert fahrenheit measurement to celsius"""
+
+    return (temp - 32) * (5 / 9)
+
+
 class VantagePro2:
     """Allows communication to Vantage Pro 2 Weather Monitor Module.
     Contains commands to be issued and member variables that store
@@ -166,9 +172,9 @@ def receive_data(self):
                 of data needed to determine the barometer trend.
 
         * Barometer: Current barometer reading (Hg/1000)
-        * Inside Temperature: Temperatue in Fahrenheit (10th of a degree)
+        * Inside Temperature: Temperatue in Celsius (10th of a degree)
         * Inside Humidity: Relative humidity in percent
-        * Outside Temperature: Temperature in Fahrenheit (10th of a degree)
+        * Outside Temperature: Temperature in Celsius (10th of a degree)
         * Wind Speed: Wind speed in miles per hour
         * 10 min average wind speed: 10 minute average wind speed in mph
         * Wind Direction: From 1-360 degrees. Possible values::
@@ -241,27 +247,27 @@ def receive_data(self):
         loop_data['packet_type'] = byte_data[4]
         loop_data['next_record'] = byte_data[5]
         loop_data['barometer'] = byte_data[6] / 1000.0
-        loop_data['temp_inside'] = byte_data[7] / 10.0
+        loop_data['temp_inside'] = F_to_C(byte_data[7] / 10.0)
         loop_data['humidity_inside'] = byte_data[8]
-        loop_data['temp_outside'] = byte_data[9] / 10.0
+        loop_data['temp_outside'] = F_to_C(byte_data[9] / 10.0)
         loop_data['wind_speed'] = byte_data[10]
         loop_data['avg_wind_speed'] = byte_data[11]
         loop_data['wind_dir'] = byte_data[12]
-        loop_data['extra_temp0'] = byte_data[13] - 90.0
-        loop_data['extra_temp1'] = byte_data[14] - 90.0
-        loop_data['extra_temp2'] = byte_data[15] - 90.0
-        loop_data['extra_temp3'] = byte_data[16] - 90.0
-        loop_data['extra_temp4'] = byte_data[17] - 90.0
-        loop_data['extra_temp5'] = byte_data[18] - 90.0
-        loop_data['extra_temp6'] = byte_data[19] - 90.0
-        loop_data['soil_temp0'] = byte_data[20] - 90.0
-        loop_data['soil_temp1'] = byte_data[21] - 90.0
-        loop_data['soil_temp2'] = byte_data[22] - 90.0
-        loop_data['soil_temp3'] = byte_data[23] - 90.0
-        loop_data['leaf_temp0'] = byte_data[24] - 90.0
-        loop_data['leaf_temp1'] = byte_data[25] - 90.0
-        loop_data['leaf_temp2'] = byte_data[26] - 90.0
-        loop_data['leaf_temp3'] = byte_data[27] - 90.0
+        loop_data['extra_temp0'] = F_to_C(byte_data[13] - 90.0)
+        loop_data['extra_temp1'] = F_to_C(byte_data[14] - 90.0)
+        loop_data['extra_temp2'] = F_to_C(byte_data[15] - 90.0)
+        loop_data['extra_temp3'] = F_to_C(byte_data[16] - 90.0)
+        loop_data['extra_temp4'] = F_to_C(byte_data[17] - 90.0)
+        loop_data['extra_temp5'] = F_to_C(byte_data[18] - 90.0)
+        loop_data['extra_temp6'] = F_to_C(byte_data[19] - 90.0)
+        loop_data['soil_temp0'] = F_to_C(byte_data[20] - 90.0)
+        loop_data['soil_temp1'] = F_to_C(byte_data[21] - 90.0)
+        loop_data['soil_temp2'] = F_to_C(byte_data[22] - 90.0)
+        loop_data['soil_temp3'] = F_to_C(byte_data[23] - 90.0)
+        loop_data['leaf_temp0'] = F_to_C(byte_data[24] - 90.0)
+        loop_data['leaf_temp1'] = F_to_C(byte_data[25] - 90.0)
+        loop_data['leaf_temp2'] = F_to_C(byte_data[26] - 90.0)
+        loop_data['leaf_temp3'] = F_to_C(byte_data[27] - 90.0)
         loop_data['humidity_outside'] = byte_data[28]
         loop_data['extra_hum0'] = byte_data[29]
         loop_data['extra_hum1'] = byte_data[30]
@@ -312,6 +318,13 @@ def receive_data(self):
         loop_data['time_sunrise'] = byte_data[75]
         loop_data['time_sunset'] = byte_data[76]
 
+        # Correct UV Index by a factor of 10 and fix overflow
+        uvi = loop_data['UV']
+        if uvi < 0:
+            uvi += 2**8
+        uvi /= 10
+        loop_data['UV'] = uvi
+
         # CRC check, data must be sent byte by byte
         pure_data = struct.unpack('=99b', info)
         self.crc_check(pure_data)