Merge pull request #27 from tannewt/remove_stop

Remove stop kwarg and use write_then_readinto.

Author: caternuson

README.rst

@@ -136,15 +136,13 @@ we must implement ``__get__`` and ``__set__``.
 .. code-block:: python
 
     def __get__(self, obj, objtype=None):
-        with obj.i2c_device:
-            obj.i2c_device.write(self.buffer, end=1, stop=False)
-            obj.i2c_device.readinto(self.buffer, start=1)
+        with obj.i2c_device as i2c:
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_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.readinto(self.buffer, start=1)
+        with obj.i2c_device as i2c:
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_start=1)
             if value:
                 self.buffer[1] |= self.bit_mask
             else:

adafruit_register/i2c_bcd_alarm.py

@@ -95,9 +95,8 @@ def __init__(self, register_address, has_seconds=True, weekday_shared=True, week
 
     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.readinto(self.buffer, start=1)
+        with obj.i2c_device as i2c:
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_start=1)
 
         frequency = None
         i = 1

adafruit_register/i2c_bcd_datetime.py

@@ -77,9 +77,8 @@ def __init__(self, register_address, weekday_first=True, weekday_start=1):
 
     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.readinto(self.buffer, start=1)
+        with obj.i2c_device as i2c:
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_start=1)
         return time.struct_time((_bcd2bin(self.buffer[7]) + 2000,
                                  _bcd2bin(self.buffer[6]),
                                  _bcd2bin(self.buffer[5 - self.weekday_offset]),

adafruit_register/i2c_bit.py

@@ -56,13 +56,13 @@ def __init__(self, register_address, bit, register_width=1, lsb_first=True):
     def __get__(self, obj, objtype=None):
         with obj.i2c_device as i2c:
             i2c.write_then_readinto(self.buffer, self.buffer,
-                                    out_end=1, in_start=1, stop=False)
+                                    out_end=1, in_start=1)
         return bool(self.buffer[self.byte] & self.bit_mask)
 
     def __set__(self, obj, value):
         with obj.i2c_device as i2c:
             i2c.write_then_readinto(self.buffer, self.buffer,
-                                    out_end=1, in_start=1, stop=False)
+                                    out_end=1, in_start=1)
             if value:
                 self.buffer[self.byte] |= self.bit_mask
             else:

adafruit_register/i2c_bits.py

@@ -58,8 +58,7 @@ def __init__(self, num_bits, register_address, lowest_bit, # pylint: disable=too
 
     def __get__(self, obj, objtype=None):
         with obj.i2c_device as i2c:
-            i2c.write_then_readinto(self.buffer, self.buffer,
-                                    out_end=1, in_start=1, stop=False)
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_start=1)
         # read the number of bytes into a single variable
         reg = 0
         order = range(len(self.buffer)-1, 0, -1)
@@ -72,8 +71,7 @@ def __get__(self, obj, objtype=None):
     def __set__(self, obj, value):
         value <<= self.lowest_bit    # shift the value over to the right spot
         with obj.i2c_device as i2c:
-            i2c.write_then_readinto(self.buffer, self.buffer,
-                                    out_end=1, in_start=1, stop=False)
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_start=1)
             reg = 0
             order = range(len(self.buffer)-1, 0, -1)
             if not self.lsb_first:

adafruit_register/i2c_struct.py

@@ -55,8 +55,7 @@ def __init__(self, register_address, struct_format):
 
     def __get__(self, obj, objtype=None):
         with obj.i2c_device as i2c:
-            i2c.write_then_readinto(self.buffer, self.buffer,
-                                    out_end=1, in_start=1, stop=False)
+            i2c.write_then_readinto(self.buffer, self.buffer, out_end=1, in_start=1)
         return struct.unpack_from(self.format, memoryview(self.buffer)[1:])
 
     def __set__(self, obj, value):
@@ -83,8 +82,7 @@ def __get__(self, obj, objtype=None):
         buf = bytearray(1+struct.calcsize(self.format))
         buf[0] = self.address
         with obj.i2c_device as i2c:
-            i2c.write_then_readinto(buf, buf,
-                                    out_end=1, in_start=1, stop=False)
+            i2c.write_then_readinto(buf, buf, out_end=1, in_start=1)
         return struct.unpack_from(self.format, buf, 1)[0]
 
     def __set__(self, obj, value):

adafruit_register/i2c_struct_array.py

@@ -29,10 +29,7 @@
 * Author(s): Scott Shawcroft
 """
 
-try:
-    import struct
-except ImportError:
-    import ustruct as struct
+import struct
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git"
@@ -67,7 +64,7 @@ def __getitem__(self, index):
         buf = self._get_buffer(index)
         with self.obj.i2c_device as i2c:
             i2c.write_then_readinto(buf, buf,
-                                    out_end=1, in_start=1, stop=False)
+                                    out_end=1, in_start=1)
         return struct.unpack_from(self.format, buf, 1)  # offset=1
 
     def __setitem__(self, index, value):