Skip to content

Migrate Schneider dimmer quirks to v2, add missing models #3529

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

Merged
merged 2 commits into from
Nov 24, 2024
Merged

Migrate Schneider dimmer quirks to v2, add missing models #3529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec8a19
Migrate Schneider dimmer quirks to v2, add missing models
uvNikita Nov 20, 2024
b03a968
Change `adds` to `replaces`
TheJulianJES Nov 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
60 changes: 0 additions & 60 deletions tests/test_schneiderelectric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from zigpy.zcl.clusters.closures import WindowCovering

from tests.common import ClusterListener
import zhaquirks.schneiderelectric.dimmers
import zhaquirks.schneiderelectric.shutters

zhaquirks.setup()
Expand Down Expand Up @@ -136,62 +135,3 @@ async def test_1gang_shutter_1_lift_percentage_updates(zigpy_device_from_quirk):
23, # 100 - 77
)
assert len(cluster_listener.cluster_commands) == 0


def test_nh_rotary_dimmer_1_signature(assert_signature_matches_quirk):
"""Test signature."""
signature = {
"node_descriptor": (
"NodeDescriptor(logical_type=<LogicalType.Router: 1>, complex_descriptor_available=0, "
"user_descriptor_available=0, reserved=0, aps_flags=0, frequency_band=<FrequencyBand.Freq2400MHz: 8>, "
"mac_capability_flags=<MACCapabilityFlags.FullFunctionDevice|MainsPowered|RxOnWhenIdle|"
"AllocateAddress: 142>, manufacturer_code=4190, maximum_buffer_size=82, maximum_incoming_transfer_size=82, "
"server_mask=11264, maximum_outgoing_transfer_size=82, "
"descriptor_capability_field=<DescriptorCapability.NONE: 0>, *allocate_address=True, "
"*is_alternate_pan_coordinator=False, *is_coordinator=False, *is_end_device=False, "
"*is_full_function_device=True, *is_mains_powered=True, *is_receiver_on_when_idle=True, *is_router=True, "
"*is_security_capable=False)"
),
"endpoints": {
"3": {
"profile_id": 0x0104,
"device_type": "0x0101",
"in_clusters": [
"0x0000",
"0x0003",
"0x0004",
"0x0005",
"0x0006",
"0x0008",
"0x0301",
"0x0b05",
],
"out_clusters": ["0x0019"],
},
"21": {
"profile_id": 0x0104,
"device_type": "0x0104",
"in_clusters": ["0x0000", "0x0003", "0x0b05", "0xff17"],
"out_clusters": [
"0x0003",
"0x0004",
"0x0005",
"0x0006",
"0x0008",
"0x0102",
],
},
"242": {
"profile_id": 0xA1E0,
"device_type": "0x0061",
"in_clusters": [],
"out_clusters": ["0x0021"],
},
},
"manufacturer": "Schneider Electric",
"model": "NHROTARY/DIMMER/1",
"class": "zigpy.device.Device",
}
assert_signature_matches_quirk(
zhaquirks.schneiderelectric.dimmers.NHRotaryDimmer1, signature
)
4 changes: 2 additions & 2 deletions zhaquirks/schneiderelectric/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ class AttributeDefs(Ballast.AttributeDefs):
id=0xE000, type=SEControlMode, is_manufacturer_specific=True
)
se_wiring_mode: Final = ZCLAttributeDef(
id=0xE002, type=t.enum8, is_manufacturer_specific=True
id=0xE002, type=SEWiringMode, is_manufacturer_specific=True
)
se_dimming_curve: Final = ZCLAttributeDef(
id=0xE002, type=t.enum8, is_manufacturer_specific=True
id=0xE002, type=SEDimmingCurve, is_manufacturer_specific=True
)


Expand Down
150 changes: 27 additions & 123 deletions zhaquirks/schneiderelectric/dimmers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,33 @@
"""Schneider Electric dimmers and switches quirks."""

from zigpy.profiles import zgp, zha
from zigpy.quirks import CustomDevice
from zigpy.zcl.clusters.closures import WindowCovering
from zigpy.zcl.clusters.general import (
Basic,
GreenPowerProxy,
Groups,
Identify,
LevelControl,
OnOff,
Ota,
Scenes,
)
from zigpy.zcl.clusters.homeautomation import Diagnostic
from zigpy.zcl.clusters.lighting import Ballast
from zigpy.quirks.v2 import QuirkBuilder

from zhaquirks.const import (
DEVICE_TYPE,
ENDPOINTS,
INPUT_CLUSTERS,
MODELS_INFO,
OUTPUT_CLUSTERS,
PROFILE_ID,
from zhaquirks.schneiderelectric import (
SE_MANUF_NAME,
SEBallast,
SEBasic,
SEOnOff,
SESpecific,
)
from zhaquirks.schneiderelectric import SE_MANUF_NAME, SEBallast, SEBasic, SESpecific


class NHRotaryDimmer1(CustomDevice):
"""NHROTARY/DIMMER/1 by Schneider Electric."""
(
QuirkBuilder(SE_MANUF_NAME, "NHROTARY/DIMMER/1")
.applies_to(SE_MANUF_NAME, "NHROTARY/UNIDIM/1")
.applies_to(SE_MANUF_NAME, "NHPB/DIMMER/1")
.applies_to(SE_MANUF_NAME, "NHPB/UNIDIM/1")
.replaces(SEBasic, endpoint_id=3)
.replaces(SEBallast, endpoint_id=3)
.replaces(SEOnOff, endpoint_id=3)
.replaces(SEBasic, endpoint_id=21)
.adds(SESpecific, endpoint_id=21)
.add_to_registry()
)

signature = {
MODELS_INFO: [
(SE_MANUF_NAME, "NHROTARY/DIMMER/1"),
],
ENDPOINTS: {
3: {
PROFILE_ID: zha.PROFILE_ID,
DEVICE_TYPE: zha.DeviceType.DIMMABLE_LIGHT,
INPUT_CLUSTERS: [
Basic.cluster_id,
Identify.cluster_id,
Groups.cluster_id,
Scenes.cluster_id,
OnOff.cluster_id,
LevelControl.cluster_id,
Ballast.cluster_id,
Diagnostic.cluster_id,
],
OUTPUT_CLUSTERS: [
Ota.cluster_id,
],
},
21: {
PROFILE_ID: zha.PROFILE_ID,
DEVICE_TYPE: zha.DeviceType.DIMMER_SWITCH,
INPUT_CLUSTERS: [
Basic.cluster_id,
Identify.cluster_id,
Diagnostic.cluster_id,
SESpecific.cluster_id,
],
OUTPUT_CLUSTERS: [
Identify.cluster_id,
Groups.cluster_id,
Scenes.cluster_id,
OnOff.cluster_id,
LevelControl.cluster_id,
WindowCovering.cluster_id,
],
},
242: {
PROFILE_ID: zgp.PROFILE_ID,
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
INPUT_CLUSTERS: [],
OUTPUT_CLUSTERS: [
GreenPowerProxy.cluster_id,
],
},
},
}
replacement = {
ENDPOINTS: {
3: {
PROFILE_ID: zha.PROFILE_ID,
DEVICE_TYPE: zha.DeviceType.DIMMABLE_LIGHT,
INPUT_CLUSTERS: [
SEBasic,
Identify.cluster_id,
Groups.cluster_id,
Scenes.cluster_id,
OnOff.cluster_id,
LevelControl.cluster_id,
SEBallast,
Diagnostic.cluster_id,
],
OUTPUT_CLUSTERS: [
Ota.cluster_id,
],
},
21: {
PROFILE_ID: zha.PROFILE_ID,
DEVICE_TYPE: zha.DeviceType.DIMMER_SWITCH,
INPUT_CLUSTERS: [
SEBasic,
Identify.cluster_id,
Diagnostic.cluster_id,
SESpecific,
],
OUTPUT_CLUSTERS: [
Identify.cluster_id,
Groups.cluster_id,
Scenes.cluster_id,
OnOff.cluster_id,
LevelControl.cluster_id,
WindowCovering.cluster_id,
],
},
242: {
PROFILE_ID: zgp.PROFILE_ID,
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
INPUT_CLUSTERS: [],
OUTPUT_CLUSTERS: [
GreenPowerProxy.cluster_id,
],
},
}
}
(
QuirkBuilder(SE_MANUF_NAME, "NHPB/SWITCH/1")
.replaces(SEBasic)
.replaces(SEOnOff)
.replaces(SEBasic, endpoint_id=21)
.adds(SESpecific, endpoint_id=21)
.add_to_registry()
)