From b7a035d7979b46b606199b895dc92240453030ab Mon Sep 17 00:00:00 2001
From: Matthew Wall <mwall@picorino.local>
Date: Thu, 4 Aug 2016 22:52:34 -0400
Subject: [PATCH] attempt to fix rain calibration

---
 bin/user/netatmo.py | 11 ++++-------
 changelog           |  3 +++
 install.py          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/user/netatmo.py b/bin/user/netatmo.py
index abf55ba..e5a9625 100644
--- a/bin/user/netatmo.py
+++ b/bin/user/netatmo.py
@@ -42,10 +42,9 @@ import weewx.units
 import weewx.wxformulas
 
 DRIVER_NAME = 'netatmo'
-DRIVER_VERSION = "X"
+DRIVER_VERSION = "0.3"
 
 INHG_PER_MBAR = 0.0295299830714
-CM_PER_IN = 2.54
 MPH_TO_KPH = 1.60934
 MPS_TO_KPH = 3.6
 BEAFORT_TO_KPH = {0: 1, 1: 3.0, 2: 9.0, 3: 15.0, 4: 24.0, 5: 34.0, 6: 43.0,
@@ -234,7 +233,7 @@ class CloudClient(Collector):
 
     noise is measured in dB
     co2 is measured in ppm
-    rain is measured in mm (or inch?)  not specified in docs!
+    rain is measured in mm
     temperatures are measured in C or F
 
     the user object indicates the units of the download
@@ -395,10 +394,8 @@ class CloudClient(Collector):
 
     @staticmethod
     def _cvt_rain(x, from_unit_dict):
-        # FIXME: verify that 0 is cm and 1 is inch
-        if from_unit_dict['unit'] == 1:
-            x *= CM_PER_IN
-        return x
+        # rain units are always mm, so convert to cm
+        return x * 0.1
 
     def startup(self):
         """Start a thread that collects data from the netatmo servers."""
diff --git a/changelog b/changelog
index 10c700d..93ee78a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+0.3 04aug2016
+* fix for rain calculation
+
 0.2 25apr2016
 * release of combined driver
 
diff --git a/install.py b/install.py
index a2fbb3c..8b51f19 100644
--- a/install.py
+++ b/install.py
@@ -10,7 +10,7 @@ def loader():
 class NetatmoInstaller(ExtensionInstaller):
     def __init__(self):
         super(NetatmoInstaller, self).__init__(
-            version="0.2",
+            version="0.3",
             name='netatmo',
             description='Driver for netatmo weather stations.',
             author="Matthew Wall",