Skip to content

Commit e7e9e4a

Browse files
committed
initial commit of a very large update
1 parent 2075ff1 commit e7e9e4a

File tree

164 files changed

+9452
-4710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+9452
-4710
lines changed

api_drivers/common_api_drivers/imu_sensor/qmi8658c.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ def _encode_setting(rnge, rate):
7373
GYRO_RATE_31_HZ = const(8)
7474

7575
I2C_ADDR = 0x6B
76-
BITS = 8
76+
_BITS = const(8)
7777

7878

7979
class QMI8658C(imu_sensor_framework.IMUSensorFramework):
8080

8181
def _read_reg(self, reg):
82-
self._device.read_mem(reg, self._rx_mv[:1])
82+
self._device.readfrom_mem_into(reg, self._rx_mv[:1])
8383
return self._rx_buf[0]
8484

8585
def _write_reg(self, reg, data):
8686
self._tx_buf[0] = data
87-
self._device.write_mem(reg, self._tx_mv[:1])
87+
self._device.writeto_mem(reg, self._tx_mv[:1])
8888

8989
def __init__(self, device, delay_between_samples=100):
9090

@@ -95,6 +95,8 @@ def __init__(self, device, delay_between_samples=100):
9595
self._rx_buf = bytearray(6)
9696
self._rx_mv = memoryview(self._rx_buf)
9797

98+
device.set_mem_addr_size(_BITS)
99+
98100
if self._read_reg(_VERSION_REG) != 0x05:
99101
raise RuntimeError("Failed to find QMI8658C")
100102

api_drivers/common_api_drivers/indev/axs15231.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
_AXS_MAX_TOUCH_NUMBER = const(1)
1111
_AXS_TOUCH_POINT_NUM = const(1)
1212
I2C_ADDR = 0x3B
13-
BITS = 8
13+
_BITS = const(8)
1414

1515

1616
class TouchRecord:
@@ -31,6 +31,7 @@ def __init__(
3131
startup_rotation=lv.DISPLAY_ROTATION._0, # NOQA
3232
debug=False
3333
):
34+
device.set_mem_addr_size(_BITS)
3435
self._device = device
3536

3637
super().__init__(touch_cal, startup_rotation, debug)
@@ -48,8 +49,8 @@ def __init__(
4849
self.__last_state = self.RELEASED
4950

5051
def _read_data(self):
51-
self._device.write(self._tx_mv)
52-
self._device.read(buf=self._rx_mv)
52+
self._device.writeto(self._tx_mv)
53+
self._device.readfrom_into(self._rx_mv)
5354

5455
touch_points = []
5556
data = self._rx_buf

api_drivers/common_api_drivers/indev/axs5106.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
_POINTS_REG = const(0X01)
1010

1111
I2C_ADDR = 0x63
12-
BITS = 8
12+
_BITS = const(8)
1313

1414

1515
class AXS5106(pointer_framework.PointerDriver):
1616

1717
def _read_reg(self, reg, num_bytes):
18-
self._tx_buf[0] = reg
1918
self._rx_mv[:num_bytes] = bytearray([0x00] * num_bytes)
20-
self._device.write(self._tx_mv[:1])
21-
self._device.read(buf=self._rx_mv[:num_bytes])
19+
self._device.readfrom_mem_into(reg, self._rx_mv[:num_bytes])
2220

2321
def __init__(
2422
self,
@@ -28,6 +26,7 @@ def __init__(
2826
startup_rotation=pointer_framework.lv.DISPLAY_ROTATION._0, # NOQA
2927
debug=False
3028
):
29+
device.set_mem_addr_size(_BITS)
3130
self._tx_buf = bytearray(1)
3231
self._tx_mv = memoryview(self._tx_buf)
3332
self._rx_buf = bytearray(14)

api_drivers/common_api_drivers/indev/cst328.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
I2C_ADDR = 0x1A
10-
BITS = 16
10+
_BITS = const(16)
1111

1212
# 4 byte read
1313
# PROJECT_ID = byte2 << 8 | byte3
@@ -55,22 +55,16 @@
5555
class CST328(pointer_framework.PointerDriver):
5656

5757
def _read_reg(self, reg, num_bytes):
58-
self._tx_buf[0] = reg >> 8
59-
self._tx_buf[1] = reg & 0xFF
60-
6158
self._rx_buf[:num_bytes] = bytearray([0x00] * num_bytes)
62-
63-
self._device.write_readinto(self._tx_mv[:2], self._rx_mv[:num_bytes])
59+
self._device.readfrom_mem_into(reg, self._rx_mv[:num_bytes])
6460

6561
def _write_reg(self, reg, value=None):
66-
self._tx_buf[0] = reg >> 8
67-
self._tx_buf[1] = reg & 0xFF
68-
6962
if value is None:
70-
self._device.write(self._tx_mv[:2])
63+
self._tx_buf[0] = 0x00
64+
self._device.writeto_mem(reg, self._tx_mv[:1])
7165
else:
72-
self._tx_buf[2] = value
73-
self._device.write(self._tx_mv[:3])
66+
self._tx_buf[0] = value
67+
self._device.writeto_mem(reg, self._tx_mv[:1])
7468

7569
def __init__(
7670
self,
@@ -84,7 +78,7 @@ def __init__(
8478
self._tx_mv = memoryview(self._tx_buf)
8579
self._rx_buf = bytearray(6)
8680
self._rx_mv = memoryview(self._rx_buf)
87-
81+
device.set_mem_addr_size(_BITS)
8882
self._device = device
8983

9084
if not isinstance(reset_pin, int):

api_drivers/common_api_drivers/indev/cst816s.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
I2C_ADDR = 0x15
10-
BITS = 8
10+
_BITS = const(8)
1111

1212
# 0x00: No gesture
1313
# 0x01: Swipe up
@@ -157,15 +157,12 @@
157157
class CST816S(pointer_framework.PointerDriver):
158158

159159
def _read_reg(self, reg):
160-
self._tx_buf[0] = reg
161160
self._rx_buf[0] = 0x00
162-
163-
self._device.write_readinto(self._tx_mv[:1], self._rx_mv[:1])
161+
self._device.readfrom_mem_into(reg, self._rx_mv[:1])
164162

165163
def _write_reg(self, reg, value):
166-
self._tx_buf[0] = reg
167-
self._tx_buf[1] = value
168-
self._device.write(self._tx_mv[:2])
164+
self._tx_buf[0] = value
165+
self._device.writeto_mem(reg, self._tx_mv[:1])
169166

170167
def __init__(
171168
self,
@@ -179,7 +176,7 @@ def __init__(
179176
self._tx_mv = memoryview(self._tx_buf)
180177
self._rx_buf = bytearray(1)
181178
self._rx_mv = memoryview(self._rx_buf)
182-
179+
device.set_mem_addr_size(_BITS)
183180
self._device = device
184181

185182
if not isinstance(reset_pin, int):

api_drivers/common_api_drivers/indev/focaltech_touch.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
_PANEL_ID_REG = const(0xA8)
3737

3838
_G_MODE = const(0xA4)
39+
_BITS = const(8)
3940

4041

4142
class FocalTechTouch(pointer_framework.PointerDriver):
@@ -54,6 +55,7 @@ def __init__(
5455
self._rx_buf = bytearray(5)
5556
self._rx_mv = memoryview(self._rx_buf)
5657

58+
device.set_mem_addr_size(_BITS)
5759
self._device = device
5860
self._factors = factors
5961

@@ -91,9 +93,8 @@ def __init__(
9193
)
9294

9395
def _get_coords(self):
94-
self._tx_buf[0] = _TD_STAT_REG
9596
try:
96-
self._device.write_readinto(self._tx_mv, self._rx_mv)
97+
self._device.readfrom_mem_into(_TD_STAT_REG, self._rx_mv)
9798
except OSError:
9899
return None
99100

@@ -113,12 +114,9 @@ def _get_coords(self):
113114
return self.PRESSED, x, y
114115

115116
def _read_reg(self, reg):
116-
self._tx_buf[0] = reg
117117
self._rx_buf[0] = 0x00
118-
119-
self._device.write_readinto(self._tx_mv[:1], self._rx_mv[:1])
118+
self._device.readfrom_mem_into(reg, self._rx_mv[:1])
120119

121120
def _write_reg(self, reg, value):
122-
self._tx_buf[0] = reg
123-
self._tx_buf[1] = value
124-
self._device.write(self._tx_mv[:2])
121+
self._tx_buf[0] = value
122+
self._device.writeto_mem(reg, self._tx_mv[:1])

api_drivers/common_api_drivers/indev/ft5x06.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
_TD_STATUS = const(0x02)
1212

1313
I2C_ADDR = 0x38
14-
BITS = 8
1514

1615
_FT5x06_CHIPID = const(0x55)
1716

api_drivers/common_api_drivers/indev/ft5x16.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99

1010
I2C_ADDR = 0x38
11-
BITS = 8
1211

1312
_FT5x16_CHIPID = const(0x0A)
1413

api_drivers/common_api_drivers/indev/ft5x26.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
_TD_STATUS = const(0x02)
1212

1313
I2C_ADDR = 0x38
14-
BITS = 8
1514

1615
_FT5x26_CHIPID = const(0x54)
1716

api_drivers/common_api_drivers/indev/ft5x36.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
_TD_STATUS = const(0x02)
1010

1111
I2C_ADDR = 0x38
12-
BITS = 8
1312

1413
_FT5x36_CHIPID_1 = const(0x11)
1514
_FT5x36_CHIPID_2 = const(0x12)

0 commit comments

Comments
 (0)