Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/Location/LocationVar.groovy b/Location/LocationVar.groovy
index d006c4e70cdce141529b8038f1c1e838134f2346..3f28a0bfbe2100dc105cb8968a0fb2238211af80 100644 (file)
--- a/Location/LocationVar.groovy
+++ b/Location/LocationVar.groovy
@@ -36,4 +36,9 @@ class LocationVar {
                this.mode = sentMode
                sendEvent(eventDataMap)
        }
+
+       def currentValue(String deviceFeature) {
+               if (deviceFeature == "sunsetTime" || deviceFeature == "sunset")
+                       return System.currentTimeMillis()
+       }
 }

diff --git a/Variables and events for each device b/Variables and events for each device
index cd0d297502e32dbfdf9f1c84dbe0b683d76c0713..19d45030eb5cc219f4162443378feb5e59127bf2 100644 (file)
--- a/Variables and events for each device
+++ b/Variables and events for each device
@@ -55,6 +55,10 @@ locationObject.setValue([name: "sunset", value: "sunset", deviceId: "locationID0
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 locationObject.setValue([name: "sunrise", value: "sunrise", deviceId: "locationID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+locationObject.setValue([name: "sunsetTime", value: "sunset", deviceId: "locationID0", descriptionText: "",
+displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+locationObject.setValue([name: "sunriseTime", value: "sunrise", deviceId: "locationID0", descriptionText: "",
+displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /*events*/
 //
 -------------------------------------------------------------------------------