Merge pull request #1246 from skt123/osram

CHF-356 : Modifying Readme for Core Devices

devicetypes/smartthings/cree-bulb.src/README.md

@@ -23,10 +23,8 @@ Works with:
 
 ## Device Health
 
-A Category C6 Connected Cree LED Bulb with maxReportTime of 10 min.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*10 = 20 min
+A Category C6 Connected Cree LED Bulb with maxReportTime of 5 mins.
+Check-in interval = 12 mins
 
 ## Troubleshooting
 

devicetypes/smartthings/smartpower-outlet.src/README.md

@@ -23,10 +23,10 @@ Works with:
 
 ## Device Health
 
-A Category C1 smart power outlet with maxReportTime of 10 min.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
+A Category C1 smart power outlet with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
 This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*10 = 20 min
+Check-in interval = 12 mins
 
 ## Troubleshooting
 

devicetypes/smartthings/smartsense-moisture-sensor.src/README.md

@@ -23,10 +23,10 @@ Works with:
 
 ## Device Health
 
-A Category C2 moisture sensor with maxReportTime of 1 hr.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
+A Category C2 moisture sensor with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
 This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*60 = 120 min
+Check-in interval = 12 mins
 
 ## Battery Specification
 

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

@@ -180,9 +180,9 @@ private Map parseIasMessage(String description) {
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
+		return celsius
 	} else {
-		return Math.round(celsiusToFahrenheit(celsius))
+		return celsiusToFahrenheit(celsius) as Integer
 	}
 }
 

devicetypes/smartthings/smartsense-motion-sensor.src/README.md

@@ -22,10 +22,10 @@ Works with:
 
 ## Device Health
 
-A Category C2 motion sensor with maxReportTime of 1 hr.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
+A Category C2 motion sensor with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime.
 This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*60 = 120 min
+Check-in interval = 12 mins
 
 ## Battery Specification
 

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

@@ -194,9 +194,9 @@ private Map parseIasMessage(String description) {
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
+		return celsius
 	} else {
-		return Math.round(celsiusToFahrenheit(celsius))
+		return celsiusToFahrenheit(celsius) as Integer
 	}
 }
 

devicetypes/smartthings/smartsense-multi-sensor.src/README.md

@@ -26,10 +26,10 @@ Works with:
 
 ## Device Health
 
-A Category C2 multi sensor with maxReportTime of 1 hr.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
+A Category C2 multi sensor with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
 This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*60 = 120 min
+Check-in interval = 12 mins
 
 ## Battery Specification
 

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

@@ -261,9 +261,9 @@ def updated() {
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
+		return celsius
 		} else {
-			return Math.round(celsiusToFahrenheit(celsius))
+			return celsiusToFahrenheit(celsius) as Integer
 		}
 	}
 

devicetypes/smartthings/smartsense-open-closed-sensor.src/README.md

@@ -24,10 +24,10 @@ Works with:
 
 ## Device Health
 
-A Category C2 open/closed sensor with maxReportTime of 1 hr.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
+A Category C2 open/closed sensor with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
 This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*60 = 120 min
+Check-in interval = 12 mins
 
 ## Battery Specification
 

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/README.md

@@ -24,10 +24,10 @@ Works with:
 
 ## Device Health
 
-A Category C2 SmartSense Temp/Humidity Sensor with maxReportTime of 1 hr.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
+A Category C2 SmartSense Temp/Humidity Sensor with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
 This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 2*60 = 120 min
+Check-in interval = 12 mins
 
 ## Battery Specification
 

devicetypes/smartthings/zigbee-dimmer.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/zigbee-dimmer.src/README.md

@@ -0,0 +1,36 @@
+# OSRAM Lightify LED On/Off/Dim
+
+
+
+Works with: 
+
+* [OSRAM Lightify LED On/Off/Dim](https://shop.smartthings.com/#!/products/osram-led-smart-bulb-on-off-dim)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Actuator** - represents that a Device has commands
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Refresh** - _refresh()_ command for status updates
+* **Switch** - can detect state (possible values: on/off)
+* **Switch Level** - represents current light level, usually 0-100 in percent
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+A Category C1 Zigbee dimmer with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 12 mins
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+Other troubleshooting tips are listed as follows:
+* [Troubleshooting:](https://support.smartthings.com/hc/en-us/articles/207191763-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-On-Off-Dim)

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

@@ -13,7 +13,7 @@
  */
 
 metadata {
-    definition (name: "ZigBee Dimmer", namespace: "smartthings", author: "SmartThings") {
+    definition (name: "ZigBee Dimmer", namespace: "smartthings", author: "SmartThings", category: "C1") {
         capability "Actuator"
         capability "Configuration"
         capability "Refresh"

devicetypes/smartthings/zigbee-rgbw-bulb.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/zigbee-rgbw-bulb.src/README.md

@@ -0,0 +1,42 @@
+# OSRAM LIGHTIFY LED RGBW Bulb
+
+
+
+Works with: 
+
+* [OSRAM LIGHTIFY LED RGBW Bulb](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Actuator** - It represents that a device has commands.
+* **Color Control** - It represents that the color attributes of a device can be controlled (hue, saturation, color value).
+* **Color Temperature** - It represents color temperature capability measured in degree Kelvin.
+* **Polling** - It represents that a device can be polled.
+* **Switch** - can detect state (possible values: on/off)
+* **Switch Level** - can detect current light level (0-100 in percent)
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Refresh** - _refresh()_ command for status updates
+* **Health Check** - indicates ability to get device health notifications
+
+
+## Device Health
+
+A Category C6 OSRAM LIGHTIFY LED RGBW Bulb with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 12 mins
+
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+It may also happen that you need to reset the device.
+Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
+* [Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW)

devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

@@ -17,7 +17,7 @@
  */
 
 metadata {
-    definition (name: "ZigBee RGBW Bulb", namespace: "smartthings", author: "SmartThings") {
+    definition (name: "ZigBee RGBW Bulb", namespace: "smartthings", author: "SmartThings", category: "C6") {
 
         capability "Actuator"
         capability "Color Control"

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/README.md

@@ -0,0 +1,37 @@
+# OSRAM Lightify Tunable 60 White
+
+
+
+Works with: 
+
+* [OSRAM Lightify Tunable 60 White](http://www.osram.com/osram_com/tools-and-services/tools/lightify---smart-connected-light/lightify-for-home---what-is-light-to-you/lightify-products/lightify-classic-a60-tunable-white/index.jsp)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Actuator** - represents that a Device has commands
+* **Color Temperature** - represents color temperature, measured in degrees Kelvin.
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated.
+* **Refresh** - _refresh()_ command for status updates
+* **Switch** - can detect state (possible values: on/off)
+* **Switch Level** - represents current light level, usually 0-100 in percent
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+A Category C1 OSRAM Lightify Tunable 60 White with maxReportTime of 5 mins.
+Check-in interval is double the value of maxReportTime. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 12 mins
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+Other troubleshooting tips are listed as follows:
+* [Troubleshooting:](https://support.smartthings.com/hc/en-us/articles/204576454-OSRAM-LIGHTIFY-Tunable-White-60-Bulb)

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy

@@ -17,7 +17,7 @@
  */
 
 metadata {
-    definition (name: "ZigBee White Color Temperature Bulb", namespace: "smartthings", author: "SmartThings") {
+    definition (name: "ZigBee White Color Temperature Bulb", namespace: "smartthings", author: "SmartThings", category: "C1") {
 
         capability "Actuator"
         capability "Color Temperature"

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -83,7 +83,7 @@ def bridgeDiscovery(params=[:])
 
 	return dynamicPage(name:"bridgeDiscovery", title:"Discovery Started!", nextPage:"bridgeBtnPush", refreshInterval:refreshInterval, uninstall: true) {
 		section("Please wait while we discover your Hue Bridge. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options, submitOnChange: true
+			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options
 		}
 	}
 }
@@ -333,9 +333,9 @@ def bulbListHandler(hub, data = "") {
     def bridge = null
 	if (selectedHue) {
 		bridge = getChildDevice(selectedHue)
-		bridge?.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
 	}
-	msg = "${bulbs.size()} bulbs found. ${bulbs}"
+    bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
+    msg = "${bulbs.size()} bulbs found. ${bulbs}"
 	return msg
 }
 
@@ -490,25 +490,24 @@ def ssdpBridgeHandler(evt) {
 		def host = ip + ":" + port
 		log.debug "Device ($parsedEvent.mac) was already found in state with ip = $host."
 		def dstate = bridges."${parsedEvent.ssdpUSN.toString()}"
-		def dniReceived = "${parsedEvent.mac}"
-		def currentDni = dstate.mac
-		def d = getChildDevice(dniReceived)
+		def dni = "${parsedEvent.mac}"
+		def d = getChildDevice(dni)
 		def networkAddress = null
 		if (!d) {
-			// There might be a mismatch between bridge DNI and the actual bridge mac address, correct that
-			log.debug "Bridge with $dniReceived not found"
-			def bridge = childDevices.find { it.deviceNetworkId == currentDni }
-			if (bridge != null) {
-				log.warn "Bridge is set to ${bridge.deviceNetworkId}, updating to $dniReceived"
-				bridge.setDeviceNetworkId("${dniReceived}")
-				dstate.mac = dniReceived
-				// Check to see if selectedHue is a valid bridge, otherwise update it
-				def isSelectedValid = bridges?.find {it.value?.mac == selectedHue}
-				if (isSelectedValid == null) {
-					log.warn "Correcting selectedHue in state"
-					app.updateSetting("selectedHue", dniReceived)
+			childDevices.each {
+				if (it.getDeviceDataByName("mac")) {
+					def newDNI = "${it.getDeviceDataByName("mac")}"
+					d = it
+					if (newDNI != it.deviceNetworkId) {
+						def oldDNI = it.deviceNetworkId
+						log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
+						it.setDeviceNetworkId("${newDNI}")
+						if (oldDNI == selectedHue) {
+							app.updateSetting("selectedHue", newDNI)
+						}
+						doDeviceSync()
+					}
 				}
-				doDeviceSync()
 			}
 		} else {
 			updateBridgeStatus(d)
@@ -526,18 +525,6 @@ def ssdpBridgeHandler(evt) {
 				d.sendEvent(name:"networkAddress", value: host)
 				d.updateDataValue("networkAddress", host)
 			}
-			if (dstate.mac != dniReceived) {
-				log.warn "Correcting bridge mac address in state"
-				dstate.mac = dniReceived
-			}
-			if (selectedHue != dniReceived) {
-				// Check to see if selectedHue is a valid bridge, otherwise update it
-				def isSelectedValid = bridges?.find {it.value?.mac == selectedHue}
-				if (isSelectedValid == null) {
-					log.warn "Correcting selectedHue in state"
-					app.updateSetting("selectedHue", dniReceived)
-				}
-			}
 		}
 	}
 }
@@ -963,14 +950,6 @@ private handleCommandResponse(body) {
  * @return empty array
  */
 private handlePoll(body) {
-	// Used to track "unreachable" time
-	// Device is considered "offline" if it has been in the "unreachable" state for
-	// 11 minutes (e.g. two poll intervals)
-	// Note, Hue Bridge marks devices as "unreachable" often even when they accept commands
-	Calendar time11 = Calendar.getInstance()
-	time11.add(Calendar.MINUTE, -11)
-	Calendar currentTime = Calendar.getInstance()
-
 	def bulbs = getChildDevices()
 	for (bulb in body) {
 		def device = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}
@@ -980,10 +959,7 @@ private handlePoll(body) {
 					// light just came back online, notify device watch
 					def lastActivity = now()
 					device.sendEvent(name: "deviceWatch-status", value: "ONLINE", description: "Last Activity is on ${new Date((long) lastActivity)}", displayed: false, isStateChange: true)
-					log.debug "$device is Online"
 				}
-				// Mark light as "online"
-				state.bulbs[bulb.key]?.unreachableSince = null
 				state.bulbs[bulb.key]?.online = true
 
 				// If user just executed commands, then do not send events to avoid confusing the turning on/off state
@@ -993,18 +969,9 @@ private handlePoll(body) {
 					sendColorEvents(device, bulb.value?.state?.xy, bulb.value?.state?.hue, bulb.value?.state?.sat, bulb.value?.state?.ct, bulb.value?.state?.colormode)
 				}
 			} else {
-				if (state.bulbs[bulb.key]?.unreachableSince == null) {
-					// Store the first time where device was reported as "unreachable"
-					state.bulbs[bulb.key]?.unreachableSince = currentTime.getTimeInMillis()
-				} else if (state.bulbs[bulb.key]?.online) {
-					// Check if device was "unreachable" for more than 11 minutes and mark "offline" if necessary
-					if (state.bulbs[bulb.key]?.unreachableSince < time11.getTimeInMillis()) {
-						log.warn "$device went Offline"
-						state.bulbs[bulb.key]?.online = false
-						device.sendEvent(name: "DeviceWatch-DeviceOffline", value: "offline", displayed: false, isStateChange: true)
-					}
-				}
-				log.warn "$device may not reachable by Hue bridge"
+				state.bulbs[bulb.key]?.online = false
+				log.warn "$device is not reachable by Hue bridge"
+				device.sendEvent(name: "DeviceWatch-DeviceOffline", value: "offline", displayed: false, isStateChange: true)
 			}
 		}
 	}
@@ -1039,6 +1006,9 @@ def hubVerification(bodytext) {
 def on(childDevice) {
 	log.debug "Executing 'on'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
 	updateInProgress()
 	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [on: true])
@@ -1048,6 +1018,9 @@ def on(childDevice) {
 def off(childDevice) {
 	log.debug "Executing 'off'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
 	updateInProgress()
 	createSwitchEvent(childDevice, "off")
 	put("lights/$id/state", [on: false])
@@ -1057,6 +1030,9 @@ def off(childDevice) {
 def setLevel(childDevice, percent) {
 	log.debug "Executing 'setLevel'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 1 - 254
     def level
@@ -1081,6 +1057,10 @@ def setLevel(childDevice, percent) {
 def setSaturation(childDevice, percent) {
 	log.debug "Executing 'setSaturation($percent)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
+
 	updateInProgress()
 	// 0 - 254
 	def level = Math.min(Math.round(percent * 254 / 100), 254)
@@ -1093,6 +1073,9 @@ def setSaturation(childDevice, percent) {
 def setHue(childDevice, percent) {
 	log.debug "Executing 'setHue($percent)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 0 - 65535
 	def level =	Math.min(Math.round(percent * 65535 / 100), 65535)
@@ -1105,6 +1088,9 @@ def setHue(childDevice, percent) {
 def setColorTemperature(childDevice, huesettings) {
 	log.debug "Executing 'setColorTemperature($huesettings)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 153 (6500K) to 500 (2000K)
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings)
@@ -1116,6 +1102,9 @@ def setColorTemperature(childDevice, huesettings) {
 def setColor(childDevice, huesettings) {
     log.debug "Executing 'setColor($huesettings)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 
     def value = [:]
@@ -1131,7 +1120,7 @@ def setColor(childDevice, huesettings) {
 			value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
 		if (huesettings.saturation != null)
 			value.sat = Math.min(Math.round(huesettings.saturation * 254 / 100), 254)
-	} else if (huesettings.hex != null) {
+	} else if (huesettings.hex != null && false) {
 		// For now ignore model to get a consistent color if same color is set across multiple devices
 		// def model = state.bulbs[getId(childDevice)]?.modelid
 		// value.xy = calculateXY(huesettings.hex, model)
@@ -1235,7 +1224,7 @@ private getBridgeIP() {
     	if (d) {
         	if (d.getDeviceDataByName("networkAddress"))
             	host =  d.getDeviceDataByName("networkAddress")
-        else
+            else
         		host = d.latestState('networkAddress').stringValue
         }
         if (host == null || host == "") {
@@ -1674,7 +1663,7 @@ private boolean checkPointInLampsReach(p, colorPoints) {
 }
 
 /**
- * Converts an RGB color in hex to HSV/HSB.
+ * Converts an RGB color in hex to HSV.
  * Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space.
  *
  * @param colorStr color value in hex (#ff03d3)
@@ -1684,32 +1673,32 @@ private boolean checkPointInLampsReach(p, colorPoints) {
 def hexToHsv(colorStr){
 	def r = Integer.valueOf( colorStr.substring( 1, 3 ), 16 ) / 255
 	def g = Integer.valueOf( colorStr.substring( 3, 5 ), 16 ) / 255
-	def b = Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) / 255
+	def b = Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) / 255;
 
 	def max = Math.max(Math.max(r, g), b)
 	def min = Math.min(Math.min(r, g), b)
 
-	def h, s, v = max
+	def h, s, v = max;
 
-	def d = max - min
-	s = max == 0 ? 0 : d / max
+	def d = max - min;
+	s = max == 0 ? 0 : d / max;
 
 	if(max == min){
-		h = 0
+		h = 0;
 	}else{
 		switch(max){
-			case r: h = (g - b) / d + (g < b ? 6 : 0); break
-			case g: h = (b - r) / d + 2; break
-			case b: h = (r - g) / d + 4; break
+			case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+			case g: h = (b - r) / d + 2; break;
+			case b: h = (r - g) / d + 4; break;
 		}
 		h /= 6;
 	}
 
-	return [Math.round(h * 100), Math.round(s * 100), Math.round(v * 100)]
+	return [(h * 100).round(), (s * 100).round(), (v * 100).round()];
 }
 
 /**
- * Converts HSV/HSB color to RGB in hex.
+ * Converts HSV color to RGB in hex.
  * Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space.
  *
  * @param  hue hue 0-100
@@ -1724,11 +1713,11 @@ def hsvToHex(hue, sat, value = 100){
 	def s = sat / 100
 	def v = value / 100
 
-	def i = Math.floor(h * 6)
-	def f = h * 6 - i
-	def p = v * (1 - s)
-	def q = v * (1 - f * s)
-	def t = v * (1 - (1 - f) * s)
+	def i = Math.floor(h * 6);
+	def f = h * 6 - i;
+	def p = v * (1 - s);
+	def q = v * (1 - f * s);
+	def t = v * (1 - (1 - f) * s);
 
 	switch (i % 6) {
 		case 0:
@@ -1764,9 +1753,9 @@ def hsvToHex(hue, sat, value = 100){
 	}
 
 	// Converting float components to int components.
-	def r1 = String.format("%02X", (int) (r * 255.0f))
-	def g1 = String.format("%02X", (int) (g * 255.0f))
-	def b1 = String.format("%02X", (int) (b * 255.0f))
+	def r1 = String.format("%02X", (int) (r * 255.0f));
+	def g1 = String.format("%02X", (int) (g * 255.0f));
+	def b1 = String.format("%02X", (int) (b * 255.0f));
 
 	return "#$r1$g1$b1"
 }