Update thermostat.groovy

[smartapps.git] / third-party / influxdb-logger.groovy

diff --git a/third-party/influxdb-logger.groovy b/third-party/influxdb-logger.groovy
index 90603c9837ab5a688a2695b24f85c717255dfa64..e00fd7d841de2d8ca82f092e091a9e454315fffa 100755 (executable)
--- a/third-party/influxdb-logger.groovy
+++ b/third-party/influxdb-logger.groovy
@@ -86,9 +86,9 @@ preferences {
         input "beacons", "capability.beacon", title: "Beacons", multiple: true, required: false
         input "buttons", "capability.button", title: "Buttons", multiple: true, required: false
         input "cos", "capability.carbonMonoxideDetector", title: "Carbon Monoxide Detectors", multiple: true, required: false
-        input "co2s", "capability.carbonDioxideMeasurement", title: "Carbon Dioxide Detectors", multiple: true, required: false
+        input "co2s", "capability.carbonDioxideMeasurement", title: "Carbon Dioxide Detectors", multiple: true, required: false//1
         input "colors", "capability.colorControl", title: "Color Controllers", multiple: true, required: false
-        input "consumables", "capability.consumable", title: "Consumables", multiple: true, required: false
+        input "consumables", "capability.consumable", title: "Consumables", multiple: true, required: false//2
         input "contacts", "capability.contactSensor", title: "Contact Sensors", multiple: true, required: false
         input "doorsControllers", "capability.doorControl", title: "Door Controllers", multiple: true, required: false
         input "energyMeters", "capability.energyMeter", title: "Energy Meters", multiple: true, required: false
@@ -98,28 +98,28 @@ preferences {
         input "motions", "capability.motionSensor", title: "Motion Sensors", multiple: true, required: false
         input "musicPlayers", "capability.musicPlayer", title: "Music Players", multiple: true, required: false
         input "peds", "capability.stepSensor", title: "Pedometers", multiple: true, required: false
-        input "phMeters", "capability.pHMeasurement", title: "pH Meters", multiple: true, required: false
+        input "phMeters", "capability.pHMeasurement", title: "pH Meters", multiple: true, required: false//3
         input "powerMeters", "capability.powerMeter", title: "Power Meters", multiple: true, required: false
         input "presences", "capability.presenceSensor", title: "Presence Sensors", multiple: true, required: false
         input "pressures", "capability.sensor", title: "Pressure Sensors", multiple: true, required: false
-        input "shockSensors", "capability.shockSensor", title: "Shock Sensors", multiple: true, required: false
-        input "signalStrengthMeters", "capability.signalStrength", title: "Signal Strength Meters", multiple: true, required: false
+        input "shockSensors", "capability.shockSensor", title: "Shock Sensors", multiple: true, required: false//4
+        input "signalStrengthMeters", "capability.signalStrength", title: "Signal Strength Meters", multiple: true, required: false//5
         input "sleepSensors", "capability.sleepSensor", title: "Sleep Sensors", multiple: true, required: false
         input "smokeDetectors", "capability.smokeDetector", title: "Smoke Detectors", multiple: true, required: false
-        input "soundSensors", "capability.soundSensor", title: "Sound Sensors", multiple: true, required: false
-               input "spls", "capability.soundPressureLevel", title: "Sound Pressure Level Sensors", multiple: true, required: false
-               input "switches", "capability.switch", title: "Switches", multiple: true, required: false
+        input "soundSensors", "capability.soundSensor", title: "Sound Sensors", multiple: true, required: false//6
+       input "spls", "capability.soundPressureLevel", title: "Sound Pressure Level Sensors", multiple: true, required: false//7
+       input "switches", "capability.switch", title: "Switches", multiple: true, required: false
         input "switchLevels", "capability.switchLevel", title: "Switch Levels", multiple: true, required: false
-        input "tamperAlerts", "capability.tamperAlert", title: "Tamper Alerts", multiple: true, required: false
+        input "tamperAlerts", "capability.tamperAlert", title: "Tamper Alerts", multiple: true, required: false//8
         input "temperatures", "capability.temperatureMeasurement", title: "Temperature Sensors", multiple: true, required: false
         input "thermostats", "capability.thermostat", title: "Thermostats", multiple: true, required: false
         input "threeAxis", "capability.threeAxis", title: "Three-axis (Orientation) Sensors", multiple: true, required: false
         input "touchs", "capability.touchSensor", title: "Touch Sensors", multiple: true, required: false
-        input "uvs", "capability.ultravioletIndex", title: "UV Sensors", multiple: true, required: false
+        input "uvs", "capability.ultravioletIndex", title: "UV Sensors", multiple: true, required: false//9
         input "valves", "capability.valve", title: "Valves", multiple: true, required: false
-        input "volts", "capability.voltageMeasurement", title: "Voltage Meters", multiple: true, required: false
+        input "volts", "capability.voltageMeasurement", title: "Voltage Meters", multiple: true, required: false//10
         input "waterSensors", "capability.waterSensor", title: "Water Sensors", multiple: true, required: false
-        input "windowShades", "capability.windowShade", title: "Window Shades", multiple: true, required: false
+        input "windowShades", "capability.windowShade", title: "Window Shades", multiple: true, required: false//11
     }
 
 }
@@ -190,9 +190,9 @@ def updated() {
     state.deviceAttributes << [ devices: 'beacons', attributes: ['presence']]
     state.deviceAttributes << [ devices: 'buttons', attributes: ['button']]
     state.deviceAttributes << [ devices: 'cos', attributes: ['carbonMonoxide']]
-    state.deviceAttributes << [ devices: 'co2s', attributes: ['carbonDioxide']]
+    state.deviceAttributes << [ devices: 'co2s', attributes: ['carbonDioxide']]///
     state.deviceAttributes << [ devices: 'colors', attributes: ['hue','saturation','color']]
-    state.deviceAttributes << [ devices: 'consumables', attributes: ['consumableStatus']]
+    state.deviceAttributes << [ devices: 'consumables', attributes: ['consumableStatus']]///
     state.deviceAttributes << [ devices: 'contacts', attributes: ['contact']]
     state.deviceAttributes << [ devices: 'doorsControllers', attributes: ['door']]
     state.deviceAttributes << [ devices: 'energyMeters', attributes: ['energy']]
@@ -202,28 +202,28 @@ def updated() {
     state.deviceAttributes << [ devices: 'motions', attributes: ['motion']]
     state.deviceAttributes << [ devices: 'musicPlayers', attributes: ['status','level','trackDescription','trackData','mute']]
     state.deviceAttributes << [ devices: 'peds', attributes: ['steps','goal']]
-    state.deviceAttributes << [ devices: 'phMeters', attributes: ['pH']]
-    state.deviceAttributes << [ devices: 'powerMeters', attributes: ['power','voltage','current','powerFactor']]
+    state.deviceAttributes << [ devices: 'phMeters', attributes: ['pH']]///
+    state.deviceAttributes << [ devices: 'powerMeters', attributes: ['power']]
     state.deviceAttributes << [ devices: 'presences', attributes: ['presence']]
-    state.deviceAttributes << [ devices: 'pressures', attributes: ['pressure']]
-    state.deviceAttributes << [ devices: 'shockSensors', attributes: ['shock']]
-    state.deviceAttributes << [ devices: 'signalStrengthMeters', attributes: ['lqi','rssi']]
+    state.deviceAttributes << [ devices: 'pressures', attributes: ['pressure']]///
+    state.deviceAttributes << [ devices: 'shockSensors', attributes: ['shock']]///
+    state.deviceAttributes << [ devices: 'signalStrengthMeters', attributes: ['lqi','rssi']]///
     state.deviceAttributes << [ devices: 'sleepSensors', attributes: ['sleeping']]
     state.deviceAttributes << [ devices: 'smokeDetectors', attributes: ['smoke']]
-    state.deviceAttributes << [ devices: 'soundSensors', attributes: ['sound']]
-       state.deviceAttributes << [ devices: 'spls', attributes: ['soundPressureLevel']]
+    state.deviceAttributes << [ devices: 'soundSensors', attributes: ['sound']]///
+       state.deviceAttributes << [ devices: 'spls', attributes: ['soundPressureLevel']]///
        state.deviceAttributes << [ devices: 'switches', attributes: ['switch']]
     state.deviceAttributes << [ devices: 'switchLevels', attributes: ['level']]
-    state.deviceAttributes << [ devices: 'tamperAlerts', attributes: ['tamper']]
+    state.deviceAttributes << [ devices: 'tamperAlerts', attributes: ['tamper']]///
     state.deviceAttributes << [ devices: 'temperatures', attributes: ['temperature']]
-    state.deviceAttributes << [ devices: 'thermostats', attributes: ['temperature','heatingSetpoint','coolingSetpoint','thermostatSetpoint','thermostatMode','thermostatFanMode','thermostatOperatingState','thermostatSetpointMode','scheduledSetpoint','optimisation','windowFunction']]
+    state.deviceAttributes << [ devices: 'thermostats', attributes: ['temperature','heatingSetpoint','coolingSetpoint','thermostatSetpoint','thermostatMode','thermostatFanMode','thermostatOperatingState']]
     state.deviceAttributes << [ devices: 'threeAxis', attributes: ['threeAxis']]
     state.deviceAttributes << [ devices: 'touchs', attributes: ['touch']]
-    state.deviceAttributes << [ devices: 'uvs', attributes: ['ultravioletIndex']]
+    state.deviceAttributes << [ devices: 'uvs', attributes: ['ultravioletIndex']]///
     state.deviceAttributes << [ devices: 'valves', attributes: ['contact']]
-    state.deviceAttributes << [ devices: 'volts', attributes: ['voltage']]
+    state.deviceAttributes << [ devices: 'volts', attributes: ['voltage']]///
     state.deviceAttributes << [ devices: 'waterSensors', attributes: ['water']]
-    state.deviceAttributes << [ devices: 'windowShades', attributes: ['windowShade']]
+    state.deviceAttributes << [ devices: 'windowShades', attributes: ['windowShade']]///
 
     // Configure Scheduling:
     state.softPollingInterval = settings.prefSoftPollingInterval.toInteger()
@@ -693,19 +693,19 @@ private manageSubscriptions() {
     // Subscribe to mode events:
     if (prefLogModeEvents) subscribe(location, "mode", handleModeEvent)
     
-    subscribe(accelerometers, "accelerometers", handleEvent)
-    subscribe(alarms, "alarms", handleEvent)
-    subscribe(batteries, "batteries", handleEvent)
-    subscribe(beacons, "beacons", handleEvent)
-    subscribe(buttons, "buttons", handleEvent)
+    subscribe(accelerometers, "acceleration", handleEvent)
+    subscribe(alarms, "alarm", handleEvent)
+    subscribe(batteries, "battery", handleEvent)
+    subscribe(beacons, "presence", handleEvent)
+    subscribe(buttons, "button", handleEvent)
     subscribe(cos, "carbonMonoxide", handleEvent)
-    subscribe(cos, "carbonDioxide", handleEvent)
+    subscribe(co2s, "carbonDioxide", handleEvent)
     subscribe(colors, "hue", handleEvent)
     subscribe(colors, "saturation", handleEvent)
     subscribe(colors, "color", handleEvent)
     subscribe(consumables, "consumableStatus", handleEvent)
     subscribe(contacts, "contact", handleEvent)
-    subscribe(doorsControllers, "door", handleEvent)
+    subscribe(doorsControllers, "doorState", handleEvent)
     subscribe(energyMeters, "energy", handleEvent)
     subscribe(humidities, "humidity", handleEvent)
     subscribe(illuminances, "illuminance", handleEvent)
@@ -720,9 +720,6 @@ private manageSubscriptions() {
     subscribe(peds, "goal", handleEvent)
     subscribe(phMeters, "pH", handleEvent)
     subscribe(powerMeters, "power", handleEvent)
-    subscribe(powerMeters, "voltage", handleEvent)
-    subscribe(powerMeters, "current", handleEvent)
-    subscribe(powerMeters, "powerFactor", handleEvent)
     subscribe(presences, "presence", handleEvent)
     subscribe(pressures, "pressure", handleEvent)
     subscribe(shockSensors, "shock", handleEvent)
@@ -743,12 +740,8 @@ private manageSubscriptions() {
     subscribe(thermostats, "thermostatMode", handleEvent)
     subscribe(thermostats, "thermostatFanMode", handleEvent)
     subscribe(thermostats, "thermostatOperatingState", handleEvent)
-    subscribe(thermostats, "thermostatSetpointMode", handleEvent)
-    subscribe(thermostats, "scheduledSetpoint", handleEvent)
-    subscribe(thermostats, "optimisation", handleEvent)
-    subscribe(thermostats, "windowFunction", handleEvent)
     subscribe(threeAxis, "threeAxis", handleEvent)
-    subscribe(touchs, "touch", handleEvent)
+    subscribe(touchs, "touched", handleEvent)
     subscribe(uvs, "ultravioletIndex", handleEvent)
     subscribe(valves, "contact", handleEvent)
     subscribe(volts, "voltage", handleEvent)