Update weather station tile

Now with actual lux calculation when solar radiation data is available. Also includes refresh/polling capabilities

devicetypes/edison/siren-dh.src/siren-dh.groovy

@@ -1,80 +0,0 @@
-/**
- *  Siren DH
- *
- *  Copyright 2016 KV
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-metadata {
-	definition (name: "Siren DH", namespace: "edison", author: "KV", oauth: true) {
-		capability "Audio Notification"
-		capability "Door Control"
-		capability "Motion Sensor"
-	}
-
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles {
-		// TODO: define your main and details tiles here
-	}
-}
-
-// parse events into attributes
-def parse(String description) {
-	log.debug "Parsing '${description}'"
-	// TODO: handle 'door' attribute
-	// TODO: handle 'motion' attribute
-
-}
-
-// handle commands
-def playText() {
-	log.debug "Executing 'playText'"
-	// TODO: handle 'playText' command
-}
-
-def playTextAndResume() {
-	log.debug "Executing 'playTextAndResume'"
-	// TODO: handle 'playTextAndResume' command
-}
-
-def playTextAndRestore() {
-	log.debug "Executing 'playTextAndRestore'"
-	// TODO: handle 'playTextAndRestore' command
-}
-
-def playTrack() {
-	log.debug "Executing 'playTrack'"
-	// TODO: handle 'playTrack' command
-}
-
-def playTrackAndResume() {
-	log.debug "Executing 'playTrackAndResume'"
-	// TODO: handle 'playTrackAndResume' command
-}
-
-def playTrackAndRestore() {
-	log.debug "Executing 'playTrackAndRestore'"
-	// TODO: handle 'playTrackAndRestore' command
-}
-
-def open() {
-	log.debug "Executing 'open'"
-	// TODO: handle 'open' command
-}
-
-def close() {
-	log.debug "Executing 'close'"
-	// TODO: handle 'close' command
-}

devicetypes/smartthings/smartweather-station-tile.src/smartweather-station-tile.groovy

@@ -16,12 +16,15 @@
  *
  *  Date: 2013-04-30
  */
+// for the UI
 metadata {
+	// Automatically generated. Make future change here.
 	definition (name: "SmartWeather Station Tile", namespace: "smartthings", author: "SmartThings") {
 		capability "Illuminance Measurement"
 		capability "Temperature Measurement"
 		capability "Relative Humidity Measurement"
 		capability "Sensor"
+		capability "Polling"
 
 		attribute "localSunrise", "string"
 		attribute "localSunset", "string"
@@ -214,7 +217,7 @@ def poll() {
         send(name: "localSunrise", value: localSunrise, descriptionText: "Sunrise today is at $localSunrise")
         send(name: "localSunset", value: localSunset, descriptionText: "Sunset today at is $localSunset")
 
-		send(name: "illuminance", value: estimateLux(sunriseDate, sunsetDate, weatherIcon))
+		send(name: "illuminance", value: estimateLux(obs.solarradiation, sunriseDate, sunsetDate, weatherIcon) as Integer)
 
 		// Forecast
 		def f = get("forecast")
@@ -305,48 +308,53 @@ private send(map) {
 	sendEvent(map)
 }
 
-private estimateLux(sunriseDate, sunsetDate, weatherIcon) {
+private estimateLux(solarradiation, sunriseDate, sunsetDate, weatherIcon) {
 	def lux = 0
-	def now = new Date().time
-	if (now > sunriseDate.time && now < sunsetDate.time) {
-		//day
-		switch(weatherIcon) {
-			case 'tstorms':
-				lux = 200
-				break
-			case ['cloudy', 'fog', 'rain', 'sleet', 'snow', 'flurries',
-				'chanceflurries', 'chancerain', 'chancesleet',
-				'chancesnow', 'chancetstorms']:
-				lux = 1000
-				break
-			case 'mostlycloudy':
-				lux = 2500
-				break
-			case ['partlysunny', 'partlycloudy', 'hazy']:
-				lux = 7500
-				break
-			default:
-				//sunny, clear
-				lux = 10000
-		}
 
-		//adjust for dusk/dawn
+	if (solarradiation != '--') {
-		def afterSunrise = now - sunriseDate.time
+		lux = solarradiation.toDouble() / 0.0079
-		def beforeSunset = sunsetDate.time - now
+	} else {
-		def oneHour = 1000 * 60 * 60
+		def now = new Date().time
+		if (now > sunriseDate.time && now < sunsetDate.time) {
+			//day
+			switch(weatherIcon) {
+				case 'tstorms':
+					lux = 200
+					break
+				case ['cloudy', 'fog', 'rain', 'sleet', 'snow', 'flurries',
+					'chanceflurries', 'chancerain', 'chancesleet',
+					'chancesnow', 'chancetstorms']:
+					lux = 1000
+					break
+				case 'mostlycloudy':
+					lux = 2500
+					break
+				case ['partlysunny', 'partlycloudy', 'hazy']:
+					lux = 7500
+					break
+				default:
+					//sunny, clear
+					lux = 10000
+			}
 
-		if(afterSunrise < oneHour) {
+			//adjust for dusk/dawn
-			//dawn
+			def afterSunrise = now - sunriseDate.time
-			lux = (long)(lux * (afterSunrise/oneHour))
+			def beforeSunset = sunsetDate.time - now
-		} else if (beforeSunset < oneHour) {
+			def oneHour = 1000 * 60 * 60
-			//dusk
+
-			lux = (long)(lux * (beforeSunset/oneHour))
+			if(afterSunrise < oneHour) {
+				//dawn
+				lux = (long)(lux * (afterSunrise/oneHour))
+			} else if (beforeSunset < oneHour) {
+				//dusk
+				lux = (long)(lux * (beforeSunset/oneHour))
+			}
+		}
+		else {
+			//night - always set to 10 for now
+			//could do calculations for dusk/dawn too
+			lux = 10
 		}
-	}
-	else {
-		//night - always set to 10 for now
-		//could do calculations for dusk/dawn too
-		lux = 10
 	}
 
 	lux