From cd39e67c281b1de909d31780007d70b1e4b165de Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 5 Oct 2021 22:09:18 +0200 Subject: [PATCH 1/2] move bytearray.fromhex to ubinascii.unhexlify --- adafruit_atecc/adafruit_atecc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adafruit_atecc/adafruit_atecc.py b/adafruit_atecc/adafruit_atecc.py index ec4d6e0..c5de446 100755 --- a/adafruit_atecc/adafruit_atecc.py +++ b/adafruit_atecc/adafruit_atecc.py @@ -47,7 +47,7 @@ from struct import pack from micropython import const from adafruit_bus_device.i2c_device import I2CDevice -from adafruit_binascii import hexlify +from adafruit_binascii import hexlify, unhexlify __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ATECC.git" @@ -120,8 +120,8 @@ def _convert_i2c_addr_to_atecc_addr(i2c_addr=0x60): Byte 16: 20 32 0010 0000 Default 7 bit I2C Address: 0x20>>1: 0x10 ATECC608A-UNKNOWN """ CFG_TLS = bytes( - bytearray.fromhex( - "01 23 00 00 00 00 50 00 00 00 00 00 00 c0 71 00" + bytearray( + unhexlify(("01 23 00 00 00 00 50 00 00 00 00 00 00 c0 71 00" "20 20 20 20 20 20 20 20 20 20 20 20 20 c0 00 55" "00 83 20 87 20 87 20 87 2f 87 2f 8f 8f 9f 8f af" "20 20 20 20 20 20 20 20 20 20 20 20 20 8f 00 00" @@ -134,13 +134,13 @@ def _convert_i2c_addr_to_atecc_addr(i2c_addr=0x60): "00 33 20 20 20 20 20 20 20 20 20 20 20 20 20 00" "33 00 33 00 33 00 33 00 1c 00 1c 00 1c 00 3c 00" "3c 00 3c 00 3c 20 20 20 20 20 20 20 20 20 20 20" - "20 20 00 3c 00 3c 00 3c 00 1c 00" + "20 20 00 3c 00 3c 00 3c 00 1c 00").replace(" ", "")) ) ) # Convert I2C address to config byte 16 and update CFG_TLS _CFG_BYTES_LIST = list(bytearray(CFG_TLS)) -_CFG_BYTE_16 = bytes(bytearray.fromhex(hex(_I2C_ADDR << 1).replace("0x", ""))) +_CFG_BYTE_16 = bytes(bytearray(unhexlify(hex(_I2C_ADDR << 1).replace("0x", "")))) _CFG_BYTES_LIST_MOD = _CFG_BYTES_LIST[0:16] + list(_CFG_BYTE_16) + _CFG_BYTES_LIST[17:] CFG_TLS = bytes(_CFG_BYTES_LIST_MOD) From ef45cd39ad1628a711c74f511a855ee81c31b196 Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 5 Oct 2021 23:15:30 +0200 Subject: [PATCH 2/2] code formatting --- adafruit_atecc/adafruit_atecc.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/adafruit_atecc/adafruit_atecc.py b/adafruit_atecc/adafruit_atecc.py index c5de446..8b0832e 100755 --- a/adafruit_atecc/adafruit_atecc.py +++ b/adafruit_atecc/adafruit_atecc.py @@ -121,20 +121,24 @@ def _convert_i2c_addr_to_atecc_addr(i2c_addr=0x60): """ CFG_TLS = bytes( bytearray( - unhexlify(("01 23 00 00 00 00 50 00 00 00 00 00 00 c0 71 00" - "20 20 20 20 20 20 20 20 20 20 20 20 20 c0 00 55" - "00 83 20 87 20 87 20 87 2f 87 2f 8f 8f 9f 8f af" - "20 20 20 20 20 20 20 20 20 20 20 20 20 8f 00 00" - "00 00 00 00 00 00 00 00 00 00 00 00 20 20 20 20" - "20 20 20 20 20 20 20 20 20 af 8f ff ff ff ff 00" - "00 00 00 ff ff ff ff 00 20 20 20 20 20 20 20 20" - "20 20 20 20 20 00 00 00 ff ff ff ff ff ff ff ff" - "ff ff ff ff 20 20 20 20 20 20 20 20 20 20 20 20" - "20 ff ff ff ff 00 00 55 55 ff ff 00 00 00 00 00" - "00 33 20 20 20 20 20 20 20 20 20 20 20 20 20 00" - "33 00 33 00 33 00 33 00 1c 00 1c 00 1c 00 3c 00" - "3c 00 3c 00 3c 20 20 20 20 20 20 20 20 20 20 20" - "20 20 00 3c 00 3c 00 3c 00 1c 00").replace(" ", "")) + unhexlify( + ( + "01 23 00 00 00 00 50 00 00 00 00 00 00 c0 71 00" + "20 20 20 20 20 20 20 20 20 20 20 20 20 c0 00 55" + "00 83 20 87 20 87 20 87 2f 87 2f 8f 8f 9f 8f af" + "20 20 20 20 20 20 20 20 20 20 20 20 20 8f 00 00" + "00 00 00 00 00 00 00 00 00 00 00 00 20 20 20 20" + "20 20 20 20 20 20 20 20 20 af 8f ff ff ff ff 00" + "00 00 00 ff ff ff ff 00 20 20 20 20 20 20 20 20" + "20 20 20 20 20 00 00 00 ff ff ff ff ff ff ff ff" + "ff ff ff ff 20 20 20 20 20 20 20 20 20 20 20 20" + "20 ff ff ff ff 00 00 55 55 ff ff 00 00 00 00 00" + "00 33 20 20 20 20 20 20 20 20 20 20 20 20 20 00" + "33 00 33 00 33 00 33 00 1c 00 1c 00 1c 00 3c 00" + "3c 00 3c 00 3c 20 20 20 20 20 20 20 20 20 20 20" + "20 20 00 3c 00 3c 00 3c 00 1c 00" + ).replace(" ", "") + ) ) )