Merge branch 'master' of https://github.com/panStamp/devices

devices.xml

@@ -25,8 +25,8 @@ sensitive and must match.
     <dev id="12" name="binouts2" label="Advanced Binary/PWM output module + repeater"/>
     <dev id="13" name="respira" label="Respira sensor for CO and NO2"/>
     <dev id="14" name="soilmoisture" label="Soil moisture sensor"/>
-    <dev id="15" name="easyvr" label="EasyVR voice recognition module"/>
-    <dev id="16" name="firmloader" label="Firmware server"/>
+    <dev id="15" name="co2meter" label="CO2 and temperature-humidity sensor"/>
+    <dev id="16" name="firmserver" label="Firmware server"/>
     <dev id="17" name="idtag" label="Identification tag transmitter"/>
     <dev id="18" name="currentmeter" label="3-Channel current meter"/>
     <dev id="4278190080" name="unprogrammed" label="Unprogrammed device"/>

panStamp/co2meter.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<device>
+  <developer>panStamp</developer>
+  <product>Co2 meter</product>
+  <pwrdownmode>true</pwrdownmode>
+  <regular>
+    <reg name="Voltage supply" id="11">
+      <endpoint name="Voltage" type="num" dir="inp">
+        <size>2</size>
+        <units>
+          <unit name="V" factor="0.001" offset="0"/>
+        </units>
+      </endpoint>
+    </reg>
+    <reg name="Co2" id="12">
+      <endpoint name="Co2 meter" type="num" dir="inp">
+        <position>0</position>
+        <size>2</size>
+	<units>
+          <unit name="ppm" factor="1" offset="0"/>
+        </units>
+      </endpoint>
+    </reg>
+    <reg name="Humidity and Temperature" id="13">
+      <endpoint name="Temperature" type="num" dir="inp">
+        <position>0</position>
+        <size>2</size>
+        <units>
+          <unit name="C" factor="0.1" offset="-50"/>
+          <unit name="F" factor="0.18" offset="-58"/>
+          <unit name="K" factor="0.1" offset="223.15"/>
+        </units>
+      </endpoint>
+      <endpoint name="Humidity" type="num" dir="inp">
+        <position>2</position>
+        <size>2</size>
+        <units>
+          <unit name="%" factor="0.1" offset="0"/>
+        </units>
+      </endpoint>
+    </reg>
+  </regular>
+</device>