Skip to content

Commit 94a1a6b

Browse files
authored
0.13.0 Release
2 parents e7a82bb + d83b984 commit 94a1a6b

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ language: python
22
matrix:
33
fast_finish: true
44
include:
5-
- python: "3.6"
5+
- python: "3.7"
66
env: TOXENV=lint
7-
- python: "3.6"
7+
- python: "3.7"
88
env: TOXENV=black
9-
- python: "3.6"
10-
env: TOXENV=py36
119
- python: "3.7"
1210
env: TOXENV=py37
1311
- python: "3.8"

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ These are XBee Zigbee based radios that have been tested with the [zigpy-xbee](h
2929
- Digi XBee Series 2 (S2) modules. Note: These will need to be manually flashed with the Zigbee Coordinator API firmware via XCTU.
3030
- Digi XBee Series 3 (xbee3-24) modules
3131

32+
# Port configuration
33+
34+
- To configure __usb__ port path for your XBee serial device, just specify the TTY (serial com) port, example : `/dev/ttyACM0`
35+
36+
Note! Users can change UART baud rate of your Digi XBee using the Digi's XCTU configuration tool. Using XCTU tool
37+
enable the API communication mode -- `ATAP2`, set baudrate to 57600 -- `ATBD6`, save parameters.
38+
3239
# Testing new releases
3340

3441
Testing a new release of the zigpy-xbee library before it is released in Home Assistant.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
author_email="rcloran@gmail.com",
2222
license="GPL-3.0",
2323
packages=find_packages(exclude=["*.tests"]),
24-
install_requires=["pyserial-asyncio", "zigpy>= 0.20.a1"],
24+
install_requires=["pyserial-asyncio", "zigpy>= 0.23.0"],
2525
tests_require=["pytest"],
2626
)

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py36, py37, py38, lint, black
7+
envlist = py37, py38, lint, black
88
skip_missing_interpreters = True
99

1010
[testenv]
@@ -21,8 +21,8 @@ deps =
2121
[testenv:lint]
2222
basepython = python3
2323
deps =
24-
flake8
25-
isort
24+
flake8==3.7.9
25+
isort==4.3.21
2626
commands =
2727
flake8
2828
isort --check -rc {toxinidir}/zigpy_xbee {toxinidir}/tests {toxinidir}/setup.py

zigpy_xbee/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MAJOR_VERSION = 0
2-
MINOR_VERSION = 12
3-
PATCH_VERSION = "1"
2+
MINOR_VERSION = 13
3+
PATCH_VERSION = "0"
44
__short_version__ = "{}.{}".format(MAJOR_VERSION, MINOR_VERSION)
55
__version__ = "{}.{}".format(__short_version__, PATCH_VERSION)

zigpy_xbee/api.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import serial
99
from zigpy.exceptions import APIException, DeliveryError
10-
from zigpy.types import LVList
1110

1211
import zigpy_xbee
1312
from zigpy_xbee.config import CONF_DEVICE_BAUDRATE, CONF_DEVICE_PATH, SCHEMA_DEVICE
@@ -30,6 +29,11 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
3029
NETWORK_SECURITY_KEY_UPDATED = 0x07
3130
VOLTAGE_SUPPLY_LIMIT_EXCEEDED = 0x0D
3231
MODEM_CONFIGURATION_CHANGED_WHILE_JOIN_IN_PROGRESS = 0x11
32+
PAN_ID_CONFLICT_DETECTED = 0x3E
33+
PAN_ID_UPDATED_DUE_TO_CONFLICT = 0x3F
34+
JOIN_WINDOW_OPENED = 0x43
35+
JOIN_WINDOW_CLOSED = 0x44
36+
NETWORK_SECURITY_KEY_ROTATION_INITIATED = 0x45
3337

3438
UNKNOWN_MODEM_STATUS = 0xFF
3539
_UNDEFINED = 0xFF
@@ -63,7 +67,7 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
6367
),
6468
"create_source_route": (
6569
0x21,
66-
(t.FrameId, t.EUI64, t.NWK, t.uint8_t, LVList(t.NWK)),
70+
(t.FrameId, t.EUI64, t.NWK, t.uint8_t, t.Relays),
6771
None,
6872
),
6973
"register_joining_device": (0x24, (), None),
@@ -99,7 +103,7 @@ class ModemStatus(t.uint8_t, t.UndefinedEnum):
99103
None,
100104
),
101105
"extended_status": (0x98, (), None),
102-
"route_record_indicator": (0xA1, (t.EUI64, t.NWK, t.uint8_t, LVList(t.NWK)), None),
106+
"route_record_indicator": (0xA1, (t.EUI64, t.NWK, t.uint8_t, t.Relays), None),
103107
"many_to_one_rri": (0xA3, (t.EUI64, t.NWK, t.uint8_t), None),
104108
"node_id_indicator": (0x95, (), None),
105109
}

zigpy_xbee/types.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,10 @@ def __str__(self):
161161
return "0x{:04x}".format(self)
162162

163163

164+
class Relays(zigpy.types.LVList, item_type=NWK, length_type=uint8_t):
165+
"""List of Relays."""
166+
167+
164168
UNKNOWN_IEEE = EUI64([uint8_t(0xFF) for i in range(0, 8)])
165169
UNKNOWN_NWK = NWK(0xFFFE)
166170

0 commit comments

Comments
 (0)