Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ZHA to 0.0.54 #141447

Merged
merged 4 commits into from
Mar 26, 2025
Merged

Bump ZHA to 0.0.54 #141447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2fac92
Bump ZHA to 0.0.54
TheJulianJES Mar 26, 2025
59c6569
Add strings for v2 quirk entities
TheJulianJES Mar 26, 2025
1a65293
Adjust cover tests for new ZHA behavior
TheJulianJES Mar 26, 2025
c13631f
Improve cover tests further
TheJulianJES Mar 26, 2025
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
2 changes: 1 addition & 1 deletion homeassistant/components/zha/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"zha",
"universal_silabs_flasher"
],
"requirements": ["zha==0.0.53"],
"requirements": ["zha==0.0.54"],
"usb": [
{
"vid": "10C4",
Expand Down
33 changes: 33 additions & 0 deletions homeassistant/components/zha/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,12 @@
},
"flow_switch": {
"name": "Flow switch"
},
"water_leak": {
"name": "Water leak"
},
"water_supply": {
"name": "Water supply"
}
},
"button": {
Expand Down Expand Up @@ -1101,6 +1107,27 @@
},
"shutdown_timer": {
"name": "Shutdown timer"
},
"calibration_vertical_run_time_up": {
"name": "Calibration vertical run time up"
},
"calibration_vertical_run_time_down": {
"name": "Calibration vertical run time down"
},
"calibration_rotation_run_time_up": {
"name": "Calibration rotation run time up"
},
"calibration_rotation_run_time_down": {
"name": "Calibration rotation run time down"
},
"impulse_mode_duration": {
"name": "Impulse mode duration"
},
"water_duration": {
"name": "Water duration"
},
"water_interval": {
"name": "Water interval"
}
},
"select": {
Expand Down Expand Up @@ -1319,6 +1346,9 @@
},
"hysteresis_mode": {
"name": "Hysteresis mode"
},
"speed": {
"name": "Speed"
}
},
"sensor": {
Expand Down Expand Up @@ -1666,6 +1696,9 @@
},
"last_watering_duration": {
"name": "Last watering duration"
},
"device_status": {
"name": "Device status"
}
},
"switch": {
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 22 additions & 15 deletions tests/components/zha/test_cover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
cluster = zigpy_device.endpoints[1].window_covering
cluster.PLUGGED_ATTR_READS = {
WCAttrs.current_position_lift_percentage.name: 0,
WCAttrs.current_position_tilt_percentage.name: 42,
WCAttrs.current_position_tilt_percentage.name: 100,
WCAttrs.window_covering_type.name: WCT.Tilt_blind_tilt_and_lift,
WCAttrs.config_status.name: WCCS(~WCCS.Open_up_commands_reversed),
}
Expand Down Expand Up @@ -115,33 +115,33 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
assert state
assert state.state == CoverState.OPEN
assert state.attributes[ATTR_CURRENT_POSITION] == 100
assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 58
assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 0

# test that the state has changed from unavailable to off
# test that the state has changed from open to closed
await send_attributes_report(
hass, cluster, {WCAttrs.current_position_lift_percentage.id: 100}
)
assert hass.states.get(entity_id).state == CoverState.CLOSED

# test to see if it opens
# test that it opens
await send_attributes_report(
hass, cluster, {WCAttrs.current_position_lift_percentage.id: 0}
)
assert hass.states.get(entity_id).state == CoverState.OPEN

# test that the state remains after tilting to 100%
# test that the state remains after tilting to 0% (open)
await send_attributes_report(
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 100}
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 0}
)
assert hass.states.get(entity_id).state == CoverState.OPEN

# test to see the state remains after tilting to 0%
# test that the state remains after tilting to 100% (closed)
await send_attributes_report(
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 0}
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 100}
)
assert hass.states.get(entity_id).state == CoverState.OPEN

# close from UI
# close lift from UI
with patch("zigpy.zcl.Cluster.request", return_value=[0x1, zcl_f.Status.SUCCESS]):
await hass.services.async_call(
COVER_DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True
Expand All @@ -160,6 +160,11 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:

assert hass.states.get(entity_id).state == CoverState.CLOSED

# close tilt from UI, needs re-opening first
await send_attributes_report(
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 0}
)
assert hass.states.get(entity_id).state == CoverState.OPEN
with patch("zigpy.zcl.Cluster.request", return_value=[0x1, zcl_f.Status.SUCCESS]):
await hass.services.async_call(
COVER_DOMAIN,
Expand All @@ -185,7 +190,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:

assert hass.states.get(entity_id).state == CoverState.CLOSED

# open from UI
# open lift from UI
with patch("zigpy.zcl.Cluster.request", return_value=[0x0, zcl_f.Status.SUCCESS]):
await hass.services.async_call(
COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
Expand All @@ -204,6 +209,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:

assert hass.states.get(entity_id).state == CoverState.OPEN

# open tilt from UI
with patch("zigpy.zcl.Cluster.request", return_value=[0x0, zcl_f.Status.SUCCESS]):
await hass.services.async_call(
COVER_DOMAIN,
Expand All @@ -229,7 +235,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:

assert hass.states.get(entity_id).state == CoverState.OPEN

# set position UI
# set lift position from UI
with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
await hass.services.async_call(
COVER_DOMAIN,
Expand Down Expand Up @@ -261,6 +267,7 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:

assert hass.states.get(entity_id).state == CoverState.OPEN

# set tilt position from UI
with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
await hass.services.async_call(
COVER_DOMAIN,
Expand All @@ -281,13 +288,13 @@ async def test_cover(hass: HomeAssistant, setup_zha, zigpy_device_mock) -> None:
assert hass.states.get(entity_id).state == CoverState.CLOSING

await send_attributes_report(
hass, cluster, {WCAttrs.current_position_lift_percentage.id: 35}
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 35}
)

assert hass.states.get(entity_id).state == CoverState.CLOSING

await send_attributes_report(
hass, cluster, {WCAttrs.current_position_lift_percentage.id: 53}
hass, cluster, {WCAttrs.current_position_tilt_percentage.id: 53}
)

assert hass.states.get(entity_id).state == CoverState.OPEN
Expand Down Expand Up @@ -338,7 +345,7 @@ async def test_cover_failures(
# load up cover domain
cluster = zigpy_device.endpoints[1].window_covering
cluster.PLUGGED_ATTR_READS = {
WCAttrs.current_position_tilt_percentage.name: 42,
WCAttrs.current_position_tilt_percentage.name: 100,
WCAttrs.window_covering_type.name: WCT.Tilt_blind_tilt_and_lift,
}
update_attribute_cache(cluster)
Expand All @@ -355,7 +362,7 @@ async def test_cover_failures(
await send_attributes_report(hass, cluster, {0: 0, 8: 100, 1: 1})
assert hass.states.get(entity_id).state == CoverState.CLOSED

# test to see if it opens
# test that it opens
await send_attributes_report(hass, cluster, {0: 1, 8: 0, 1: 100})
assert hass.states.get(entity_id).state == CoverState.OPEN

Expand Down