Merge pull request #2035 from SmartThingsCommunity/staging

Rolling down staging to master
Merge pull request #2033 from SmartThingsCommunity/production
2026-03-16 21:03:28 +00:00 · 2017-05-23 13:51:00 -07:00 · 2017-05-23 13:49:12 -07:00 · 2017-05-23 12:19:09 -07:00 · 2017-05-18 07:52:00 -07:00 · 2017-05-16 14:37:45 -07:00
3 changed files with 2 additions and 2 deletions
--- a/devicetypes/smartthings/aeon-siren.src/aeon-siren.groovy
+++ b/devicetypes/smartthings/aeon-siren.src/aeon-siren.groovy
@@ -16,7 +16,7 @@
 *	Date: 2014-07-15
 */
 metadata {
- definition (name: "Aeon Siren", namespace: "smartthings", author: "SmartThings") {
+ definition (name: "Aeon Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.smoke") {
 	capability "Actuator"
 	capability "Alarm"
 	capability "Switch"
--- a/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
+++ b/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
@@ -29,6 +29,7 @@ metadata {
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200-Sgb", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-RZHAC", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019"
 	}
--- a/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
+++ b/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
@@ -27,7 +27,6 @@ metadata {
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
    }
    tiles(scale: 2) {
Author	SHA1	Message	Date
Vinay Rao	f95319ce59	Merge pull request #2035 from SmartThingsCommunity/staging Rolling down staging to master	2017-05-23 13:51:00 -07:00
Vinay Rao	52427802a8	Merge pull request #2033 from SmartThingsCommunity/production Rolling down production to staging	2017-05-23 13:49:12 -07:00
Vinay Rao	72bb22a4b8	ICP-1051 Moving samjin outlet to smartpower outlet DTH (#2032 ) * ICP-1051 Moving samjin outlet to smartpower outlet DTH	2017-05-23 12:19:09 -07:00
Vinay Rao	1263a6e2e1	Merge pull request #2002 from twack/ocf-update-aeon-siren ICP-950 ocf-update-aeon-siren	2017-05-18 07:52:00 -07:00
Vinay Rao	a4d9cd51a3	Merge pull request #2005 from SmartThingsCommunity/staging Rolling up staging to production	2017-05-16 14:37:45 -07:00
twack	92e1586fa6	ocf-update-aeon-siren	2017-05-15 20:13:47 -07:00