From 83fea3edb96a0e9d17e6d89623bc83f008b01707 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Mon, 11 Nov 2019 17:48:41 -0500 Subject: [PATCH 1/7] 0.8.0.dev0 version bump. --- zigpy_xbee/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigpy_xbee/__init__.py b/zigpy_xbee/__init__.py index 50968e2..65276e3 100644 --- a/zigpy_xbee/__init__.py +++ b/zigpy_xbee/__init__.py @@ -1,5 +1,5 @@ MAJOR_VERSION = 0 -MINOR_VERSION = 7 +MINOR_VERSION = 8 PATCH_VERSION = "0.dev0" __short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION) __version__ = "{}.{}".format(__short_version__, PATCH_VERSION) From c901eb943918f618eb0a6ac18b635180b4e01527 Mon Sep 17 00:00:00 2001 From: Shulyaka Date: Wed, 20 Nov 2019 05:15:12 +0300 Subject: [PATCH 2/7] PWM duty cycle AT commands (#70) --- zigpy_xbee/api.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zigpy_xbee/api.py b/zigpy_xbee/api.py index 8b3ded6..70e8f59 100644 --- a/zigpy_xbee/api.py +++ b/zigpy_xbee/api.py @@ -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, From 680302326e46e42393afba2a2ae13585bd638dad Mon Sep 17 00:00:00 2001 From: Hedda Date: Thu, 21 Nov 2019 21:22:25 +0100 Subject: [PATCH 3/7] Create Contributors.md file with list of contributors (#71) Create Contributors.md as per https://github.com/firstcontributions/first-contributions/blob/master/README.md --- Contributors.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Contributors.md diff --git a/Contributors.md b/Contributors.md new file mode 100644 index 0000000..fbdf33b --- /dev/null +++ b/Contributors.md @@ -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) From 1ef9fb9a7260823dd7f647b385207ffe28086393 Mon Sep 17 00:00:00 2001 From: Hedda Date: Thu, 21 Nov 2019 21:22:43 +0100 Subject: [PATCH 4/7] Added a "How to contribute" section to README.md (#72) Added a "How to contribute" section to README.md with links and suggestion of hardware donations. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index e28951a..a05f865 100644 --- a/README.md +++ b/README.md @@ -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. From d3dfb11b336e4bbaaaa0abe2d0b7627c6ac07f83 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Sun, 1 Dec 2019 15:48:45 -0500 Subject: [PATCH 5/7] Disable APS encryption. (#73) * Disable APS encryption. * Disable APS encryption. --- zigpy_xbee/zigbee/application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zigpy_xbee/zigbee/application.py b/zigpy_xbee/zigbee/application.py index 330dc16..8d9a374 100644 --- a/zigpy_xbee/zigbee/application.py +++ b/zigpy_xbee/zigbee/application.py @@ -204,7 +204,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( @@ -331,7 +331,7 @@ async def broadcast( cluster, profile, radius, - 0x20, + 0x00, data, ) try: From 0a810a39924fc963310a80d39c05afabbbf76f85 Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 26 Dec 2019 13:52:35 -0500 Subject: [PATCH 6/7] Timeout if we never get association state (#76) --- zigpy_xbee/zigbee/application.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/zigpy_xbee/zigbee/application.py b/zigpy_xbee/zigbee/application.py index 8d9a374..d492116 100644 --- a/zigpy_xbee/zigbee/application.py +++ b/zigpy_xbee/zigbee/application.py @@ -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") @@ -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 From 13fe0de9046b1f4158c6cf4181bb1123d9b2f00c Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Thu, 26 Dec 2019 14:11:31 -0500 Subject: [PATCH 7/7] Version bump 0.8.0 --- zigpy_xbee/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigpy_xbee/__init__.py b/zigpy_xbee/__init__.py index 65276e3..6e5dfae 100644 --- a/zigpy_xbee/__init__.py +++ b/zigpy_xbee/__init__.py @@ -1,5 +1,5 @@ MAJOR_VERSION = 0 MINOR_VERSION = 8 -PATCH_VERSION = "0.dev0" +PATCH_VERSION = "0" __short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION) __version__ = "{}.{}".format(__short_version__, PATCH_VERSION)