APIv6 (#129)

* Update auth and command flow for V6 * Add support for multiple accounts * Handle bad 1% battery sensors * Update README.md
brbeaird · Sep 10, 2021 · b0f487e · b0f487e
1 parent dde5251
commit b0f487e
Show file tree

Hide file tree

Showing 25 changed files with 473 additions and 406 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.0.0 (2021-09-09)
+
+### Changed
+ - Update to support MyQ API v6
+
 ## 3.1.7 (2021-08-02)
 
 ### Fixed

diff --git a/README.md b/README.md
diff --git a/devicetypes/brbeaird/myq-garage-door-opener-nosensor.src/CHANGELOG.md b/devicetypes/brbeaird/myq-garage-door-opener-nosensor.src/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.0.0 (2021-09-09)
+
+### Changed
+ - Update to support MyQ API v6
+
 ## 3.2.0 (2021-08-04)
 
 ### Changed

diff --git a/...types/brbeaird/myq-garage-door-opener-nosensor.src/myq-garage-door-opener-nosensor.groovy b/...types/brbeaird/myq-garage-door-opener-nosensor.src/myq-garage-door-opener-nosensor.groovy
@@ -24,6 +24,7 @@ metadata {
         attribute "OpenButton", "string"
         attribute "CloseButton", "string"
         attribute "myQDeviceId", "string"
+        attribute "myQAccountId", "string"
 
         command "open"
         command "close"
@@ -58,20 +59,20 @@ metadata {
 
 def open()  {
     openPrep()
-    parent.sendCommand(getMyQDeviceId(), "open")
+    parent.sendDoorCommand(getMyQDeviceId(), device.currentState("myQAccountId").value, "open")
 }
 def close() {
     closePrep()
-    parent.sendCommand(getMyQDeviceId(), "close")
+    parent.sendDoorCommand(getMyQDeviceId(), device.currentState("myQAccountId").value, "close")
 }
 
 def sendOpen()  {
     openPrep()
-    parent.sendCommand(getMyQDeviceId(), "open")
+    parent.sendDoorCommand(getMyQDeviceId(), device.currentState("myQAccountId").value,"open")
 }
 def sendClose() {
     closePrep()
-    parent.sendCommand(getMyQDeviceId(), "close")
+    parent.sendDoorCommand(getMyQDeviceId(), device.currentState("myQAccountId").value,"close")
 }
 
 def openPrep(){
@@ -102,15 +103,16 @@ def getMyQDeviceId(){
     }
 }
 
-def updateMyQDeviceId(Id) {
-	log.debug "Setting MyQID to ${Id}"
+def updateMyQDeviceId(Id, account) {
+	log.debug "Setting MyQID to ${Id}, accountId to ${account}"
     sendEvent(name: "myQDeviceId", value: Id, display: true , displayed: true)
+    sendEvent(name: "myQAccountId", value: account, display: true , displayed: true)
 }
 
 def log(msg){
 	log.debug msg
 }
 
 def showVersion(){
-	return "3.2.0"
+	return "4.0.0"
 }
diff --git a/devicetypes/brbeaird/myq-garage-door-opener.src/CHANGELOG.md b/devicetypes/brbeaird/myq-garage-door-opener.src/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.0.0 (2021-09-09)
+
+### Changed
+ - Update to support MyQ API v6
+
 ## 3.2.2 (2021-08-04)
 
 ### Changed

diff --git a/devicetypes/brbeaird/myq-garage-door-opener.src/myq-garage-door-opener.groovy b/devicetypes/brbeaird/myq-garage-door-opener.src/myq-garage-door-opener.groovy
@@ -41,6 +41,7 @@ metadata {
         attribute "OpenButton", "string"
         attribute "CloseButton", "string"
         attribute "myQDeviceId", "string"
+        attribute "myQAccountId", "string"
 
 		command "updateDeviceStatus", ["string"]
 		command "updateDeviceLastActivity", ["number"]
@@ -102,14 +103,12 @@ metadata {
 }
 
 def on() {
-    log.debug "Turning door on!"
-    open()
-    sendEvent(name: "switch", value: "on", isStateChange: true, display: true, displayed: true)
+    if (open())
+    	sendEvent(name: "switch", value: "on", isStateChange: true, display: true, displayed: true)
 }
 def off() {
-    log.debug "Turning door off!"
-    close()
-	sendEvent(name: "switch", value: "off", isStateChange: true, display: true, displayed: true)
+    if (close())
+		sendEvent(name: "switch", value: "off", isStateChange: true, display: true, displayed: true)
 }
 
 def push() {
@@ -123,17 +122,14 @@ def push() {
 }
 
 def open()  {
-	log.debug "Garage door open command called."
     parent.notify("Garage door open command called.")
-    updateDeviceStatus("opening")
-    parent.sendCommand(getMyQDeviceId(), "open")
-
+    if (parent.sendDoorCommand(getMyQDeviceId(), device.currentState("myQAccountId").value, "open"))
+    	updateDeviceStatus("opening")
     runIn(20, refresh, [overwrite: true])	//Force a sync with tilt sensor after 20 seconds
 }
 def close() {
-	log.debug "Garage door close command called."
     parent.notify("Garage door close command called.")
-	parent.sendCommand(getMyQDeviceId(), "close")
+	parent.sendDoorCommand(getMyQDeviceId(), device.currentState("myQAccountId").value, "close")
 //	updateDeviceStatus("closing")			// Now handled in the parent (in case we have an Acceleration sensor, we can handle "waiting" state)
     runIn(30, refresh, [overwrite: true]) //Force a sync with tilt sensor after 30 seconds
 }
@@ -236,7 +232,7 @@ def updateDeviceSensor(sensor) {
 
 def updateSensorBattery(batteryValue) {
 	def newBattery = batteryValue
-    if (!batteryValue){
+    if (!batteryValue || batteryValue == 1){
     	newBattery = 100
     }
     sendEvent(name: "battery", value: newBattery, display: true, displayed: true)
@@ -251,15 +247,16 @@ def updateDeviceMoving(moving) {
 	sendEvent(name: "doorMoving", value: moving, display: false , displayed: false)
 }
 
-def updateMyQDeviceId(Id) {
-	log.debug "Setting MyQID to ${Id}"
+def updateMyQDeviceId(Id, account) {
+	log.debug "Setting MyQID to ${Id}, accountId to ${account}"
     sendEvent(name: "myQDeviceId", value: Id, display: true , displayed: true)
+    sendEvent(name: "myQAccountId", value: account, display: true , displayed: true)
 }
 
 def log(msg){
 	log.debug msg
 }
 
 def showVersion(){
-	return "3.2.2"
+	return "4.0.0"
 }
diff --git a/devicetypes/brbeaird/myq-light-controller.src/CHANGELOG.md b/devicetypes/brbeaird/myq-light-controller.src/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.0.0 (2021-09-09)
+
+### Changed
+ - Update to support MyQ API v6
+
 ## 3.1.1 (2019-10-21)
 
 ### Fixed

diff --git a/devicetypes/brbeaird/myq-light-controller.src/myq-light-controller.groovy b/devicetypes/brbeaird/myq-light-controller.src/myq-light-controller.groovy
@@ -21,6 +21,7 @@ metadata {
 		capability "Sensor"
 		capability "Switch"
         attribute "myQDeviceId", "string"
+        attribute "myQAccountId", "string"
 
 		command "updateDeviceStatus", ["string"]
 	}
@@ -41,14 +42,14 @@ metadata {
 
 def on() {
 	log.debug "Light turned on"
-    parent.sendCommand(getMyQDeviceId(), "turnon")
-    updateDeviceStatus("on")
+    if (parent.sendLampCommand(getMyQDeviceId(), device.currentState("myQAccountId")?.value,"on"))
+    	updateDeviceStatus("on")
 
 }
 def off() {
 	log.debug "Light turned off"
-    parent.sendCommand(getMyQDeviceId(), "turnoff")
-    updateDeviceStatus("off")
+    if (parent.sendLampCommand(getMyQDeviceId(), device.currentState("myQAccountId")?.value,"off"))
+    	updateDeviceStatus("off")
 }
 
 def updateDeviceStatus(status) {
@@ -75,11 +76,12 @@ def getMyQDeviceId(){
     }
 }
 
-def updateMyQDeviceId(Id) {
-	log.debug "Setting MyQID to ${Id}"
+def updateMyQDeviceId(Id, account) {
+	log.debug "Setting MyQID to ${Id}, accountId to ${account}"
     sendEvent(name: "myQDeviceId", value: Id, display: true , displayed: true)
+    sendEvent(name: "myQAccountId", value: account, display: true , displayed: true)
 }
 
 def showVersion(){
-	return "3.1.1"
+	return "4.0.0"
 }
diff --git a/icons/MyQBlue.png b/icons/MyQBlue.png
diff --git a/icons/SmartAppList.png b/icons/SmartAppList.png
diff --git a/icons/SmartAppSettingLink.png b/icons/SmartAppSettingLink.png
diff --git a/icons/SmartAppToken.png b/icons/SmartAppToken.png
diff --git a/icons/TokenGenerator.png b/icons/TokenGenerator.png
diff --git a/icons/mobileAppDevice.jpg b/icons/mobileAppDevice.jpg
diff --git a/icons/mobileAppSelection.jpg b/icons/mobileAppSelection.jpg
diff --git a/icons/mobileAppSensors.jpg b/icons/mobileAppSensors.jpg
diff --git a/installerManifest.json b/installerManifest.json
@@ -19,7 +19,7 @@
             "iconUrl": "https://raw.githubusercontent.com/brbeaird/SmartThings_MyQ/master/icons/myq.png",
             "published": true,
             "oAuth": true,
-            "version": "3.1.7",
+            "version": "4.0.0",
             "appSettings": {},
             "appUrl": "smartapps/brbeaird/myq-lite.src/myq-lite.groovy"
         },
@@ -32,7 +32,7 @@
             "oAuth": false,
             "appUrl": "devicetypes/brbeaird/myq-garage-door-opener.src/myq-garage-door-opener.groovy",
             "appSettings": {},
-            "version": "3.2.2",
+            "version": "4.0.0",
             "optional": false
         },
         {
@@ -42,7 +42,7 @@
 	        "oAuth": false,
 	        "appUrl": "devicetypes/brbeaird/myq-garage-door-opener-nosensor.src/myq-garage-door-opener-nosensor.groovy",
 	        "appSettings": {},
-	        "version": "3.2.0",
+	        "version": "4.0.0",
 	        "optional": false
         },
         {
@@ -62,7 +62,7 @@
 	        "oAuth": false,
 	        "appUrl": "devicetypes/brbeaird/myq-light-controller.src/myq-light-controller.groovy",
 	        "appSettings": {},
-	        "version": "3.1.1",
+	        "version": "4.0.0",
 	        "optional": true
 	    },
 	    {

diff --git a/myQTokenGenerator/.gitignore b/myQTokenGenerator/.gitignore
@@ -0,0 +1 @@
+/node_modules