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 Python Matter server to 7.0.0 (Matter 1.4) #132502

Merged
merged 6 commits into from
Dec 30, 2024
+11 −11
Merged

Bump Python Matter server to 7.0.0 (Matter 1.4) #132502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa6fc01
Matter 1.4 rename BridgedDevice device type
lboue Dec 6, 2024
2449758
`ColorMode` enum type is renamed to `ColorModeEnum`
lboue Dec 6, 2024
180f0f3
Item `ColorTemperature` renamed to `ColorTemperatureMireds`
lboue Dec 6, 2024
24dee73
Update ColorControl bitmaps and attributes
lboue Dec 6, 2024
e1a60d9
Bump Python Matter server to 7.0.0 (Matter 1.4)
lboue Dec 24, 2024
d593be2
Bump requirements to Python Matter server to 7.0.0
lboue Dec 24, 2024
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
4 changes: 2 additions & 2 deletions homeassistant/components/matter/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import TYPE_CHECKING, cast

from chip.clusters import Objects as clusters
from matter_server.client.models.device_types import BridgedDevice
from matter_server.client.models.device_types import BridgedNode
from matter_server.common.models import EventType, ServerInfoMessage

from homeassistant.config_entries import ConfigEntry
Expand Down Expand Up @@ -162,7 +162,7 @@ def _create_device_registry(
(
x
for x in endpoint.device_types
if x.device_type != BridgedDevice.device_type
if x.device_type != BridgedNode.device_type
),
None,
)
Expand Down
12 changes: 6 additions & 6 deletions homeassistant/components/matter/light.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
)

COLOR_MODE_MAP = {
clusters.ColorControl.Enums.ColorMode.kCurrentHueAndCurrentSaturation: ColorMode.HS,
clusters.ColorControl.Enums.ColorMode.kCurrentXAndCurrentY: ColorMode.XY,
clusters.ColorControl.Enums.ColorMode.kColorTemperature: ColorMode.COLOR_TEMP,
clusters.ColorControl.Enums.ColorModeEnum.kCurrentHueAndCurrentSaturation: ColorMode.HS,
clusters.ColorControl.Enums.ColorModeEnum.kCurrentXAndCurrentY: ColorMode.XY,
clusters.ColorControl.Enums.ColorModeEnum.kColorTemperatureMireds: ColorMode.COLOR_TEMP,
}

# there's a bug in (at least) Espressif's implementation of light transitions
Expand Down Expand Up @@ -346,21 +346,21 @@ def _update_from_device(self) -> None:

if (
capabilities
& clusters.ColorControl.Bitmaps.ColorCapabilities.kHueSaturationSupported
& clusters.ColorControl.Bitmaps.ColorCapabilitiesBitmap.kHueSaturation
):
supported_color_modes.add(ColorMode.HS)
self._supports_color = True

if (
capabilities
& clusters.ColorControl.Bitmaps.ColorCapabilities.kXYAttributesSupported
& clusters.ColorControl.Bitmaps.ColorCapabilitiesBitmap.kXy
):
supported_color_modes.add(ColorMode.XY)
self._supports_color = True

if (
capabilities
& clusters.ColorControl.Bitmaps.ColorCapabilities.kColorTemperatureSupported
& clusters.ColorControl.Bitmaps.ColorCapabilitiesBitmap.kColorTemperature
):
supported_color_modes.add(ColorMode.COLOR_TEMP)
self._supports_color_temperature = True
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/matter/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"dependencies": ["websocket_api"],
"documentation": "https://www.home-assistant.io/integrations/matter",
"iot_class": "local_push",
"requirements": ["python-matter-server==6.6.0"],
"requirements": ["python-matter-server==7.0.0"],
"zeroconf": ["_matter._tcp.local.", "_matterc._udp.local."]
}
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,7 @@ python-linkplay==0.0.20
# python-lirc==1.2.3

# homeassistant.components.matter
python-matter-server==6.6.0
python-matter-server==7.0.0

# homeassistant.components.xiaomi_miio
python-miio==0.5.12
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,7 +1898,7 @@ python-kasa[speedups]==0.8.0
python-linkplay==0.0.20

# homeassistant.components.matter
python-matter-server==6.6.0
python-matter-server==7.0.0

# homeassistant.components.xiaomi_miio
python-miio==0.5.12
Expand Down