Variables and events for each device has updated!

diff --git a/Methods/subscribe.groovy b/Methods/subscribe.groovy
index 3e6067abfc27e8f5ec09b4b2b0378ca16fc84f75..f2dfb56e55f23afe6c602e92dd135b1998a81f7b 100644 (file)
--- a/Methods/subscribe.groovy
+++ b/Methods/subscribe.groovy
@@ -29,7 +29,7 @@ def subscribe(Object obj, String event, Closure FunctionToCall) {
                objectList.add(obj)
                eventList.add("Location")
                functionList.add(FunctionToCall)
-       } else if ((event == "lock.locked")||(event == "lock.unlocked")||(event == "lock")) {
+       } else if ((event == "lock.locked")||(event == "lock.unlocked")||(event == "lock")||(event == "unlock")) {
                objectList.add(obj)
                eventList.add("lock")
                functionList.add(FunctionToCall)

diff --git a/Variables and events for each device b/Variables and events for each device
index bf5e119fc4e4cbf29f43f99d298be6d0f24277b8..8643131afec5a5d49f6f5c36091bbc12cb000653 100644 (file)
--- a/Variables and events for each device
+++ b/Variables and events for each device
@@ -19,18 +19,10 @@ displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "
 String currentContact or String contactState
 /*events*/
 /////
-contactObject.setValue([name: "contact.closed", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-contactObject.setValue([name: "contact.open", value: "open", deviceId: "contactSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 contactObject.setValue([name: "contact", value: "open", deviceId: "contactSensorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 contactObject.setValue([name: "contact", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-contactObject.setValue([name: "tamper.tampered", value: "open", deviceId: "contactSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-contactObject.setValue([name: "tamper.tampered", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -59,11 +51,9 @@ locationObject.setValue([name: "Location", value: "home", deviceId: "locationID0
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 locationObject.setValue([name: "Location", value: "night", deviceId: "locationID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-locationObject.setValue([name: "mode", value: "away", deviceId: "locationID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-locationObject.setValue([name: "mode", value: "home", deviceId: "locationID0", descriptionText: "",
+locationObject.setValue([name: "sunset", value: "sunset", deviceId: "locationID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-locationObject.setValue([name: "mode", value: "night", deviceId: "locationID0", descriptionText: "",
+locationObject.setValue([name: "sunrise", value: "sunrise", deviceId: "locationID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /*events*/
 //
@@ -75,8 +65,6 @@ String currentLock or String lockState
 /*events*/
 lockObject.setValue([name: "lock", value: "locked", deviceId: "lockID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-lockObject.setValue([name: "unlock", value: "unlocked ", deviceId: "lockID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 lockObject.setValue([name: "lock", value: "unlocked", deviceId: "lockID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
@@ -92,10 +80,6 @@ motionSensorObject.setValue([name: "motion", value: "active", deviceId: "motionS
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 motionSensorObject.setValue([name: "motion", value: "inactive", deviceId: "motionSensorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-motionSensorObject.setValue([name: "motion.active", value: "active", deviceId: "motionSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-motionSensorObject.setValue([name: "motion.inactive", value: "inactive", deviceId: "motionSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -137,10 +121,6 @@ presenceSensorObject.setValue([name: "presence", value: "present", deviceId: "pr
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"1","dni":"mobile0"}'])
 presenceSensorObject.setValue([name: "presence", value: "not present", deviceId: "presenceSensorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"0","dni":"mobile0"}'])
-presenceSensorObject.setValue([name: "presence.present", value: "present", deviceId: "presenceSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"1","dni":"mobile0"}'])
-presenceSensorObject.setValue([name: "presence.not present", value: "present", deviceId: "presenceSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"1","dni":"mobile0"}'])
 /////
 /*events*/
 //
@@ -156,18 +136,6 @@ smokeDetectorObject.setValue([name: "smoke", value: "detected", deviceId: "smoke
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 smokeDetectorObject.setValue([name: "smoke", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-smokeDetectorObject.setValue([name: "smoke.clear", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-smokeDetectorObject.setValue([name: "smoke.detected", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-smokeDetectorObject.setValue([name: "smoke.tested", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-smokeDetectorObject.setValue([name: "carbonMonoxide.clear", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-smokeDetectorObject.setValue([name: "carbonMonoxide.detected", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-smokeDetectorObject.setValue([name: "carbonMonoxide.tested", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 smokeDetectorObject.setValue([name: "battery", value: "5"/*A number between 0 to 100 as a charge*/, deviceId: "smokeDetectorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
@@ -212,16 +180,6 @@ thermostatObject.setValue([name: "thermostatFanMode", value: "fanOn", deviceId:
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 thermostatObject.setValue([name: "thermostatFanMode", value: "on", deviceId: "thermostatID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-thermostatObject.setValue([name: "fanMode", value: "auto", deviceId: "thermostatID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-thermostatObject.setValue([name: "fanMode", value: "fanCirculate", deviceId: "thermostatID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-thermostatObject.setValue([name: "fanMode", value: "circulate", deviceId: "thermostatID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-thermostatObject.setValue([name: "fanMode", value: "fanOn", deviceId: "thermostatID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-thermostatObject.setValue([name: "fanMode", value: "on", deviceId: "thermostatID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 thermostatObject.setValue([name: "thermostatOperatingState", value: "cooling", deviceId: "thermostatID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 thermostatObject.setValue([name: "thermostatOperatingState", value: "fan only", deviceId: "thermostatID0", descriptionText: "",
@@ -249,10 +207,6 @@ switchObject.setValue([name: "switch", value: "off", deviceId: "switchID0", desc
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 switchObject.setValue([name: "switch", value: "on", deviceId: "switchID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-switchObject.setValue([name: "switch.off", value: "off", deviceId: "switchID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-switchObject.setValue([name: "switch.on", value: "on", deviceId: "switchID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -299,10 +253,6 @@ accelerationSensorObject.setValue([name: "acceleration", value: "active", device
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 accelerationSensorObject.setValue([name: "acceleration", value: "inactive", deviceId: "accelerationSensorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-accelerationSensorObject.setValue([name: "acceleration.active", value: "active", deviceId: "accelerationSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-accelerationSensorObject.setValue([name: "acceleration.inactive", value: "inactive", deviceId: "accelerationSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -341,12 +291,6 @@ carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "detected"
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide.clear", value: "clear", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide.detected", value: "detected", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide.tested", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /*events*/
 //
 -------------------------------------------------------------------------------
@@ -369,10 +313,6 @@ colorControlObject.setValue([name: "switch", value: "on", deviceId: "colorContro
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 colorControlObject.setValue([name: "switch", value: "off", deviceId: "colorControlID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-colorControlObject.setValue([name: "switch.on", value: "on", deviceId: "colorControlID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-colorControlObject.setValue([name: "switch.off", value: "off", deviceId: "colorControlID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 colorControlObject.setValue([name: "colorTemperature", value: "50", deviceId: "colorControlID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /*events*/
@@ -427,10 +367,6 @@ relaySwitchObject.setValue([name: "switch", value: "off", deviceId: "relaySwitch
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 relaySwitchObject.setValue([name: "switch", value: "on", deviceId: "relaySwitchID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-relaySwitchObject.setValue([name: "switch.off", value: "off", deviceId: "relaySwitchID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-relaySwitchObject.setValue([name: "switch.on", value: "on", deviceId: "relaySwitchID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -473,10 +409,6 @@ switchLevelObject.setValue([name: "switch", value: "on", deviceId: "switchLevelI
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 switchLevelObject.setValue([name: "switch", value: "off", deviceId: "switchLevelID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-switchLevelObject.setValue([name: "switch.on", value: "on", deviceId: "switchLevelID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-switchLevelObject.setValue([name: "switch.off", value: "off", deviceId: "switchLevelID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -514,10 +446,6 @@ waterSensorObject.setValue([name: "water", value: "dry", deviceId: "waterSensorI
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 waterSensorObject.setValue([name: "water", value: "wet", deviceId: "waterSensorID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-waterSensorObject.setValue([name: "water.dry", value: "dry", deviceId: "waterSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-waterSensorObject.setValue([name: "water.wet", value: "wet", deviceId: "waterSensorID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////
 /*events*/
 //
@@ -532,10 +460,6 @@ colorTemperatureObject.setValue([name: "switch", value: "off", deviceId: "switch
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 colorTemperatureObject.setValue([name: "switch", value: "on", deviceId: "switchID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-colorTemperatureObject.setValue([name: "switch.off", value: "off", deviceId: "switchID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-colorTemperatureObject.setValue([name: "switch.on", value: "on", deviceId: "switchID0", descriptionText: "",
-displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 colorTemperatureObject.setValue([name: "colorTemperature", value: "13000", deviceId: "switchID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /////