Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions homeassistant/components/lock/zwave.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
'9': 'Deadbolt Jammed',
'18': 'Locked with Keypad by user ',
'19': 'Unlocked with Keypad by user ',
'21': 'Manually Locked by ',
'22': 'Manually Unlocked by Key or Inside thumb turn',
'21': 'Manually Locked ',
'22': 'Manually Unlocked ',
'24': 'Locked by RF',
'25': 'Unlocked by RF',
'27': 'Auto re-lock',
Expand All @@ -69,8 +69,8 @@
}

MANUAL_LOCK_ALARM_LEVEL = {
'1': 'Key Cylinder or Inside thumb turn',
'2': 'Touch function (lock and leave)'
'1': 'by Key Cylinder or Inside thumb turn',
'2': 'by Touch function (lock and leave)'
}

TAMPER_ALARM_LEVEL = {
Expand Down
2 changes: 1 addition & 1 deletion tests/components/lock/test_zwave.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def test_lock_alarm_type(mock_openzwave):
values.alarm_type.data = 21
value_changed(values.alarm_type)
assert device.device_state_attributes[zwave.ATTR_LOCK_STATUS] == \
'Manually Locked by None'
'Manually Locked None'

values.alarm_type.data = 18
value_changed(values.alarm_type)
Expand Down