sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trackball switch handling

Browse Source
This commit is contained in:
xs5871 2023-02-12 12:50:14 +00:00
parent a83e833d10
commit c575fa396a
No known key found for this signature in database
GPG Key ID: 2A617DBC375C8352
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kmk/modules/pimoroni_trackball.py
View File

@ -86,13 +86,8 @@ class PointingHandler(TrackballHandler):
if y: if y:
AX.Y.move(keyboard, y) AX.Y.move(keyboard, y)
if switch == 1: # Button pressed if switch == 1: # Button changed state
keyboard.pre_process_key(KC.MB_LMB, is_pressed=True) keyboard.pre_process_key(KC.MB_LMB, is_pressed=state)
if not state and trackball.previous_state is True: # Button released
keyboard.pre_process_key(KC.MB_LMB, is_pressed=False)
trackball.previous_state = state
class ScrollHandler(TrackballHandler): class ScrollHandler(TrackballHandler):
@ -106,13 +101,8 @@ class ScrollHandler(TrackballHandler):
if y != 0: if y != 0:
AX.W.move(keyboard, y) AX.W.move(keyboard, y)
if switch == 1: # Button pressed if switch == 1: # Button changed state
keyboard.pre_process_key(KC.MB_LMB, is_pressed=True) keyboard.pre_process_key(KC.MB_LMB, is_pressed=state)
if not state and trackball.previous_state is True: # Button released
keyboard.pre_process_key(KC.MB_LMB, is_pressed=False)
trackball.previous_state = state
class KeyHandler(TrackballHandler): class KeyHandler(TrackballHandler):
@ -172,7 +162,6 @@ class Trackball(Module):
self._i2c_bus = i2c self._i2c_bus = i2c
self.mode = mode self.mode = mode
self.previous_state = False # click state
self.handlers = handlers self.handlers = handlers
self.current_handler = self.handlers[0] self.current_handler = self.handlers[0]
self.polling_interval = 20 self.polling_interval = 20
@ -265,12 +254,12 @@ class Trackball(Module):
def _read_raw_state(self): def _read_raw_state(self):
'''Read up, down, left, right and switch data from trackball.''' '''Read up, down, left, right and switch data from trackball.'''
left, right, up, down, switch = self._i2c_rdwr([_REG_LEFT], 5) left, right, up, down, switch = self._i2c_rdwr([REG_LEFT], 5)
switch, switch_state = ( switch_changed, switch_state = (
switch & ~_MSK_SWITCH_STATE, switch & ~_MSK_SWITCH_STATE,
(switch & _MSK_SWITCH_STATE) > 0, (switch & _MSK_SWITCH_STATE) > 0,
) )
return up, down, left, right, switch, switch_state return up, down, left, right, switch_changed, switch_state
def _i2c_rdwr(self, data, length=0): def _i2c_rdwr(self, data, length=0):
'''Write and optionally read I2C data.''' '''Write and optionally read I2C data.'''