Skip to content

Commit 8bdbb8f

Browse files
committed
make read_data private again
1 parent ca66124 commit 8bdbb8f

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

adafruit_nunchuk.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class Nunchuk:
5454
_Buttons = namedtuple("Buttons", ("C", "Z"))
5555
_Acceleration = namedtuple("Acceleration", ("x", "y", "z"))
5656

57-
def __init__(self, i2c, address=0x52, i2c_read_delay=0.002, force_read=True):
57+
def __init__(self, i2c, address=0x52, i2c_read_delay=0.002):
5858
self.buffer = bytearray(8)
5959
self.i2c_device = I2CDevice(i2c, address)
6060
self._i2c_read_delay = i2c_read_delay
61-
self._force_read = force_read
61+
self._do_read = True
6262
time.sleep(_I2C_INIT_DELAY)
6363
with self.i2c_device as i2c_dev:
6464
# turn off encrypted data
@@ -70,45 +70,44 @@ def __init__(self, i2c, address=0x52, i2c_read_delay=0.002, force_read=True):
7070
@property
7171
def values(self):
7272
"""Return named tuple of all the input values."""
73-
self.read_data()
74-
temp_force_read = self._force_read
75-
self._force_read = False
73+
self._read_data()
74+
self._do_read = False
7675
values = self._Values(
7776
self._Joystick(self.joystick[0], self.joystick[1]),
7877
self._Buttons(self.button_C, self.button_Z),
7978
self._Acceleration(
8079
self.acceleration[0], self.acceleration[1], self.acceleration[2]
8180
),
8281
)
83-
self._force_read = temp_force_read
82+
self._do_read = True
8483
return values
8584

8685
@property
8786
def joystick(self):
8887
"""Return tuple of current joystick position."""
89-
if self._force_read:
90-
self.read_data()
88+
if self._do_read:
89+
self._read_data()
9190
return self.buffer[0], self.buffer[1]
9291

9392
@property
9493
def button_C(self): # pylint: disable=invalid-name
9594
"""Return current pressed state of button C."""
96-
if self._force_read:
97-
self.read_data()
95+
if self._do_read:
96+
self._read_data()
9897
return not bool(self.buffer[5] & 0x02)
9998

10099
@property
101100
def button_Z(self): # pylint: disable=invalid-name
102101
"""Return current pressed state of button Z."""
103-
if self._force_read:
104-
self.read_data()
102+
if self._do_read:
103+
self._read_data()
105104
return not bool(self.buffer[5] & 0x01)
106105

107106
@property
108107
def acceleration(self):
109108
"""Return 3 tuple of accelerometer reading."""
110-
if self._force_read:
111-
self.read_data()
109+
if self._do_read:
110+
self._read_data()
112111
x = (self.buffer[5] & 0xC0) >> 6
113112
x |= self.buffer[2] << 2
114113
y = (self.buffer[5] & 0x30) >> 4
@@ -117,7 +116,7 @@ def acceleration(self):
117116
z |= self.buffer[4] << 2
118117
return x, y, z
119118

120-
def read_data(self):
119+
def _read_data(self):
121120
"""Reads all of the raw input data from i2c."""
122121
return self._read_register(b"\x00")
123122

examples/nunchuk_accel_mouse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# print((0 if nc.button_C else 1, 0 if nc.button_Z else 1))
2828

2929
while True:
30-
nc.read_data()
30+
3131
accel = nc.acceleration
3232
# print(accel)
3333
# x, y = nc.joystick

examples/nunchuk_analog_mouse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# print((0 if nc.button_C else 1, 0 if nc.button_Z else 1))
2828

2929
while True:
30-
nc.read_data()
30+
3131
x, y = nc.joystick
3232
# Eliminate spurious reads
3333
if x == 255 or y == 255:

examples/nunchuk_mouse.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
nc = adafruit_nunchuk.Nunchuk(board.I2C())
1313

1414
while True:
15-
nc.read_data()
1615
x, y = nc.joystick
1716
x = (x - 128) // 2
1817
y = (128 - y) // 2

0 commit comments

Comments
 (0)