remove individual properties

Author: jfurcean

adafruit_nunchuk.py

@@ -5,22 +5,14 @@
 """
 `adafruit_nunchuk`
 ================================================================================
-
 CircuitPython library for Nintendo Nunchuk controller
-
-
 * Author(s): Carter Nelson
-
 Implementation Notes
 --------------------
-
 **Hardware:**
-
 * `Wii Remote Nunchuk <https://en.wikipedia.org/wiki/Wii_Remote#Nunchuk>`_
 * `Wiichuck <https://www.adafruit.com/product/342>`_
-
 **Software and Dependencies:**
-
 * Adafruit CircuitPython firmware for the supported boards:
   https://github.com/adafruit/circuitpython/releases
 * Adafruit's Bus Device library: https://github.com/adafruit/Adafruit_CircuitPython_BusDevice
@@ -38,7 +30,6 @@
 class Nunchuk:
     """
     Class which provides interface to Nintendo Nunchuk controller.
-
     :param i2c: The `busio.I2C` object to use.
     :param address: The I2C address of the device. Default is 0x52.
     :type address: int, optional
@@ -58,7 +49,6 @@ def __init__(self, i2c, address=0x52, i2c_read_delay=0.002):
         self.buffer = bytearray(8)
         self.i2c_device = I2CDevice(i2c, address)
         self._i2c_read_delay = i2c_read_delay
-        self._do_read = True
         time.sleep(_I2C_INIT_DELAY)
         with self.i2c_device as i2c_dev:
             # turn off encrypted data
@@ -69,55 +59,52 @@ def __init__(self, i2c, address=0x52, i2c_read_delay=0.002):
 
     @property
     def values(self):
-        """Return named tuple of all the input values."""
+        """The current state of all values."""
         self._read_data()
-        self._do_read = False
-        values = self._Values(
-            self._Joystick(self.joystick[0], self.joystick[1]),
-            self._Buttons(self.button_C, self.button_Z),
-            self._Acceleration(
-                self.acceleration[0], self.acceleration[1], self.acceleration[2]
-            ),
+        return self._Values(
+            self._joystick(do_read=False),
+            self._buttons(do_read=False),
+            self._acceleration(do_read=False),
         )
-        self._do_read = True
-        return values
 
     @property
     def joystick(self):
-        """Return tuple of current joystick position."""
-        if self._do_read:
-            self._read_data()
-        return self.buffer[0], self.buffer[1]
+        """The current joystick position."""
+        return self._joystick()
 
     @property
-    def button_C(self):  # pylint: disable=invalid-name
-        """Return current pressed state of button C."""
-        if self._do_read:
-            self._read_data()
-        return not bool(self.buffer[5] & 0x02)
+    def buttons(self):  # pylint: disable=invalid-name
+        """The current pressed state of button Z."""
+        return self._buttons()
 
     @property
-    def button_Z(self):  # pylint: disable=invalid-name
-        """Return current pressed state of button Z."""
-        if self._do_read:
+    def acceleration(self):
+        """The current accelerometer reading."""
+        return self._acceleration()
+
+    def _joystick(self, do_read=True):
+        if do_read:
             self._read_data()
-        return not bool(self.buffer[5] & 0x01)
+        return self._Joystick(self.buffer[0], self.buffer[1]) # x, y
 
-    @property
-    def acceleration(self):
-        """Return 3 tuple of accelerometer reading."""
-        if self._do_read:
+    def _buttons(self, do_read=True):
+        if do_read:
             self._read_data()
-        x = (self.buffer[5] & 0xC0) >> 6
-        x |= self.buffer[2] << 2
-        y = (self.buffer[5] & 0x30) >> 4
-        y |= self.buffer[3] << 2
-        z = (self.buffer[5] & 0x0C) >> 2
-        z |= self.buffer[4] << 2
-        return x, y, z
+        return self._Buttons(
+            not bool(self.buffer[5] & 0x02),    # C
+            not bool(self.buffer[5] & 0x01)     # Z
+        )
+
+    def _acceleration(self, do_read=True):
+        if do_read:
+            self._read_data()
+        return self._Acceleration(
+            ((self.buffer[5] & 0xC0) >> 6) | (self.buffer[2] << 2), #ax
+            ((self.buffer[5] & 0x30) >> 4) | (self.buffer[3] << 2), #ay
+            ((self.buffer[5] & 0x0C) >> 2) | (self.buffer[4] << 2), #az
+        )
 
     def _read_data(self):
-        """Reads all of the raw input data from i2c."""
         return self._read_register(b"\x00")
 
     def _read_register(self, address):

examples/nunchuk_accel_mouse.py

@@ -42,9 +42,10 @@
     relY = y - centerY
 
     m.move(int(scaleX * relX), int(scaleY * relY), 0)
+    buttons = nc.buttons
 
-    c = nc.button_C
-    z = nc.button_Z
+    c = buttons.C
+    z = buttons.Z
 
     if z and not zDown:
         stillDown = True

examples/nunchuk_analog_mouse.py

@@ -37,8 +37,9 @@
 
     m.move(int(scaleX * relX), int(scaleY * relY), 0)
 
-    c = nc.button_C
-    z = nc.button_Z
+    buttons = nc.buttons
+    c = buttons.C
+    z = buttons.Z
 
     if z and not zDown:
         stillDown = True