Skip to content

Add child devices for multi-channel devices #947

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

Draft
zigpy-review-bot wants to merge 12 commits into
base: dev
Choose a base branch
from
Draft

Add child devices for multi-channel devices #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ec20487
Add child devices for multi-channel devices
zigpy-review-bot Oct 14, 2026
ef16317
Regenerate diagnostics for child devices
zigpy-review-bot Oct 14, 2026
c447488
Add child device tests
zigpy-review-bot Oct 14, 2026
a7e719b
Test child devices defined by quirks
zigpy-review-bot Oct 14, 2026
faf1690
Only allowlist models with diagnostics
zigpy-review-bot Oct 14, 2026
2ef1b1f
Make child device assignment robust against bad definitions
zigpy-review-bot Oct 14, 2026
d00a671
Don't report conflicting explicit primary entities as primary
zigpy-review-bot Oct 14, 2026
f90176b
Document when entities become primary
zigpy-review-bot Oct 14, 2026
b1d3ed6
Keep virtual entities on the main device
zigpy-review-bot Oct 14, 2026
9ad3c02
Test device-level entities in the automatic split
zigpy-review-bot Oct 14, 2026
a3bd6ff
Allowlist more multi-channel devices
zigpy-review-bot Oct 14, 2026
c73ea4e
Merge dev into zigpy-bot/child-devices
zigpy-review-bot Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions tests/data/devices/adeo-sin-4-fp-21-equ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"command": "identify",
"args": [
Expand Down Expand Up @@ -324,6 +325,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"current_option": "PreviousValue",
"enum": "StartUpOnOff",
Expand Down Expand Up @@ -352,6 +354,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"current_option": null,
"enum": "NodOnPilotWireMode",
Expand Down Expand Up @@ -384,6 +387,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand All @@ -407,6 +411,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand Down Expand Up @@ -434,6 +439,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 1028,
"suggested_display_precision": 1,
Expand Down Expand Up @@ -464,6 +470,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 39.737,
"suggested_display_precision": 3,
Expand Down Expand Up @@ -492,6 +499,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"is_on": 1
}
Expand All @@ -515,6 +523,7 @@
"device_ieee": "ab:cd:ef:12:85:66:cc:2e",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"installed_version": null,
"in_progress": false,
Expand All @@ -527,6 +536,7 @@
}
]
},
"child_devices": [],
"neighbors": [],
"routes": []
}
7 changes: 7 additions & 0 deletions tests/data/devices/adeo-zb-watersensor-d0001-0x21120002.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
"device_ieee": "ab:cd:ef:12:7b:20:a5:2a",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"is_on": false,
"attribute_name": "zone_status"
Expand All @@ -210,6 +211,7 @@
"device_ieee": "ab:cd:ef:12:7b:20:a5:2a",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"command": "identify",
"args": [
Expand Down Expand Up @@ -237,6 +239,7 @@
"device_ieee": "ab:cd:ef:12:7b:20:a5:2a",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand All @@ -260,6 +263,7 @@
"device_ieee": "ab:cd:ef:12:7b:20:a5:2a",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand Down Expand Up @@ -287,6 +291,7 @@
"device_ieee": "ab:cd:ef:12:7b:20:a5:2a",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": 0,
Expand Down Expand Up @@ -315,6 +320,7 @@
"device_ieee": "ab:cd:ef:12:7b:20:a5:2a",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"installed_version": "0x21120002",
"in_progress": false,
Expand All @@ -327,6 +333,7 @@
}
]
},
"child_devices": [],
"neighbors": [],
"routes": []
}
13 changes: 13 additions & 0 deletions tests/data/devices/adurosmart-eria-ad-rgbw3001-0x00000001.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"command": "identify",
"args": [
Expand Down Expand Up @@ -360,6 +361,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"on": true,
"brightness": 254,
Expand Down Expand Up @@ -406,6 +408,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 65535,
"mode": "auto",
Expand All @@ -432,6 +435,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 1,
"mode": "auto",
Expand All @@ -458,6 +462,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 255,
"mode": "auto",
Expand All @@ -484,6 +489,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 1,
"mode": "auto",
Expand All @@ -510,6 +516,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 1,
"mode": "auto",
Expand All @@ -536,6 +543,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 255,
"mode": "auto",
Expand Down Expand Up @@ -564,6 +572,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"current_option": "PreviousValue",
"enum": "StartUpOnOff",
Expand Down Expand Up @@ -594,6 +603,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand All @@ -617,6 +627,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand All @@ -642,6 +653,7 @@
"device_ieee": "00:15:8d:00:03:42:9e:da",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"installed_version": "0x00000001",
"in_progress": false,
Expand All @@ -654,6 +666,7 @@
}
]
},
"child_devices": [],
"neighbors": [],
"routes": []
}
6 changes: 6 additions & 0 deletions tests/data/devices/adurosmart-eria-adurolight-csc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@
"device_ieee": "ab:cd:ef:12:1a:8b:d4:d3",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"command": "identify",
"args": [
Expand Down Expand Up @@ -300,6 +301,7 @@
"device_ieee": "ab:cd:ef:12:1a:8b:d4:d3",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand All @@ -323,6 +325,7 @@
"device_ieee": "ab:cd:ef:12:1a:8b:d4:d3",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand Down Expand Up @@ -350,6 +353,7 @@
"device_ieee": "ab:cd:ef:12:1a:8b:d4:d3",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 60.0,
"suggested_display_precision": 0,
Expand Down Expand Up @@ -378,11 +382,13 @@
"device_ieee": "ab:cd:ef:12:1a:8b:d4:d3",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"is_on": true
}
]
},
"child_devices": [],
"neighbors": [],
"routes": []
}
6 changes: 6 additions & 0 deletions tests/data/devices/adurosmart-eria-vms-adurolight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
"device_ieee": "00:15:8d:00:07:5b:40:90",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"is_on": true,
"attribute_name": "zone_status"
Expand All @@ -225,6 +226,7 @@
"device_ieee": "00:15:8d:00:07:5b:40:90",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"command": "identify",
"args": [
Expand Down Expand Up @@ -252,6 +254,7 @@
"device_ieee": "00:15:8d:00:07:5b:40:90",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand All @@ -275,6 +278,7 @@
"device_ieee": "00:15:8d:00:07:5b:40:90",
"endpoint_id": null,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": null,
"suggested_display_precision": null,
Expand Down Expand Up @@ -302,6 +306,7 @@
"device_ieee": "00:15:8d:00:07:5b:40:90",
"endpoint_id": 1,
"available": true,
"child_device_id": null,
"group_id": null,
"native_value": 90.0,
"suggested_display_precision": 0,
Expand All @@ -312,6 +317,7 @@
}
]
},
"child_devices": [],
"neighbors": [],
"routes": []
}
Loading
Loading