Skip to content

Commit 3b717f1

Browse files
Ran pre-commit
1 parent 1f37df5 commit 3b717f1

File tree

1 file changed

+11
-39
lines changed

1 file changed

+11
-39
lines changed

micropython/register/i2c_register.py

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@
4343

4444

4545
class RORegBit:
46-
def __init__(
47-
self, i2c, dev_addr, reg_addr, num_bytes, bit_location, endian="", fmt="B"
48-
):
46+
def __init__(self, i2c, dev_addr, reg_addr, num_bytes, bit_location, endian="", fmt="B"):
4947
"""
5048
Creates an :class:`RORegBit` object which allows read only access to a single bit within a register.
5149
@@ -143,9 +141,7 @@ def __get__(self):
143141

144142

145143
class RWRegBit:
146-
def __init__(
147-
self, i2c, dev_addr, reg_addr, num_bytes, bit_location, endian="", fmt="B"
148-
):
144+
def __init__(self, i2c, dev_addr, reg_addr, num_bytes, bit_location, endian="", fmt="B"):
149145
"""
150146
Creates an :class:`RORegBit` object which allows read and write access to a single bit within a register.
151147
@@ -231,9 +227,7 @@ def get_my_reg2(self, n):
231227

232228
__check_reg(self)
233229

234-
self._premask, self._postmask = __calc_mask(
235-
bit_location, bit_location, num_bytes
236-
)
230+
self._premask, self._postmask = __calc_mask(bit_location, bit_location, num_bytes)
237231

238232
del (i2c, dev_addr, reg_addr, num_bytes, bit_location, endian, fmt)
239233

@@ -253,9 +247,7 @@ def __set__(self, setting):
253247

254248

255249
class RORegBits:
256-
def __init__(
257-
self, i2c, dev_addr, reg_addr, num_bytes, lsb, msb, endian="", fmt="B"
258-
):
250+
def __init__(self, i2c, dev_addr, reg_addr, num_bytes, lsb, msb, endian="", fmt="B"):
259251
"""
260252
Creates an :class:`RORegBits` object which allows read only access to a sequential set of bits within a bitfield.
261253
@@ -359,9 +351,7 @@ def __get__(self):
359351

360352

361353
class RWRegBits:
362-
def __init__(
363-
self, i2c, dev_addr, reg_addr, num_bytes, lsb, msb, endian="", fmt="B"
364-
):
354+
def __init__(self, i2c, dev_addr, reg_addr, num_bytes, lsb, msb, endian="", fmt="B"):
365355
"""
366356
Creates an :class:`RWRegBits` object which allows read and write access to a sequential set of bits within a bitfield.
367357
@@ -742,9 +732,7 @@ def __setbit(reg_object, setting):
742732
value = pack(reg_object._endian + reg_object._fmt, value)
743733

744734
# Write to I2C
745-
reg_object._i2c.writeto_mem(
746-
reg_object._dev_addr, reg_object._reg_addr, value
747-
)
735+
reg_object._i2c.writeto_mem(reg_object._dev_addr, reg_object._reg_addr, value)
748736

749737
# Return True for success
750738
return True
@@ -775,7 +763,6 @@ def __getbits(reg_object):
775763
def __setbits(reg_object, setting):
776764
if isinstance(reg_object, RWRegBits):
777765
if isinstance(setting, int) and setting <= reg_object._mask:
778-
779766
# Retrieve register value and unpack to int
780767
value = reg_object._i2c.readfrom_mem(
781768
reg_object._dev_addr, reg_object._reg_addr, reg_object._num_bytes
@@ -795,16 +782,12 @@ def __setbits(reg_object, setting):
795782
value = struct.pack(reg_object._endian + reg_object._fmt, value)
796783

797784
# Write to device
798-
reg_object._i2c.writeto_mem(
799-
reg_object._dev_addr, reg_object._reg_addr, value
800-
)
785+
reg_object._i2c.writeto_mem(reg_object._dev_addr, reg_object._reg_addr, value)
801786

802787
return True
803788

804789
else:
805-
raise ValueError(
806-
f"value of setting exceeds max value of bitfield: {reg_object._mask}"
807-
)
790+
raise ValueError(f"value of setting exceeds max value of bitfield: {reg_object._mask}")
808791
else:
809792
raise TypeError("incorrect object type - must be RWRegBits")
810793

@@ -824,13 +807,10 @@ def __getreg(reg_object):
824807

825808

826809
def __setreg(reg_object, settings):
827-
828810
if isinstance(reg_object, RWReg):
829811
if isinstance(settings, (bytes, bytearray)):
830812
# Write to device
831-
reg_object._i2c.writeto_mem(
832-
reg_object._dev_addr, reg_object._reg_addr, settings
833-
)
813+
reg_object._i2c.writeto_mem(reg_object._dev_addr, reg_object._reg_addr, settings)
834814

835815
elif isinstance(settings, (tuple, list)):
836816
# Where our data will go
@@ -867,10 +847,8 @@ def __calc_mask(lsb, msb, numbytes):
867847
if lsb.__class__() == int() and lsb >= 0:
868848
if msb.__class__() == int() and msb >= 0:
869849
if numbytes.__class__() == int() and numbytes >= 0:
870-
871850
# Check for detectable errors
872851
if msb >= lsb:
873-
874852
# Single bit mask
875853
if msb == lsb:
876854
pre, post = 0b0, 0b0
@@ -887,7 +865,6 @@ def __calc_mask(lsb, msb, numbytes):
887865

888866
# Multibit mask
889867
else:
890-
891868
# Values to return
892869
pre, mask, post = 0b0, 0b0, 0b0
893870

@@ -919,7 +896,6 @@ def __calc_mask(lsb, msb, numbytes):
919896

920897

921898
def __check_reg(reg_object):
922-
923899
# Alowable struct.pack/unpack formats to check for
924900
fmts = {
925901
"b": 1,
@@ -939,20 +915,16 @@ def __check_reg(reg_object):
939915

940916
# Take in only register objects
941917
if isinstance(reg_object, (RORegBit, RWRegBit, RORegBits, RWRegBits, ROReg, RWReg)):
942-
943918
# Make sure they are strings
944919
if type(reg_object._fmt) == str and type(reg_object._endian) == str:
945-
946920
# Check each letter in format string, To see if allowable
947921
for n in range(0, len(reg_object._fmt)):
948922
if reg_object._fmt[n] in fmts:
949923
# Add corresonding byte length to verify _num_bytes and format string agree
950924
byte_count = byte_count + fmts[reg_object._fmt[n]]
951925

952926
else:
953-
raise ValueError(
954-
f"unsupported format code of '{reg_object._fmt[n]}'"
955-
)
927+
raise ValueError(f"unsupported format code of '{reg_object._fmt[n]}'")
956928

957929
if byte_count != reg_object._num_bytes:
958930
raise ValueError(
@@ -964,4 +936,4 @@ def __check_reg(reg_object):
964936
else:
965937
raise TypeError(
966938
"incorrect object type - must be ROReg, RWReg, ROBits, RWBits, ROReg, RWReg"
967-
)
939+
)

0 commit comments

Comments
 (0)