MSA-1688: Ijini Helper Test Programe

devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy

@@ -99,7 +99,7 @@ def parse(String description) {
 
 def poll() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {
 
 def refresh() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy

@@ -128,9 +128,9 @@ def setLevel(value) {
 
 def refresh() {
 	[
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 2000",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 2000",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 2000"
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
 	]
 
 }
@@ -313,9 +313,9 @@ def isDescriptionPower(descMap) {
 
 def onOffConfig() {
 	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 2000",
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 6 0 0x10 0 600 {01}", "delay 200",
+			"zcl global send-me-a-report 6 0 0x10 0 600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
 	]
 }
 
@@ -323,9 +323,9 @@ def onOffConfig() {
 //min level change is 01
 def levelConfig() {
 	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 2000",
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}", "delay 200",
+			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
 	]
 }
 
@@ -333,10 +333,9 @@ def levelConfig() {
 //min change in value is 05
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
 		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -345,10 +344,7 @@ def setLevelWithRate(level, rate) {
 		rate = "0000"
 	}
 	level = convertToHexString(level * 255 / 100) 				//Converting the 0-100 range to 0-FF range in hex
-	[
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
-			"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}",
-			"delay 2000"
-	]
 }
 
 String convertToHexString(value, width=2) {

devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy

@@ -51,7 +51,7 @@ def on() {
 			'zcl on-off on',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'
 
 	]
 
@@ -62,6 +62,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'
 	]
 }

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -157,10 +157,9 @@ def configure() {
 //min change in value is 01
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
 		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 

devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy

@@ -29,10 +29,9 @@ metadata {
 		command "enrollResponse"
 
 
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-S", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-S", deviceJoinName: "Water Leak Sensor"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
-		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
 	}
 
@@ -286,8 +285,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -309,10 +308,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy

@@ -298,8 +298,8 @@ def ping() {
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -321,10 +321,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy

@@ -428,10 +428,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
 		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -252,8 +252,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -277,10 +277,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -270,9 +270,9 @@ def configure() {
 
 	log.debug "Configuring Reporting and Bindings."
 	def humidityConfigCmds = [
-		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 2000",
+		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}", "delay 200",
+		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
 	]
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy

@@ -86,7 +86,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
 		unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
+		def body = new XmlSlurper().parseText(bodyString)
 
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"

devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy

@@ -78,7 +78,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
     	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
+		def body = new XmlSlurper().parseText(bodyString)
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"
 			result << timeSyncResponse()

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

@@ -84,7 +84,7 @@ def parse(String description) {
     def bodyString = msg.body
     if (bodyString) {
     	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
+        def body = new XmlSlurper().parseText(bodyString)
  		if (body?.property?.TimeSyncRequest?.text()) {
         	log.trace "Got TimeSyncRequest"
         	result << timeSyncResponse()

devicetypes/smartthings/zigbee-button.src/zigbee-button.groovy

@@ -28,8 +28,8 @@ metadata {
 
         fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
         //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
-        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
+        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
-        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
+        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
     }
 
     simulator {}

devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy

@@ -28,7 +28,6 @@ metadata {
 		fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor"  // Everspring SP814
 		fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor"  // Everspring HSP02
 		fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor"  // Enerwave ZWN-BPC
-		fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Smart Motion Sensor"
 	}
 
 	simulator {

smartapps/gideon-api/gideon.src/gideon.groovy

@@ -16,55 +16,33 @@
 definition(
     name: "Gideon",
     namespace: "gideon.api",
-    author: "Braindrain Solutions ltd",
+    author: "Braindrain Solutions",
-    description: "Gideon Smart Home SmartApp allows you to connect and control all of your SmartThings devices through the Gideon app, making your SmartThings devices even smarter.",
+    description: "Gideon AI Smart app allows you to connect and control all of your SmartThings devices through the Gideon AI app, making your SmartThings devices even smarter.",
     category: "Family",
     iconUrl: "http://s33.postimg.org/t77u7y7v3/logo.png",
     iconX2Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
     iconX3Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    oauth: [displayName: "Gideon Smart Home API app", displayLink: "gideon.ai"])
+    oauth: [displayName: "Gideon AI API", displayLink: "gideon.ai"])
 
 
 preferences {
-	section("Control these contact sensors...") {
-        input "contact", "capability.contactSensor", multiple:true, required:false
-    }
 	section("Control these switches...") {
-        input "switches", "capability.switch", multiple:true, required:false
+        input "switches", "capability.switch", multiple:true
-    }
-    section("Control these smoke alarms...") {
-        input "smoke_alarms", "capability.smokeDetector", multiple:true, required:false
-    }
-    section("Control these window shades...") {
-        input "shades", "capability.windowShade", multiple:true, required:false
-    }
-    section("Control these garage doors...") {
-        input "garage", "capability.garageDoorControl", multiple:true, required:false
-    }
-    section("Control these water sensors...") {
-        input "water_sensors", "capability.waterSensor", multiple:true, required:false
     }
     section("Control these motion sensors...") {
-        input "motions", "capability.motionSensor", multiple:true, required:false
+        input "motions", "capability.motionSensor", multiple:true
     }
     section("Control these presence sensors...") {
-    	input "presence_sensors", "capability.presenceSensor", multiple:true, required:false
+    	input "presence_sensors", "capability.presenceSensor", multiple:true
     }
-/** section("Control these outlets...") {
+    section("Control these outlets...") {
-    	input "outlets", "capability.switch", multiple:true, required:false
+    	input "outlets", "capability.switch", multiple:true
-    }
-*/
-     section("Control these power meters...") {
-        input "meters", "capability.powerMeter", multiple:true, required:false
     }
     section("Control these locks...") {
-    	input "locks", "capability.lock", multiple:true, required:false
+    	input "locks", "capability.lock", multiple:true
     }
-    section("Control these temperature sensors...") {
+    section("Control these locks...") {
-	    input "temperature_sensors", "capability.temperatureMeasurement", multiple:true, required:false
+	    input "temperature_sensors", "capability.temperatureMeasurement"
-    }
-    section("Control these batteries...") {
-	    input "batteries", "capability.battery", multiple:true, required:false
     }
 }
 
@@ -82,98 +60,43 @@ def updated() {
 }
 
 def initialize() {
+	// TODO: subscribe to attributes, devices, locations, etc.
+    subscribe(outlet, "energy", outletHandler)
+  	subscribe(outlet, "switch", outletHandler)
 }
 
+// TODO: implement event handlers
+def outletHandler(evt) {
+	log.debug "$outlet.currentEnergy"
+	//TODO call G API  
+}
+
+
 private device(it, type) {
 	it ? [id: it.id, label: it.label, type: type] : null
 }
 
 //API Mapping
 mappings {
-   path("/getalldevices") {
+	path("/getalldevices") {
     action: [
-      	GET: "getAllDevices"
+      			GET: "getAllDevices"
-   ]
-  }
-  path("/doorlocks/lock/:id") {
-    action: [
-      GET: "lockDoorLock"
-    ]
-  }
-  path("/doorlocks/unlock/:id") {
-    action: [
-      GET: "unlockDoorLock"
-    ]
-  }
-  path("/doorlocks/:id") {
-    action: [
-      GET: "getDoorLockStatus"
-    ]
-  }
-  path("/contacts/:id") {
-    action: [
-  	GET: "getContactStatus"
-    ]
-  }
-  path("/smoke/:id") {
-    action: [
-      			GET: "getSmokeStatus"
     		]
   	}
-    path("/shades/open/:id") {
+	path("/doorlocks/:id/:command") {
     action: [
-      GET: "openShade"
+      GET: "updateDoorLock"
     ]
   }
-  path("/shades/preset/:id") {
+  	path("/doorlocks/:id") {
     action: [
-      GET: "presetShade"
+      			GET: "getDoorLockStatus"
-    ]
-  }
-  path("/shades/close/:id") {
-    action: [
-      GET: "closeShade"
-    ]
-  }
-  	path("/shades/:id") {
-    action: [
-      			GET: "getShadeStatus"
-    		]
-  	}
-    path("/garage/open/:id") {
-    action: [
-      GET: "openGarage"
-    ]
-  }
-  path("/garage/close/:id") {
-    action: [
-      GET: "closeGarage"
-    ]
-  }
-  	path("/garage/:id") {
-    action: [
-      			GET: "getGarageStatus"
-    		]
-  	}
-    path("/watersensors/:id") {
-    action: [
-      			GET: "getWaterSensorStatus"
     		]
   	}
   	path("/tempsensors/:id") {
     action: [
       GET: "getTempSensorsStatus"
     ]
-  }
-  path("/meters/:id") {
-    action: [
-      GET: "getMeterStatus"
-    ]
-  }
-  path("/batteries/:id") {
-    action: [
-      GET: "getBatteryStatus"
-    ]
   }
   	path("/presences/:id") {
     action: [
@@ -185,35 +108,19 @@ mappings {
       GET: "getMotionStatus"
     ]
   }
-/**  	path("/outlets/:id") {
+  	path("/outlets/:id") {
     action: [
       GET: "getOutletStatus"
     ]
   }
-  	path("/outlets/turnon/:id") {
+  	path("/outlets/:id/:command") {
     action: [
-      GET: "turnOnOutlet"
+      GET: "updateOutlet"
     ]
   }
-  path("/outlets/turnoff/:id") {
+  	path("/switches/:command") {
     action: [
-      GET: "turnOffOutlet"
+      PUT: "updateSwitch"
-    ]
-  }
-*/
-  	path("/switches/turnon/:id") {
-    action: [
-      GET: "turnOnSwitch"
-    ]
-  }
-  path("/switches/turnoff/:id") {
-    action: [
-      GET: "turnOffSwitch"
-    ]
-  }
-  path("/switches/:id") {
-    action: [
-      GET: "getSwitchStatus"
     ]
   }
 }
@@ -221,149 +128,12 @@ mappings {
 //API Methods
 def getAllDevices() {
 	def locks_list = locks.collect{device(it,"Lock")}
-    def contact_list = contact.collect{device(it,"Contact Sensor")}
-    def smokes_list = smoke_alarms.collect{device(it,"Smoke Alarm")}
-    def shades_list = shades.collect{device(it,"Window Shade")}
-    def garage_list = garage.collect{device(it,"Garage Door")}
-    def water_sensors_list = water_sensors.collect{device(it,"Water Sensor")}
     def presences_list = presence_sensors.collect{device(it,"Presence")}
     def motions_list = motions.collect{device(it,"Motion")}
-  /**  def outlets_list = outlets.collect{device(it,"Outlet")} */
+    def outlets_list = outlets.collect{device(it,"Outlet")}
     def switches_list = switches.collect{device(it,"Switch")}
     def temp_list = temperature_sensors.collect{device(it,"Temperature")}
-    def meters_list = meters.collect{device(it,"Power Meters")}
+    return [Locks: locks_list, Presences: presences_list, Motions: motions_list, Outlets: outlets_list, Switches: switches_list, Temperatures: temp_list]
-    def battery_list = batteries.collect{device(it,"Batteries")}
-    return smokes_list + contact_list + water_sensors_list + shades_list + garage_list + locks_list + presences_list + motions_list + switches_list + temp_list + meters_list + battery_list
-}
-
-//contact sensors
-def getContactStatus() {
-	def device = contact.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def args = getTempSensorsStatus(device.id)
-        	return [Device_state: device.currentValue('contact')] + args
-        }
-}
-
-//smoke detectors
-def getSmokeStatus() {
-	def device = smoke_alarms.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('smoke')] + bat
-        }
-}
-
-//garage
-def getGarageStatus() {
-	def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('door')]
-        }
-}
-
-def openGarage() {
-    def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.open();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def closeGarage() {
-	def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.close();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-//shades
-def getShadeStatus() {
-	def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('windowShade')]
-        }
-}
-
-def openShade() {
-    def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.open();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-    
-def presetShade() {
-    def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.presetPosition();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def closeShade() {
-	def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.close();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-//water sensor
-def getWaterSensorStatus() {
-	def device = water_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('water')] + bat
-        }
-}
-//batteries
-def getBatteryStatus() {
-	def device = batteries.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.latestValue("battery")]
-        }
-}
-
-def getBatteryStatus(id) {
-	def device = batteries.find { it.id == id }
-    if (!device) {
-            return []
-        } else {
-        	return [battery_state: device.latestValue("battery")]
-        }
 }
 
 //LOCKS
@@ -372,34 +142,30 @@ def getDoorLockStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def bat = getBatteryStatus(device.id)
+        	return [Device_state: device.currentValue('lock')]
-        	return [Device_state: device.currentValue('lock')] + bat
         }
 }
 
-def lockDoorLock() {
+def updateDoorLock() {
+	def command = params.command
     def device = locks.find { it.id == params.id }
-    if (!device) {
+    if (command){
+        if (!device) {
             httpError(404, "Device not found")
         } else {
+            if(command == "toggle")
+            {
+                if(device.currentValue('lock') == "locked")
+                  device.unlock();
+                else
+                  device.lock();
                   
-            device.lock();
+                return [Device_id: params.id, result_action: "200"]
-                  
-            return [Device_id: params.id, result_action: "200"]                              
             }
+        }
     }
+}
 
-def unlockDoorLock() {
-	def device = locks.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.unlock();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
 //PRESENCE
 def getPresenceStatus() {
 
@@ -407,8 +173,7 @@ def getPresenceStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        def bat = getBatteryStatus(device.id)
+        	return [Device_state: device.currentValue('presence')]
-        	return [Device_state: device.currentValue('presence')] + bat
    }
 }
 
@@ -419,112 +184,63 @@ def getMotionStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def args = getTempSensorsStatus(device.id)
+        	return [Device_state: device.currentValue('motion')]
-        	return [Device_state: device.currentValue('motion')] + args
    }
 }
 
 //OUTLET
-/**
 def getOutletStatus() {
 	
     def device = outlets.find { it.id == params.id }
    	if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def watt = getMeterStatus(device.id)
+        	return [Device_state: device.currentSwitch, Current_watt: device.currentValue("energy")]
-        	return [Device_state: device.currentSwitch] + watt
-  }
-}
-*/
-def getMeterStatus() {
-	
-    def device = meters.find { it.id == params.id }
-   	if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_id: device.id, Device_type: device.type, Current_watt: device.currentValue("power")]
   }
 }
 
-def getMeterStatus(id) {
+def updateOutlet() {
 	
-    def device = meters.find { it.id == id }
+    def command = params.command
-   	if (!device) {
-            return []
-        } else {
-        	return [Current_watt: device.currentValue("power")]
-  }
-}
-
-/**
-def turnOnOutlet() {
     def device = outlets.find { it.id == params.id }
     if (command){
         if (!device) {
             httpError(404, "Device not found")
         } else {
+            if(command == "toggle")
+            {
+                if(device.currentSwitch == "on")
+                  device.off();
+                else
+                  device.on();
                   
-            device.on();
+                return [Device_id: params.id, result_action: "200"]
-                  
+            }
-            return [Device_id: params.id, result_action: "200"]
         }
     }
 }                
 
-def turnOffOutlet() {
-    def device = outlets.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.off();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-    }
-}
-*/
 //SWITCH
-def getSwitchStatus() {
+def updateSwitch() {
-	def device = switches.find { it.id == params.id }
+    def command = params.command
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('switch')]
-	}
-}
-
-def turnOnSwitch() {
     def device = switches.find { it.id == params.id }
     if (command){
         if (!device) {
             httpError(404, "Device not found")
         } else {
+            if(command == "toggle")
+            {
+                if(device.currentSwitch == "on")
+                  device.off();
+                else
+                  device.on();
                   
-            device.on();
+                return [Device_id: params.id, result_action: "200"]
-                  
+            }
-            return [Device_id: params.id, result_action: "200"]
         }
     }
 }
 
-def turnOffSwitch() {
-    def device = switches.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.on();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-    }
-}
-
-
 //TEMPERATURE
 def getTempSensorsStatus() {
 	
@@ -532,17 +248,6 @@ def getTempSensorsStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def bat = getBatteryStatus(device.id)
+        	return [Device_state: device.currentValue('temperature')]
-        	return [Device_state: device.currentValue('temperature')] + bat
    }
 }
-   
-def getTempSensorsStatus(id) {	
-    def device = temperature_sensors.find { it.id == id }
-    if (!device) {
-            return []
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [temperature: device.currentValue('temperature')] + bat
-   		}
-   }

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

@@ -0,0 +1,51 @@
+/**
+ *  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

smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy

@@ -1,11 +1,10 @@
 /**
  * 	Color Coordinator 
- *  Version 1.1.1 - 11/9/16
+ *  Version 1.1.0 - 11/9/16
  *  By Michael Struck
  *
  *  1.0.0 - Initial release
  *  1.1.0 - Fixed issue where master can be part of slaves. This causes a loop that impacts SmartThings. 
- *  1.1.1 - Fix NPE being thrown for slave/master inputs being empty.
  *
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -34,17 +33,17 @@ preferences {
 
 def mainPage() {
 	dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) {
-		def masterInList = slaves?.id?.find{it==master?.id}
+		def masterInList = slaves.id.find{it==master.id}
         if (masterInList) {
         	section ("**WARNING**"){
             	paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png"
             }
         }
         section("Master Light") {
-			input "master", "capability.colorControl", title: "Colored Light", required: true
+			input "master", "capability.colorControl", title: "Colored Light"
 		}
 		section("Lights that follow the master settings") {
-			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: true, submitOnChange: true
+			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: false, submitOnChange: true
 		}
     	section([mobileOnly:true], "Options") {
 			input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false
@@ -82,44 +81,40 @@ def init() {
 }
 //-----------------------------------
 def onOffHandler(evt){
-	if (slaves && master) {
+	if (!slaves.id.find{it==master.id}){
-		if (!slaves?.id.find{it==master?.id}){
+        if (master.currentValue("switch") == "on"){
-		if (master?.currentValue("switch") == "on"){
+            if (randomYes) getRandomColorMaster()
-		    if (randomYes) getRandomColorMaster()
+			else slaves?.on()
-				else slaves?.on()
+        }
-		}
+        else {
-		else {
+            slaves?.off()  
-		    slaves?.off()  
+        }
-		}
-		}
 	}
 }
 
 def colorHandler(evt) {
-	if (slaves && master) {
+   	if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-		if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+		log.debug "Changing Slave units H,S,L"
-			log.debug "Changing Slave units H,S,L"
+    	def dimLevel = master.currentValue("level")
-		def dimLevel = master?.currentValue("level")
+    	def hueLevel = master.currentValue("hue")
-		def hueLevel = master?.currentValue("hue")
+    	def saturationLevel = master.currentValue("saturation")
-		def saturationLevel = master.currentValue("saturation")
+		def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
-			def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
+    	slaves?.setColor(newValue)
-		slaves?.setColor(newValue)
+    	try {
-		try {
+    		log.debug "Changing Slave color temp"
-			log.debug "Changing Slave color temp"
+        	def tempLevel = master.currentValue("colorTemperature")
-			def tempLevel = master?.currentValue("colorTemperature")
+    		slaves?.setColorTemperature(tempLevel)
-			slaves?.setColorTemperature(tempLevel)
+    	}
-		}
+   		catch (e){
-			catch (e){
+    		log.debug "Color temp for master --"
-			log.debug "Color temp for master --"
+    	}
-		}
-		}
 	}
 }
 
 def getRandomColorMaster(){
     def hueLevel = Math.floor(Math.random() *1000)
     def saturationLevel = Math.floor(Math.random() * 100)
-    def dimLevel = master?.currentValue("level")
+    def dimLevel = master.currentValue("level")
 	def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
     log.debug hueLevel
     log.debug saturationLevel
@@ -128,14 +123,12 @@ def getRandomColorMaster(){
 }
 
 def tempHandler(evt){
-	if (slaves && master) {
+    if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-	    if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+        if (evt.value != "--") {
-		if (evt.value != "--") {
+            log.debug "Changing Slave color temp based on Master change"
-		    log.debug "Changing Slave color temp based on Master change"
+            def tempLevel = master.currentValue("colorTemperature")
-		    def tempLevel = master.currentValue("colorTemperature")
+            slaves?.setColorTemperature(tempLevel)
-		    slaves?.setColorTemperature(tempLevel)
+        }
-		}
-		}
 	}
 }
 
@@ -146,7 +139,7 @@ private def textAppName() {
 }	
 
 private def textVersion() {
-    def text = "Version 1.1.1 (12/13/2016)"
+    def text = "Version 1.1.0 (11/09/2016)"
 }
 
 private def textCopyright() {