Repository navigation
Add Wired Doorbell Plus (2nd Gen) support - #539
danielcolquitt wants to merge 1 commit into
Conversation
|
Brief follow-up after a couple of weeks: this remains in production use against a real Wired Doorbell Plus (2nd Gen) reporting cocoa_doorbell_v4w, with the expected Home Assistant entities and capabilities working correctly. I’m also very happy to help with, or contribute to, any broader tidy-up of the newer-device taxonomy if that would be useful, rather than treating this mapping in isolation. Happy to adjust the PR if you’d prefer a different approach. Thanks for taking a look when you have time. |
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork: - WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534). - New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged. - Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked). - Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550). Co-authored-by: Niels Haagsman <haagsman@gmail.com> Co-authored-by: Adam Reeve <adam@adamreeve.com> Co-authored-by: danielcolquitt <daniel@colquitt.xyz> Co-authored-by: Tom Roberts <tom@tomroberts.co.uk> Co-authored-by: ben79 <benjaminfearnley@gmail.com> Co-authored-by: Aaron Wolen <aaron@wolen.com> Co-authored-by: Yoan <yoan.cousin@proton.me>
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork: - WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534). - New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged. - Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked). - Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550). Co-authored-by: Niels Haagsman <haagsman@gmail.com> Co-authored-by: Adam Reeve <adam@adamreeve.com> Co-authored-by: danielcolquitt <daniel@colquitt.xyz> Co-authored-by: Tom Roberts <tom@tomroberts.co.uk> Co-authored-by: ben79 <benjaminfearnley@gmail.com> Co-authored-by: Aaron Wolen <aaron@wolen.com> Co-authored-by: Yoan <yoan.cousin@proton.me>
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork: - WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534). - New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged. - Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked). - Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550). Co-authored-by: Niels Haagsman <haagsman@gmail.com> Co-authored-by: Adam Reeve <adam@adamreeve.com> Co-authored-by: danielcolquitt <daniel@colquitt.xyz> Co-authored-by: Tom Roberts <tom@tomroberts.co.uk> Co-authored-by: ben79 <benjaminfearnley@gmail.com> Co-authored-by: Aaron Wolen <aaron@wolen.com> Co-authored-by: Yoan <yoan.cousin@proton.me>
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork: - WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534). - New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged. - Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked). - Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550). Co-authored-by: Niels Haagsman <haagsman@gmail.com> Co-authored-by: Adam Reeve <adam@adamreeve.com> Co-authored-by: danielcolquitt <daniel@colquitt.xyz> Co-authored-by: Tom Roberts <tom@tomroberts.co.uk> Co-authored-by: ben79 <benjaminfearnley@gmail.com> Co-authored-by: Aaron Wolen <aaron@wolen.com> Co-authored-by: Yoan <yoan.cousin@proton.me>
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork: - WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534). - New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged. - Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked). - Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550). Co-authored-by: Niels Haagsman <haagsman@gmail.com> Co-authored-by: Adam Reeve <adam@adamreeve.com> Co-authored-by: danielcolquitt <daniel@colquitt.xyz> Co-authored-by: Tom Roberts <tom@tomroberts.co.uk> Co-authored-by: ben79 <benjaminfearnley@gmail.com> Co-authored-by: Aaron Wolen <aaron@wolen.com> Co-authored-by: Yoan <yoan.cousin@proton.me>
|
Confirming this mapping against a real Device data from the Ring integration diagnostics (IDs/emails stripped):
What breaks in Home Assistant 2026.10.4 (ring-doorbell 0.9.14) with the kind unmapped: the device registers as "Unknown Doorbell", Measured on this doorbell from the HA recorder over 11 days / 120 events: median 62s from the event The diff here matches that device data. I have not run the branch against a live install, so treat this as device-data confirmation rather than a functional test — worth checking that the pre-roll entity and the event entities both appear after the mapping lands. I also opened #562 for the part this PR cannot cover: unmapped doorbell kinds keep |
Summary
cocoa_doorbell_v4wdevices as Wired Doorbell Plus (2nd Gen) doorbells.Fixes #521
Testing
uv run pre-commit run --files ring_doorbell/const.py ring_doorbell/doorbot.py tests/test_ring.py --verboseuv run pytest tests/ --force-enable-socket --cov=ring_doorbell --cov-report=xml --cov-report=term-missing --import-mode importlibuv run docs\make.bat html