Merge pull request #919 from SmartThingsCommunity/staging

Rolling up staging to production for release May 24
Merge pull request #918 from SmartThingsCommunity/production
2026-03-10 21:03:04 +00:00 · 2016-05-24 13:59:11 -07:00 · 2016-05-24 13:51:26 -07:00 · 2016-05-23 16:05:09 -07:00 · 2016-05-23 14:38:40 -07:00 · 2016-05-23 14:22:40 -07:00
2 changed files with 10 additions and 3 deletions
--- a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
+++ b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
@@ -138,6 +138,7 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	log.debug "productTypeId:    ${cmd.productTypeId}"
 	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
 	updateDataValue("MSR", msr)
+	updateDataValue("manufacturer", cmd.manufacturerName)
 	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }

--- a/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy
+++ b/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy
@@ -95,11 +95,17 @@ def zwaveEvent(physicalgraph.zwave.commands.hailv1.Hail cmd) {
 }

 def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
-	if (state.manufacturer != cmd.manufacturerName) {
-		updateDataValue("manufacturer", cmd.manufacturerName)
-	}
+	log.debug "manufacturerId:   ${cmd.manufacturerId}"
+	log.debug "manufacturerName: ${cmd.manufacturerName}"
+	log.debug "productId:        ${cmd.productId}"
+	log.debug "productTypeId:    ${cmd.productTypeId}"
+	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
+	updateDataValue("MSR", msr)
+	updateDataValue("manufacturer", cmd.manufacturerName)
+	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }

+
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
 	[:]
Author	SHA1	Message	Date
Vinay Rao	02d9963fab	Merge pull request #919 from SmartThingsCommunity/staging Rolling up staging to production for release May 24	2016-05-24 13:59:11 -07:00
Vinay Rao	f131fb71cf	Merge pull request #918 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-05-24 13:51:26 -07:00
Vinay Rao	9c27ed6cb7	Merge pull request #913 from SmartThingsCommunity/revert-904-revert-901-DVCSMP-1739-revert-untested-code Revert "DVCSMP-1739 Revert "Undo DVCSMP-1739 Revert "make sure reformat the storeGraphData"""	2016-05-23 16:05:09 -07:00
Dwight Liu	35edaa19c7	Revert "DVCSMP-1739 Revert "Undo DVCSMP-1739 Revert "make sure reformat the storeGraphData"""	2016-05-23 14:38:40 -07:00
Vinay Rao	dc09201866	Merge pull request #912 from larsfinander/DVCSMP-1770_Add_MSR_to_zwave-switch_staging DVCSMP-1770 Add MSR to zwave-switch and configure at pairing	2016-05-23 14:22:40 -07:00
Lars Finander	6afcbf8f70	DVCSMP-1770 Add MSR to zwave-switch and configure at pairing -Make ZWave switch and Dimmer switch behave the same and save MSR and manufacturer name in data	2016-05-23 14:13:10 -07:00
Vinay Rao	d73f4c2ded	Merge pull request #904 from SmartThingsCommunity/revert-901-DVCSMP-1739-revert-untested-code DVCSMP-1739 Revert "Undo DVCSMP-1739 Revert "make sure reformat the storeGraphData""	2016-05-17 10:01:27 -07:00
Vinay Rao	13a056ec8d	Revert "Undo DVCSMP-1739 Revert "make sure reformat the storeGraphData""	2016-05-17 09:59:03 -07:00