Skip to content

Commit

Permalink
changed read_into to readinto to follow changes in Adafruit_CircuitPy…
Browse files Browse the repository at this point in the history
…thon_BusDevice (#6)

changed read_into to readinto
  • Loading branch information
mrmcwethy authored and tannewt committed Nov 8, 2017
1 parent 859c44c commit 761cb2d
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ we must implement ``__get__`` and ``__set__``.
def __get__(self, obj, objtype=None):
with obj.i2c_device:
obj.i2c_device.write(self.buffer, end=1, stop=False)
obj.i2c_device.read_into(self.buffer, start=1)
obj.i2c_device.readinto(self.buffer, start=1)
return bool(self.buffer[1] & self.bit_mask)
def __set__(self, obj, value):
with obj.i2c_device:
obj.i2c_device.write(self.buffer, end=1, stop=False)
obj.i2c_device.read_into(self.buffer, start=1)
obj.i2c_device.readinto(self.buffer, start=1)
if value:
self.buffer[1] |= self.bit_mask
else:
Expand Down
2 changes: 1 addition & 1 deletion adafruit_register/i2c_bcd_alarm.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def __get__(self, obj, objtype=None):
# Read the alarm register.
with obj.i2c_device:
obj.i2c_device.write(self.buffer, end=1, stop=False)
obj.i2c_device.read_into(self.buffer, start=1)
obj.i2c_device.readinto(self.buffer, start=1)

frequency = None
i = 1
Expand Down
2 changes: 1 addition & 1 deletion adafruit_register/i2c_bcd_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def __get__(self, obj, objtype=None):
# Read and return the date and time.
with obj.i2c_device:
obj.i2c_device.write(self.buffer, end=1, stop=False)
obj.i2c_device.read_into(self.buffer, start=1)
obj.i2c_device.readinto(self.buffer, start=1)
return time.struct_time((_bcd2bin(self.buffer[7]) + 2000,
_bcd2bin(self.buffer[6]),
_bcd2bin(self.buffer[5 - self.weekday_offset]),
Expand Down
4 changes: 2 additions & 2 deletions adafruit_register/i2c_bit.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ def __init__(self, register_address, bit):
def __get__(self, obj, objtype=None):
with obj.i2c_device as i2c:
i2c.write(self.buffer, end=1, stop=False)
i2c.read_into(self.buffer, start=1)
i2c.readinto(self.buffer, start=1)
return bool(self.buffer[1] & self.bit_mask)

def __set__(self, obj, value):
with obj.i2c_device as i2c:
i2c.write(self.buffer, end=1, stop=False)
i2c.read_into(self.buffer, start=1)
i2c.readinto(self.buffer, start=1)
if value:
self.buffer[1] |= self.bit_mask
else:
Expand Down
4 changes: 2 additions & 2 deletions adafruit_register/i2c_bits.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def __init__(self, num_bits, register_address, lowest_bit):
def __get__(self, obj, objtype=None):
with obj.i2c_device as i2c:
i2c.write(self.buffer, end=1, stop=False)
i2c.read_into(self.buffer, start=1)
i2c.readinto(self.buffer, start=1)
return (self.buffer[1] & self.bit_mask) >> self.lowest_bit

def __set__(self, obj, value):
Expand All @@ -54,7 +54,7 @@ def __set__(self, obj, value):
value = (value << self.lowest_bit) | ~self.bit_mask
with obj.i2c_device as i2c:
i2c.write(self.buffer, end=1, stop=False)
i2c.read_into(self.buffer, start=1)
i2c.readinto(self.buffer, start=1)
# Set all of our bits to 1.
self.buffer[1] |= self.bit_mask
# Set all 0 bits to 0 by anding together.
Expand Down
4 changes: 2 additions & 2 deletions adafruit_register/i2c_struct.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def __init__(self, register_address, struct_format):
def __get__(self, obj, objtype=None):
with obj.i2c_device:
obj.i2c_device.write(self.buffer, end=1, stop=False)
obj.i2c_device.read_into(self.buffer, start=1)
obj.i2c_device.readinto(self.buffer, start=1)
return struct.unpack_from(self.format, memoryview(self.buffer)[1:])

def __set__(self, obj, value):
Expand All @@ -69,7 +69,7 @@ def __init__(self, register_address, struct_format):
def __get__(self, obj, objtype=None):
with obj.i2c_device:
obj.i2c_device.write(self.buffer, end=1, stop=False)
obj.i2c_device.read_into(self.buffer, start=1)
obj.i2c_device.readinto(self.buffer, start=1)
return struct.unpack_from(self.format, memoryview(self.buffer)[1:])[0]

def __set__(self, obj, value):
Expand Down

0 comments on commit 761cb2d

Please sign in to comment.