#18 Clean up sensor capabilty support and add humidity if available.

Einstein42 · Dec 28, 2018 · ab94e27 · ab94e27
1 parent 93af903
commit ab94e27
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/node_types.py b/node_types.py
@@ -593,16 +593,25 @@ def start(self):
     def update(self, sensor):
       LOGGER.debug("{}:update:".format(self.address))
       LOGGER.debug("{}:update: sensor={}".format(self.address,sensor))
-      try:
-        tempCurrent = int(sensor['capability'][0]['value']) / 10 if int(sensor['capability'][0]['value']) != 0 else 0
-      except ValueError as e:
-        tempCurrent = 0
-      if self.useCelsius:
-        tempCurrent = toC(tempCurrent)
-      updates = {
-        'ST': tempCurrent,
-        'GV1': 1 if sensor['capability'][1]['value'] == "true" else 0
+      self.updates = {
+          'GV1': 2 # Default is N/A
+      }
+      # Cross reference from sensor capabilty to driver
+      xref = {
+          'temperature': 'ST',
+          'humidity': 'CLIHUM',
+          'occupancy': 'GV1',
       }
+      for item in sensor['capability']:
+          if item['type'] in xref:
+              val = item['value']
+              if val == "true":
+                val = 1
+              elif val == "false":
+                val = 0
+              self.updates[xref[item['type']]] = val
+          else:
+            LOGGER.error("{}:update: Unknown capabilty: {}".format(self.address,item))
       for key, value in updates.items():
         self.setDriver(key, value)
 

diff --git a/profile/editor/editors.xml b/profile/editor/editors.xml
@@ -78,7 +78,7 @@
     <range uom="67" subset="0-3" />
   </editor>
   <editor id="I_TSTAT_OCC">
-    <range uom="25" subset="0,1" nls="EN_BOOL" />
+    <range uom="25" subset="0-2" nls="EN_OCC" />
   </editor>
   <editor id="I_TSTAT_PROG_MODE">
     <range uom="25" subset="0,1" nls="EN_PM" />

diff --git a/profile/nls/en_us.txt b/profile/nls/en_us.txt
@@ -132,6 +132,10 @@ EN_PM2-2 = Hold Indefinite
 EN_BOOL-0 = No
 EN_BOOL-1 = Yes
 
+EN_OCC-0 = No
+EN_OCC-1 = Yes
+EN_OCC-2 = NA
+
 EN_ENABLED-0 = Disabled
 EN_ENABLED-1 = Enabled
 

diff --git a/profile/nodedef/nodedefs.xml b/profile/nodedef/nodedefs.xml
@@ -123,12 +123,14 @@
   <nodeDef id="EcobeeSensorC" nodeType="140" nls="140ES" >
     <sts>
       <st id="ST" editor="I_TEMP_C" />
+      <st id="CLIHUM" editor="I_HUMIDITY" />
       <st id="GV1" editor="I_TSTAT_OCC" />
     </sts>
   </nodeDef>
   <nodeDef id="EcobeeSensorF" nodeType="140" nls="140ES" >
     <sts>
       <st id="ST" editor="I_TEMP_F" />
+      <st id="CLIHUM" editor="I_HUMIDITY" />
       <st id="GV1" editor="I_TSTAT_OCC" />
     </sts>
   </nodeDef>

diff --git a/profile/version.txt b/profile/version.txt
@@ -1 +1 @@
-2.0.7
+2.0.14