Update weather station tile

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

devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy

@@ -22,10 +22,9 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
-		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
 	}
 
 	simulator {

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
-		def afterSunrise = now - sunriseDate.time
-		def beforeSunset = sunsetDate.time - now
-		def oneHour = 1000 * 60 * 60
+	if (solarradiation != '--') {
+		lux = solarradiation.toDouble() / 0.0079
+	} else {
+		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) {
-			//dawn
-			lux = (long)(lux * (afterSunrise/oneHour))
-		} else if (beforeSunset < oneHour) {
-			//dusk
-			lux = (long)(lux * (beforeSunset/oneHour))
+			//adjust for dusk/dawn
+			def afterSunrise = now - sunriseDate.time
+			def beforeSunset = sunsetDate.time - now
+			def oneHour = 1000 * 60 * 60
+
+			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

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -24,10 +24,6 @@ metadata {
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer"
-		fingerprint mfr:"011A", prod:"0102", model:"0201", deviceJoinName: "Enerwave In-Wall Dimmer"
-		fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
-		fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
-		fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -25,9 +25,6 @@ metadata {
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
-		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
-		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
-		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}
 
 	// simulator metadata

smartapps/global-ipl-ijinihelper2/ijinihelper2.src/ijinihelper2.groovy

@@ -1,51 +0,0 @@
-/**
- *  ijinihelper2
- *
- *  Copyright 2017 ipl
- *
- *  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.
- *
- */
-definition(
-    name: "ijinihelper2",
-    namespace: "global.ipl.ijinihelper2",
-    author: "ipl",
-    description: "ijinihelper2",
-    category: "SmartThings Labs",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    oauth: true)
-
-
-preferences {
-	section("Title") {
-		// TODO: put inputs here
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-}
-
-// TODO: implement event handlers