Skip to content

Commit 2f9a373

Browse files
matouch_esp32_s3_2_8: fix touch during camera
1 parent 1971e1c commit 2f9a373

6 files changed

Lines changed: 16 additions & 171 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Frameworks:
1212
OS:
1313
- Scale MicroPythonOS boot logo down if necessary
1414
- Add board support: MaTouch ESP32-S3 SPI IPS 2.8' with Camera OV3660
15+
- UI: Don't show battery icon if not present
1516

1617
0.7.1
1718
=====

internal_filesystem/lib/mpos/board/matouch_esp32_s3_2_8.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,18 @@ def init_cam(width, height, colormode):
161161
print("input disabled")
162162
except Exception as e:
163163
print(f"init_cam: disabling indev got exception: {e}")
164+
try:
165+
import i2c
166+
i2c_bus = i2c.I2C.Bus(host=0, scl=38, sda=39)
167+
import mpos.indev.gt911 as gt911
168+
touch_dev = i2c.I2C.Device(bus=i2c_bus, dev_id=gt911.I2C_ADDR, reg_bits=gt911.BITS)
169+
indev = gt911.GT911(touch_dev, reset_pin=1, interrupt_pin=40, debug=True) # remove debug because it's slower
170+
print("new indev created")
171+
from mpos import InputManager
172+
InputManager.register_indev(indev)
173+
print("new indev registered")
174+
except Exception as e:
175+
print(f"Indev enable got exception: {e}")
164176

165177
except Exception as e:
166178
print(f"init_cam exception: {e}")
@@ -184,13 +196,6 @@ def deinit_cam(cam):
184196
import time
185197
time.sleep_ms(100)
186198
try:
187-
# hardware reset might work too, but doesn't seem to:
188-
#from mpos import InputManager
189-
#indev = InputManager.list_indevs()[0]
190-
#indev.hw_reset()
191-
#indev.enable(True)
192-
#print("input enabled")
193-
#time.sleep(1)
194199
import i2c
195200
i2c_bus = i2c.I2C.Bus(host=0, scl=38, sda=39)
196201
import mpos.indev.gt911 as gt911

internal_filesystem/lib/mpos/camera_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def resolution_to_framesize(width, height):
248248
return resolution_map.get((width, height), FrameSize.R240X240)
249249

250250
@staticmethod
251-
def ov_apply_camera_settings(self, cam, prefs):
251+
def ov_apply_camera_settings(cam, prefs):
252252
if not cam or not prefs:
253253
print("ov_apply_camera_settings: Skipping because invalid prefs or cam object")
254254
return

internal_filesystem/lib/mpos/indev/gt911.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ def hw_reset(self):
114114
self._reset_pin(0)
115115
time.sleep_ms(10) # NOQA
116116
if self._interrupt_pin:
117-
self._interrupt_pin(1) # only for 0x14 address
118-
#self._interrupt_pin(0)
117+
self._interrupt_pin(1) # causes it to stay on 0x14 address
118+
#self._interrupt_pin(0) # causes it to go to 0x5D address
119119
time.sleep_ms(1) # NOQA
120120
self._reset_pin(1)
121121
time.sleep_ms(5) # NOQA

internal_filesystem/lib/mpos/indev/gt911_extension.py

Lines changed: 0 additions & 157 deletions
This file was deleted.

internal_filesystem/lib/mpos/indev/gt911_settings_gui.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)