m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve bar swipe down detection

Browse Source
This commit is contained in:
Thomas Farstrike
2025-04-23 13:10:30 +02:00
parent 07e33ac915
commit f2e39e1871
2 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.py
+44 -29
View File
@@ -29,7 +29,6 @@ TP_REGBITS = 8
TFT_HOR_RES=320
TFT_VER_RES=240
#lv.init() # not needed
spi_bus = machine.SPI.Bus(
host=SPI_BUS,
mosi=LCD_MOSI,
@@ -64,11 +63,7 @@ indev=cst816s.CST816S(touch_dev,startup_rotation=lv.DISPLAY_ROTATION._180) # but
th = task_handler.TaskHandler()
display.set_rotation(lv.DISPLAY_ROTATION._90)
# Custom touch interrupt handler:
indev._write_reg(0xEC,0x06)
indev._write_reg(0xFA,0x50)
irq_pin=machine.Pin(46,machine.Pin.IN,machine.Pin.PULL_UP)
# gesture ids:
# Gesture IDs:
# 0: press
# 1: swipe from left to USB port
# 2: swipe from USB port to left
@@ -76,29 +71,49 @@ irq_pin=machine.Pin(46,machine.Pin.IN,machine.Pin.PULL_UP)
# 4: bottom to top
# 5: release
# 12: long press
def handle_gesture(pin):
indev._read_reg(0x01)
gesture_id=indev._rx_buf[0]
indev._read_reg(0x02)
finger_num=indev._rx_buf[0]
indev._read_reg(0x03)
x_h=indev._rx_buf[0]
indev._read_reg(0x04)
x_l=indev._rx_buf[0]
x=((x_h&0x0F)<<8)|x_l
indev._read_reg(0x05)
y_h=indev._rx_buf[0]
indev._read_reg(0x06)
y_l=indev._rx_buf[0]
y=((y_h&0x0F)<<8)|y_l
#print(f"GestureID={gesture_id},FingerNum={finger_num},X={x},Y={y}")
if gesture_id==0x04:
#print("Swipe Up Detected")
close_drawer()
elif gesture_id==0x03:
#print("Swipe Down Detected")
open_drawer()
irq_pin.irq(trigger=machine.Pin.IRQ_FALLING,handler=handle_gesture)
start_y = None # Variable to store the starting Y-coordinate of a touch
def handle_gesture(pin):
global start_y # Access the global start_y variable
indev._read_reg(0x01)
gesture_id = indev._rx_buf[0]
indev._read_reg(0x02)
finger_num = indev._rx_buf[0]
indev._read_reg(0x03)
x_h = indev._rx_buf[0]
indev._read_reg(0x04)
x_l = indev._rx_buf[0]
x = ((x_h & 0x0F) << 8) | x_l
indev._read_reg(0x05)
y_h = indev._rx_buf[0]
indev._read_reg(0x06)
y_l = indev._rx_buf[0]
y = ((y_h & 0x0F) << 8) | y_l
#print(f"GestureID={gesture_id},FingerNum={finger_num},X={x},Y={y}")
temp = y
y = TFT_VER_RES - x
#x = TFT_HOR_RES - temp
x = temp
print(f"Corrected GestureID={gesture_id},FingerNum={finger_num},X={x},Y={y}")
if gesture_id == 0x00 and start_y is None: # Press (touch start)
# Store the starting Y-coordinate
start_y = y
print(f"Touch started at Y={start_y}")
elif gesture_id == 0x04: # Swipe up
# print("Swipe Up Detected")
close_drawer()
start_y = None # Clear start_y after gesture
elif gesture_id == 0x03: # Swipe down
if start_y is not None and start_y < NOTIFICATION_BAR_HEIGHT:
# print("Swipe Down Detected from Notification Bar")
open_drawer()
start_y = None # Clear start_y after gesture
elif gesture_id == 0x05: # Release
start_y = None # Clear start_y on release
indev._write_reg(0xEC,0x06)
indev._write_reg(0xFA,0x50)
irq_pin=machine.Pin(46,machine.Pin.IN,machine.Pin.PULL_UP)
irq_pin.irq(trigger=machine.Pin.IRQ_FALLING, handler=handle_gesture)
print("boot.py finished")
main.py
-1
View File
@@ -223,7 +223,6 @@ restart_btn.add_event_cb(lambda event: machine.reset(),lv.EVENT.CLICKED,None)
import _thread
def execute_script(script_source, is_file, lvgl_obj, return_to_launcher):
thread_id = _thread.get_ident();
print(f"Thread {thread_id}: executing script")