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.

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

Fix energy scan duraton #168

Merged
merged 1 commit into from
Nov 5, 2023
Merged

Fix energy scan duraton #168

merged 1 commit into from
Nov 5, 2023

Conversation

Shulyaka
Copy link
Contributor

@Shulyaka Shulyaka commented Nov 3, 2023

Fixes home-assistant/core#103208
Supersedes #166

The S2C modules do support energy scan:
https://www.digi.com/resources/documentation/digidocs/90002002/default.htm#Reference/r_cmd_ED.htm?TocPath=AT%2520commands%257CNetwork%2520commands%257C_____17

The difference with XBee3 is the parameter range: S2C accepts 0x01-0xFF or no parameter, while XBee3 accepts 0x00-0xFF. In other words, to use a default parameter value one need to pass no parameters for S2C and 0x00 for XBee3.

Due to a bug we are sending the parameter as b'\x00\x00\x00\x00' instead of b'\x04' for 4 ms, the XBee3 firmware accepts that parameter as default, while S2C firmware returns an INVALD_PARAMETER response.

The bug is because we implicitly used bytes() constructor with an integer argument, that returns an array of zeros. Using [duration_exp] or bytes([duration_exp]) instead of duration_exp resolves the issue.

Copy link

codecov bot commented Nov 3, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b8564a8) 100.00% compared to head (04abbef) 100.00%.

Additional details and impacted files
@@            Coverage Diff            @@
##               dev      #168   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            6         6           
  Lines          779       779           
=========================================
  Hits           779       779           
Files Coverage Δ
zigpy_xbee/zigbee/application.py 100.00% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@puddly puddly merged commit 367fed5 into zigpy:dev Nov 5, 2023
14 checks passed
@Shulyaka Shulyaka deleted the energy_scan_2 branch November 5, 2023 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ZHA] Zigbee fails to set up after 2023.11.0 upgrade
2 participants