Merge tag 'v5.1.4a'

mmorey79 · Jun 18, 2017 · 84d196f · 84d196f
2 parents 3a2b76d + d8cdfb9
commit 84d196f
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 116 deletions.
diff --git a/Data/appData.json b/Data/appData.json
@@ -24,25 +24,25 @@
         "setupVersion": 2,
         "versions": {
             "app": {
-                "ver": "5.1.3"
+                "ver": "5.1.4"
             },
             "autoapp": {
                 "ver": "5.1.3"
             },
             "thermostat": {
-                "ver": "5.1.1"
+                "ver": "5.1.2"
             },
             "protect": {
-                "ver": "5.1.0"
+                "ver": "5.1.1"
             },
             "camera": {
-                "ver": "5.1.0"
+                "ver": "5.1.1"
             },
             "presence": {
-                "ver": "5.1.0"
+                "ver": "5.1.1"
             },
             "weather": {
-                "ver": "5.1.0"
+                "ver": "5.1.1"
             }
         }
     },

diff --git a/Data/changelog_cam.txt b/Data/changelog_cam.txt
@@ -1,3 +1,9 @@
+<p style="font-size: 15px;"><strong>V5.1.1 (June 17th, 2017):</strong><p>
+<hr noshade>
+<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
+    <li><strong>UPDATED:</strong> Fixed command calls</li>
+</ul>
+<br>
 <p style="font-size: 15px;"><strong>V5.1.0 (June 5th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
@@ -15,27 +21,3 @@
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
     <li><strong>UPDATED:</strong> Removed capability that is not available (Notification) & optimizations</li>
 </ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.4 (May 1st, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Bug fixes to quiet logs</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.3 (April 25th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Bug fixes to devices with public url not being shared</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.2 (April 6th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Self healing Fix for Device Health getting stuck offline. (Takes a Couple Minutes to Repair)</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.1 (April 3rd, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Updated the logic to attempt a second data refresh 15 seconds after new install to initiate a check for the camera id</li>
-</ul>
diff --git a/Data/changelog_prot.txt b/Data/changelog_prot.txt
@@ -1,30 +1,17 @@
-<p style="font-size: 15px;"><strong>V5.1.0 (June 5th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> version number updated to match 5.1.x</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.3 (May 25th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Update Healthcheck parameters & remove false positives</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.2 (May 1st, 2017):</strong><p>
+<p style="font-size: 15px;"><strong>V5.1.1 (June 17th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Bug fixes to quiet logs</li>
+    <li><strong>UPDATED:</strong> Fixed command calls</li>
 </ul>
 <br>
-<p style="font-size: 15px;"><strong>V5.0.1 (April 6th, 2017):</strong><p>
+<p style="font-size: 15px;"><strong>V5.1.0 (June 5th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Self healing Fix for Device Health getting stuck offline. (Takes a Couple Minutes to Repair)</li>
+    <li><strong>UPDATED:</strong> version number updated to match 5.1.x</li>
 </ul>
 <br>
-<p style="font-size: 15px;"><strong>V5.0.0 (March 30th, 2017):</strong><p>
+<p style="font-size: 15px;"><strong>V5.0.3 (May 25th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>NEW: </strong> All-New HTML design with new icons to indicate the current alarm status</li>
-    <li><strong>NEW: </strong> Device now determines the power source (Wired or Battery) type based on it's check in habit's.</li>
+    <li><strong>UPDATED:</strong> Update Healthcheck parameters & remove false positives</li>
 </ul>
diff --git a/Data/changelog_tstat.txt b/Data/changelog_tstat.txt
@@ -1,3 +1,9 @@
+<p style="font-size: 15px;"><strong>V5.1.2 (June 17th, 2017):</strong><p>
+<hr noshade>
+<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
+    <li><strong>UPDATED:</strong> Fixed command calls</li>
+</ul>
+<br>
 <p style="font-size: 15px;"><strong>V5.1.0 (June 5th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
@@ -19,16 +25,3 @@
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
     <li><strong>FIXED:</strong> Update healthcheck parameters & remove false positives</li>
 </ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.4 (May 19th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>FIXED:</strong> Bug in Safety Temps being Exceeded.</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.3 (May 13th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Added operating state fan only.</li>
-    <li><strong>UPDATED:</strong> Added temperature settings min, max attributes.</li>
-</ul>
diff --git a/Data/changelog_weath.txt b/Data/changelog_weath.txt
@@ -1,36 +1,17 @@
-<p style="font-size: 15px;"><strong>V5.1.0 (June 5th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> version number updated to match 5.1.x</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.5 (May 25th, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Add precip_lasthour & solorradiation attributes</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.4 (May 1st, 2017):</strong><p>
-<hr noshade>
-<ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Bug fixes to quiet logs</li>
-</ul>
-<br>
-<p style="font-size: 15px;"><strong>V5.0.3 (April 21th, 2017):</strong><p>
+<p style="font-size: 15px;"><strong>V5.1.1 (June 17th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Added pressure and precipitation displays to Weather interface.</li>
+    <li><strong>UPDATED:</strong> Fixed command calls</li>
 </ul>
 <br>
-<p style="font-size: 15px;"><strong>V5.0.2 (April 6th, 2017):</strong><p>
+<p style="font-size: 15px;"><strong>V5.1.0 (June 5th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>UPDATED:</strong> Self healing Fix for Device Health getting stuck offline. (Takes a Couple Minutes to Repair)</li>
-    <li><strong>UPDATED:</strong> Fix for broken graphs (Sorry!!!)</li>
+    <li><strong>UPDATED:</strong> version number updated to match 5.1.x</li>
 </ul>
 <br>
-<p style="font-size: 15px;"><strong>V5.0.1 (March 31st, 2017):</strong><p>
+<p style="font-size: 15px;"><strong>V5.0.5 (May 25th, 2017):</strong><p>
 <hr noshade>
 <ul style="font-size: 12px; padding: 0 10px 0 10px; Margin: 0;">
-    <li><strong>FIXED: </strong> Found some arguments that needed to be modifed.</li>
+    <li><strong>UPDATED:</strong> Add precip_lasthour & solorradiation attributes</li>
 </ul>
diff --git a/devicetypes/tonesto7/nest-camera.src/nest-camera.groovy b/devicetypes/tonesto7/nest-camera.src/nest-camera.groovy
@@ -13,7 +13,7 @@ import groovy.time.TimeCategory
 
 preferences { }
 
-def devVer() { return "5.1.0" }
+def devVer() { return "5.1.1" }
 
 metadata {
 	definition (name: "${textDevName()}", author: "Anthony S.", namespace: "tonesto7") {
@@ -223,16 +223,16 @@ def parse(String description) {
 	LogAction("Parsing '${description}'", "debug")
 }
 
-def poll() {
+void poll() {
 	Logger("polling parent...")
 	parent.refresh(this)
 }
 
-def refresh() {
+void refresh() {
 	poll()
 }
 
-def cltLiveStreamStart() {
+void cltLiveStreamStart() {
 	//log.trace "video stream start()"
 	def url = getCamPlaylistURL().toString()
 	def imgUrl = "http://cdn.device-icons.smartthings.com/camera/[email protected]"

diff --git a/devicetypes/tonesto7/nest-presence.src/nest-presence.groovy b/devicetypes/tonesto7/nest-presence.src/nest-presence.groovy
@@ -11,7 +11,7 @@ import java.text.SimpleDateFormat
 
 preferences {  }
 
-def devVer() { return "5.1.0" }
+def devVer() { return "5.1.1" }
 
 // for the UI
 metadata {
@@ -170,7 +170,7 @@ def poll() {
 	parent.refresh(this)
 }
 
-def refresh() {
+void refresh() {
 	poll()
 }
 
@@ -394,7 +394,7 @@ void setPresence() {
 	}
 }
 
-def setAway() {
+void setAway() {
 	try {
 		log.trace "setAway()..."
 		parent.setStructureAway(this, "true")
@@ -406,7 +406,7 @@ def setAway() {
 	}
 }
 
-def setHome() {
+void setHome() {
 	try {
 		log.trace "setHome()..."
 		parent.setStructureAway(this, "false")

diff --git a/devicetypes/tonesto7/nest-protect.src/nest-protect.groovy b/devicetypes/tonesto7/nest-protect.src/nest-protect.groovy
@@ -11,7 +11,7 @@ import java.text.SimpleDateFormat
 
 preferences { }
 
-def devVer() { return "5.1.0" }
+def devVer() { return "5.1.1" }
 
 metadata {
 	definition (name: "${textDevName()}", author: "Anthony S.", namespace: "tonesto7") {
@@ -233,12 +233,12 @@ def parse(String description) {
 	LogAction("Parsing '${description}'")
 }
 
-def poll() {
+void poll() {
 	Logger("polling parent...")
 	parent.refresh(this)
 }
 
-def refresh() {
+void refresh() {
 	poll()
 }
 

diff --git a/devicetypes/tonesto7/nest-thermostat.src/nest-thermostat.groovy b/devicetypes/tonesto7/nest-thermostat.src/nest-thermostat.groovy
@@ -13,7 +13,7 @@
 import java.text.SimpleDateFormat
 import groovy.time.*
 
-def devVer() { return "5.1.1" }
+def devVer() { return "5.1.2" }
 
 // for the UI
 metadata {
@@ -418,12 +418,12 @@ def parse(String description) {
 	LogAction("Parsing '${description}'")
 }
 
-def poll() {
+void poll() {
 	Logger("Polling parent...")
-	poll()
+	refresh()
 }
 
-def refresh() {
+void refresh() {
 	pauseEvent("false")
 	parent.refresh(this)
 }
@@ -671,7 +671,7 @@ def isCodeUpdateAvailable(newVer, curVer) {
 	return result
 }
 
-def ecoDesc(val) {
+void ecoDesc(val) {
 	ecoDescEvent(val)
 }
 
@@ -981,7 +981,7 @@ def presenceEvent(presence) {
 	} else { LogAction("Presence - Present: (${pres}) | Original State: (${val}) | State Variable: ${state?.present}") }
 }
 
-def whoMadeChanges(autoType, desc, dt) {
+void whoMadeChanges(autoType, desc, dt) {
 	// log.debug "whoMadeChanges: $autoType: $desc | dt: $dt"
 	def curType = device?.currentState("whoMadeChanges")?.value
 	def curDesc = device?.currentState("whoMadeChangesDesc")?.value
@@ -1075,15 +1075,15 @@ def operatingStateEvent(opState=null) {
 	}
 
 	if(isStateChange(device, "nestThermostatOperatingState", operState.toString())) {
-		Logger("UPDATED | nestOperatingState is (${operState.toString().capitalize()}) | Original State: (${nesthvacState.toString().capitalize()})")
+		LogAction("UPDATED | nestOperatingState is (${operState.toString().capitalize()}) | Original State: (${nesthvacState.toString().capitalize()})")
 		sendEvent(name: 'nestThermostatOperatingState', value: operState, descriptionText: "Device is ${operState}")
 	} else {
 		LogAction("nestOperatingState is (${operState}) | Original State: (${nesthvacState})")
 	}
 
 	def hvacState = device.currentState("thermostatOperatingState")?.stringValue
 	if(isStateChange(device, "thermostatOperatingState", newoperState.toString())) {
-		Logger("UPDATED | OperatingState is (${newoperState.toString().capitalize()}) | Original State: (${hvacState.toString().capitalize()})")
+		LogAction("UPDATED | OperatingState is (${newoperState.toString().capitalize()}) | Original State: (${hvacState.toString().capitalize()})")
 		sendEvent(name: 'thermostatOperatingState', value: newoperState, descriptionText: "Device is ${newoperState}", displayed: true, isStateChange: true)
 	} else {
 		LogAction("OperatingState is (${newoperState}) | Original State: (${hvacState})")
@@ -1855,7 +1855,7 @@ def getHvacModes() {
 	return modesList
 }
 
-def changeMode() {
+void changeMode() {
 	//LogAction("changeMode..")
 	def currentMode = getHvacMode()
 	def lastTriedMode = currentMode ?: "off"

diff --git a/devicetypes/tonesto7/nest-weather.src/nest-weather.groovy b/devicetypes/tonesto7/nest-weather.src/nest-weather.groovy
@@ -12,7 +12,7 @@ import java.text.SimpleDateFormat
 
 preferences {  }
 
-def devVer() { return "5.1.0" }
+def devVer() { return "5.1.1" }
 
 metadata {
 	definition (name: "${textDevName()}", namespace: "tonesto7", author: "Anthony S.") {
@@ -288,7 +288,7 @@ def poll() {
 	parent.refresh(this)
 }
 
-def refresh() {
+void refresh() {
 	poll()
 }
 

diff --git a/smartapps/tonesto7/nest-manager.src/nest-manager.groovy b/smartapps/tonesto7/nest-manager.src/nest-manager.groovy
@@ -36,16 +36,16 @@ definition(
 
 include 'asynchttp_v1'
 
-def appVersion() { "5.1.3" }
-def appVerDate() { "6-14-2017" }
+def appVersion() { "5.1.4" }
+def appVerDate() { "6-17-2017" }
 def minVersions() {
 	return [
 		"automation":["val":513, "desc":"5.1.3"],
-		"thermostat":["val":510, "desc":"5.1.0"],
-		"protect":["val":510, "desc":"5.1.0"],
-		"presence":["val":510, "desc":"5.1.0"],
-		"weather":["val":510, "desc":"5.1.0"],
-		"camera":["val":510, "desc":"5.1.0"],
+		"thermostat":["val":512, "desc":"5.1.2"],
+		"protect":["val":511, "desc":"5.1.1"],
+		"presence":["val":511, "desc":"5.1.1"],
+		"weather":["val":511, "desc":"5.1.1"],
+		"camera":["val":511, "desc":"5.1.1"],
 		"stream":["val":100, "desc":"1.0.0"]
 	]
 }