Skip to content

Commit 703b3b1

Browse files
authored
0.8.0 Release
2 parents 8354946 + 2e38eb5 commit 703b3b1

File tree

5 files changed

+27
-5
lines changed

5 files changed

+27
-5
lines changed

Contributors.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Contributors
2+
- [Alexei Chetroi] (https://github.com/Adminiuga)
3+
- [Russell Cloran] (https://github.com/rcloran)
4+
- [damarco] (https://github.com/damarco)
5+
- [Hedda] (https://github.com/Hedda)
6+
- [Shulyaka] (https://github.com/Shulyaka)

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,10 @@ Tagged versions of zigpy-xbee-homeassistant are also released via PyPI
3636
- https://pypi.org/project/zigpy-xbee-homeassistant/#history
3737
- https://pypi.org/project/zigpy-xbee-homeassistant/#files
3838

39+
# How to contribute
40+
41+
If you are looking to make a contribution to this project we suggest that you follow the steps in these guides:
42+
- https://github.com/firstcontributions/first-contributions/blob/master/README.md
43+
- https://github.com/firstcontributions/first-contributions/blob/master/github-desktop-tutorial.md
44+
45+
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.

zigpy_xbee/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MAJOR_VERSION = 0
2-
MINOR_VERSION = 7
2+
MINOR_VERSION = 8
33
PATCH_VERSION = "0"
44
__short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION)
55
__version__ = "{}.{}".format(__short_version__, PATCH_VERSION)

zigpy_xbee/api.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
175175
"%V": t.uint16_t, # read only
176176
"V+": t.uint16_t,
177177
"TP": t.uint16_t,
178+
"M0": t.uint16_t, # 0 - 0x3FF
179+
"M1": t.uint16_t, # 0 - 0x3FF
178180
# Diagnostics commands
179181
"VR": t.uint16_t,
180182
"HV": t.uint16_t,

zigpy_xbee/zigbee/application.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ async def startup(self, auto_form=False):
6060
self._ieee = zigpy.types.EUI64(ieee)
6161
LOGGER.debug("Read local IEEE address as %s", self._ieee)
6262

63-
association_state = await self._get_association_state()
63+
try:
64+
association_state = await asyncio.wait_for(
65+
self._get_association_state(), timeout=4
66+
)
67+
except asyncio.TimeoutError:
68+
association_state = 0xFF
6469
self._nwk = await self._api._at_command("MY")
6570
enc_enabled = await self._api._at_command("EE")
6671
enc_options = await self._api._at_command("EO")
@@ -120,7 +125,9 @@ async def form_network(self, channel=15, pan_id=None, extended_pan_id=None):
120125
await self._api._at_command("WR")
121126

122127
await asyncio.wait_for(self._api.coordinator_started_event.wait(), timeout=10)
123-
association_state = await self._get_association_state()
128+
association_state = await asyncio.wait_for(
129+
self._get_association_state(), timeout=10
130+
)
124131
LOGGER.debug("Association state: %s", association_state)
125132
self._nwk = await self._api._at_command("MY")
126133
assert self._nwk == 0x0000
@@ -204,7 +211,7 @@ async def request(
204211
"""
205212
LOGGER.debug("Zigbee request tsn #%s: %s", sequence, binascii.hexlify(data))
206213

207-
tx_opts = 0x20
214+
tx_opts = 0x00
208215
if expect_reply and device.node_desc.is_end_device in (True, None):
209216
tx_opts |= 0x40
210217
send_req = self._api.tx_explicit(
@@ -331,7 +338,7 @@ async def broadcast(
331338
cluster,
332339
profile,
333340
radius,
334-
0x20,
341+
0x00,
335342
data,
336343
)
337344
try:

0 commit comments

Comments
 (0)