Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Contributors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Contributors
- [Alexei Chetroi] (https://github.com/Adminiuga)
- [Russell Cloran] (https://github.com/rcloran)
- [damarco] (https://github.com/damarco)
- [Hedda] (https://github.com/Hedda)
- [Shulyaka] (https://github.com/Shulyaka)
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ Tagged versions of zigpy-xbee-homeassistant are also released via PyPI
- https://pypi.org/project/zigpy-xbee-homeassistant/#history
- https://pypi.org/project/zigpy-xbee-homeassistant/#files

# How to contribute

If you are looking to make a contribution to this project we suggest that you follow the steps in these guides:
- https://github.com/firstcontributions/first-contributions/blob/master/README.md
- https://github.com/firstcontributions/first-contributions/blob/master/github-desktop-tutorial.md

Some developers might also be interested in receiving donations in the form of hardware such as Zigbee modules or devices, and even if such donations are most often donated with no strings attached it could in many cases help the developers motivation and indirect improve the development of this project.
2 changes: 1 addition & 1 deletion zigpy_xbee/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MAJOR_VERSION = 0
MINOR_VERSION = 7
MINOR_VERSION = 8
PATCH_VERSION = "0"
__short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION)
__version__ = "{}.{}".format(__short_version__, PATCH_VERSION)
2 changes: 2 additions & 0 deletions zigpy_xbee/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
"%V": t.uint16_t, # read only
"V+": t.uint16_t,
"TP": t.uint16_t,
"M0": t.uint16_t, # 0 - 0x3FF
"M1": t.uint16_t, # 0 - 0x3FF
# Diagnostics commands
"VR": t.uint16_t,
"HV": t.uint16_t,
Expand Down
15 changes: 11 additions & 4 deletions zigpy_xbee/zigbee/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ async def startup(self, auto_form=False):
self._ieee = zigpy.types.EUI64(ieee)
LOGGER.debug("Read local IEEE address as %s", self._ieee)

association_state = await self._get_association_state()
try:
association_state = await asyncio.wait_for(
self._get_association_state(), timeout=4
)
except asyncio.TimeoutError:
association_state = 0xFF
self._nwk = await self._api._at_command("MY")
enc_enabled = await self._api._at_command("EE")
enc_options = await self._api._at_command("EO")
Expand Down Expand Up @@ -120,7 +125,9 @@ async def form_network(self, channel=15, pan_id=None, extended_pan_id=None):
await self._api._at_command("WR")

await asyncio.wait_for(self._api.coordinator_started_event.wait(), timeout=10)
association_state = await self._get_association_state()
association_state = await asyncio.wait_for(
self._get_association_state(), timeout=10
)
LOGGER.debug("Association state: %s", association_state)
self._nwk = await self._api._at_command("MY")
assert self._nwk == 0x0000
Expand Down Expand Up @@ -204,7 +211,7 @@ async def request(
"""
LOGGER.debug("Zigbee request tsn #%s: %s", sequence, binascii.hexlify(data))

tx_opts = 0x20
tx_opts = 0x00
if expect_reply and device.node_desc.is_end_device in (True, None):
tx_opts |= 0x40
send_req = self._api.tx_explicit(
Expand Down Expand Up @@ -331,7 +338,7 @@ async def broadcast(
cluster,
profile,
radius,
0x20,
0x00,
data,
)
try:
Expand Down