Changeset 70

Timestamp:

2017-02-07 18:17:18 (8 years ago)

Author:

tudor.leferman

Message:

VUI-13659
VUI-13657

File:

• trunk/L_VeraConnectWWN1.lua (modified) (3 diffs)

trunk/L_VeraConnectWWN1.lua ¶

@@ -22 +22 @@
 local JSON_FILES = {
     WWN_THERMOSTAT = "D_VeraConnectWWNThermostat1.json",
-    WWN_THERMOSTAT_NO_COOL = "D_VeraConnectWWNThermostat1_NoCool.json"
+    WWN_THERMOSTAT_NO_COOL = "D_VeraConnectWWNThermostat1_NoCool.json",
+    WWN_CO_SENSOR = "D_COSensor1.json"
 }
 local DEVICE_TYPES = {
@@ -486 +487 @@
         log("appendDevices", "Append smoke sensor: ".. v.name)
         luup.chdev.append(lug_device, g_appendPtr, "nest_smoke_".. v.device_id, "WWN Smoke - " .. v.name, DEVICE_TYPES.SMOKE_SENSOR, DEVICE_FILES.SMOKE_SENSOR, nil, ",category_num=4\n,subcategory_num=4", false)
-        luup.chdev.append(lug_device, g_appendPtr, "nest_co_".. v.device_id, "WWN CO - " .. v.name, DEVICE_TYPES.SMOKE_SENSOR, DEVICE_FILES.SMOKE_SENSOR, nil, ",category_num=4\n,subcategory_num=5", false)
+        local jsonFile = ",device_json=".. JSON_FILES.WWN_CO_SENSOR
+        luup.chdev.append(lug_device, g_appendPtr, "nest_co_".. v.device_id, "WWN CO - " .. v.name, DEVICE_TYPES.SMOKE_SENSOR, DEVICE_FILES.SMOKE_SENSOR, nil, ",category_num=4\n,subcategory_num=5\n"..jsonFile, false)
         count = count + 1
         if count > 20 then
@@ -550 +552 @@
             end
 
-            local nestCurrentTemperature = tostring(value["ambient_temperature_".. temperatureScale]):match("[%d.]+")
+            local nestCurrentTemperature = tostring(value["ambient_temperature_".. temperatureScale]):match("[%d.-]+")
             if nestCurrentTemperature then
                 local veraCurrentTemperature = luup.variable_get(SID.TEMP, "CurrentTemperature", deviceId) or ""