Skip to content

Commit fd18e5e

Browse files
committed
Fixes keypad driver
1 parent be8a8c9 commit fd18e5e

File tree

2 files changed

+3
-132
lines changed

2 files changed

+3
-132
lines changed

api_drivers/py_api_drivers/frozen/indev/keypad_framework.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,33 +55,17 @@ def _read(self, drv, data): # NOQA
5555
if key is None: # ignore no key
5656
if self._current_state != lv.INDEV_STATE.RELEASED: # NOQA
5757
self._current_state = lv.INDEV_STATE.RELEASED # NOQA
58-
res = True
59-
else:
60-
res = False
6158

6259
data.key = self._last_key
6360
data.state = self._current_state
64-
data.continue_reading = False
65-
return res
6661

6762
state, key = key
68-
6963
self._last_key = key
70-
71-
if self._current_state == state == lv.INDEV_STATE.RELEASED: # NOQA
72-
res = False
73-
data.continue_reading = False
74-
else:
75-
res = True
76-
data.continue_reading = True
77-
7864
self._current_state = state
7965

8066
data.key = self._last_key
8167
data.state = self._current_state
8268

83-
return res
84-
8569
def get_type(self):
8670
return self._indev_drv.get_type() # NOQA
8771

display_configs/LilyGo-TDeck/keyboard_s3.py

Lines changed: 3 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -23,126 +23,13 @@ def _get_key(self):
2323
key = self._buf[0]
2424

2525
if key == 0x00: # no key
26-
key = None
26+
return None
2727
elif key == 0x08: # backspace
2828
key = lv.KEY.BACKSPACE # 0x08 # NOQA
2929
elif key == 0x0D: # enter
3030
key = lv.KEY.ENTER # 0x0A # NOQA
3131
elif key == 0x0C: # alt + c
32-
key = None
32+
return None
3333

34-
return key
34+
return self.PRESSED, key
3535

36-
37-
def _read(self, drv, data): # NOQA
38-
key = self._get_key()
39-
40-
if key is None: # ignore no key
41-
if self._current_state != lv.INDEV_STATE.RELEASED: # NOQA
42-
self._current_state = lv.INDEV_STATE.RELEASED # NOQA
43-
res = True
44-
else:
45-
res = False
46-
47-
data.key = self._last_key
48-
data.state = self._current_state
49-
data.continue_reading = False
50-
return res
51-
52-
state, key = key
53-
54-
self._last_key = key
55-
56-
if self._current_state == state == lv.INDEV_STATE.RELEASED: # NOQA
57-
res = False
58-
data.continue_reading = False
59-
else:
60-
res = True
61-
data.continue_reading = True
62-
63-
self._current_state = state
64-
65-
data.key = self._last_key
66-
data.state = self._current_state
67-
68-
return res
69-
70-
def get_type(self):
71-
return self._indev_drv.get_type() # NOQA
72-
73-
def read(self):
74-
self._indev_drv.read() # NOQA
75-
76-
def send_event(self, code, param):
77-
return self._indev_drv.send_event(code, param) # NOQA
78-
79-
def remove_event(self, index):
80-
return self._indev_drv.remove_event(index) # NOQA
81-
82-
def get_event_dsc(self, index):
83-
return self._indev_drv.get_event_dsc(index) # NOQA
84-
85-
def get_event_count(self):
86-
return self._indev_drv.get_event_count() # NOQA
87-
88-
def add_event_cb(self, event_cb, filter, user_data): # NOQA
89-
self._indev_drv.add_event_cb(event_cb, filter, user_data) # NOQA
90-
91-
def search_obj(self, point):
92-
return self._indev_drv.search_obj(point) # NOQA
93-
94-
def delete_read_timer(self):
95-
self._indev_drv.delete_read_timer() # NOQA
96-
97-
def get_read_timer(self):
98-
return self._indev_drv.get_read_timer() # NOQA
99-
100-
def get_active_obj(self):
101-
return self._indev_drv.get_active_obj() # NOQA
102-
103-
def wait_release(self):
104-
self._indev_drv.wait_release() # NOQA
105-
106-
def get_vect(self, point):
107-
self._indev_drv.get_vect(point) # NOQA
108-
109-
def get_scroll_obj(self):
110-
return self._indev_drv.get_scroll_obj() # NOQA
111-
112-
def get_scroll_dir(self):
113-
return self._indev_drv.get_scroll_dir() # NOQA
114-
115-
def get_gesture_dir(self):
116-
return self._indev_drv.get_gesture_dir() # NOQA
117-
118-
def get_point(self, point):
119-
self._indev_drv.get_point(point) # NOQA
120-
121-
def get_state(self):
122-
return self._indev_drv.get_state() # NOQA
123-
124-
def enable(self, en):
125-
self._indev_drv.enable(en) # NOQA
126-
127-
def get_group(self):
128-
return self._indev_drv.get_group() # NOQA
129-
130-
def set_group(self, group):
131-
self._indev_drv.set_group(group) # NOQA
132-
133-
def set_cursor(self, cur_obj):
134-
self._indev_drv.set_cursor(cur_obj) # NOQA
135-
136-
def reset_long_press(self):
137-
self._indev_drv.reset_long_press() # NOQA
138-
139-
def reset(self, obj):
140-
self._indev_drv.reset(obj) # NOQA
141-
142-
def get_disp(self):
143-
return self._disp_drv
144-
145-
@staticmethod
146-
def active():
147-
indev = lv.indev_active() # NOQA
148-
return indev.get_driver_data()

0 commit comments

Comments
 (0)