From 18491c515f528975b1c4fe4263ff276cdb1d32a1 Mon Sep 17 00:00:00 2001
From: Matt White <m.w.white@gmail.com>
Date: Sat, 2 Mar 2019 20:29:16 -0600
Subject: [PATCH] Further Yale ZWave lock device mapping cleanup (#21128)

* Update device mapping for workarounds from zwave device db

* Update comment on old Yale vendor ID
---
 homeassistant/components/zwave/lock.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 homeassistant/components/zwave/lock.py

diff --git a/homeassistant/components/zwave/lock.py b/homeassistant/components/zwave/lock.py
old mode 100644
new mode 100755
index 7c0958e596a..ac7d7308333
--- a/homeassistant/components/zwave/lock.py
+++ b/homeassistant/components/zwave/lock.py
@@ -34,14 +34,27 @@ DEVICE_MAPPINGS = {
     # Kwikset 914TRL ZW500
     (0x0090, 0x440): WORKAROUND_DEVICE_STATE,
     (0x0090, 0x446): WORKAROUND_DEVICE_STATE,
-    # Yale YRD210, Yale YRD240
-    (0x0129, 0x0209): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
-    (0x0129, 0xAA00): WORKAROUND_DEVICE_STATE,
-    # Yale YRL220/YRD220
+    # Yale Locks
+    # Yale YRD210, YRD220, YRL220
     (0x0129, 0x0000): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
-    # Yale YRD120
+    # Yale YRD210, YRD220
+    (0x0129, 0x0209): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRL210, YRL220
+    (0x0129, 0x0409): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRD256
+    (0x0129, 0x0600): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRD110, YRD120
     (0x0129, 0x0800): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
-    # Yale YRD220 (as reported by adrum in PR #17386)
+    # Yale YRD446
+    (0x0129, 0x1000): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRL220
+    (0x0129, 0x2132): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    (0x0129, 0x3CAC): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRD210, YRD220
+    (0x0129, 0xAA00): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRD220
+    (0x0129, 0xFFFF): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRD220 (Older Yale products with incorrect vendor ID)
     (0x0109, 0x0000): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
     # Schlage BE469
     (0x003B, 0x5044): WORKAROUND_DEVICE_STATE | WORKAROUND_TRACK_MESSAGE,