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

allow target detection for wired splits

Browse Source
This commit is contained in:
Kyle Brown
2020-11-11 13:10:36 -08:00
parent ac89e51ff1
commit a85ec2cc3f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kmk/extensions/split.py
View File

@@ -23,6 +23,7 @@ class Split(Extension):
target_left=True, target_left=True,
uart_flip=True, uart_flip=True,
uart_pin=None, uart_pin=None,
uart_pin2=None,
uart_timeout=20, uart_timeout=20,
): ):
self._is_target = is_target self._is_target = is_target
@@ -36,6 +37,7 @@ class Split(Extension):
self._uart_buffer = [] self._uart_buffer = []
self.uart_flip = uart_flip self.uart_flip = uart_flip
self.uart_pin = uart_pin self.uart_pin = uart_pin
self.uart_pin2 = uart_pin2
self.uart_timeout = uart_timeout self.uart_timeout = uart_timeout
def on_runtime_enable(self, keyboard): def on_runtime_enable(self, keyboard):
@@ -47,7 +49,7 @@ class Split(Extension):
def during_bootup(self, keyboard): def during_bootup(self, keyboard):
try: try:
# Working around https://github.com/adafruit/circuitpython/issues/1769 # Working around https://github.com/adafruit/circuitpython/issues/1769
# keyboard._hid_helper_inst.create_report([]).send() keyboard._hid_helper_inst.create_report([]).send()
# Line above is broken and needs fixed for aut detection # Line above is broken and needs fixed for aut detection
self._is_target = True self._is_target = True
except OSError: except OSError:
@@ -65,17 +67,17 @@ class Split(Extension):
keyboard.col_pins = list(reversed(keyboard.col_pins)) keyboard.col_pins = list(reversed(keyboard.col_pins))
if self.split_side == 0: if self.split_side == 0:
self.split_target_left = self._is_target self.split_target_left = self._is_target
elif self.split_side == 0: elif self.split_side == 1:
self.split_target_left = not self._is_target self.split_target_left = not self._is_target
if self.uart_pin is not None: if self.uart_pin is not None:
if self._is_target: if self._is_target:
self._uart = busio.UART( self._uart = busio.UART(
tx=None, rx=self.uart_pin, timeout=self.uart_timeout tx=self.uart_pin2, rx=self.uart_pin, timeout=self.uart_timeout
) )
else: else:
self._uart = busio.UART( self._uart = busio.UART(
tx=self.uart_pin, rx=None, timeout=self.uart_timeout tx=self.uart_pin, rx=self.uart_pin2, timeout=self.uart_timeout
) )
# Attempt to sanely guess a coord_mapping if one is not provided. # Attempt to sanely guess a coord_mapping if one is not provided.
if not keyboard.coord_mapping: if not keyboard.coord_mapping:
@@ -91,7 +93,7 @@ class Split(Extension):
keyboard.coord_mapping.append(intify_coordinate(ridx, cidx)) keyboard.coord_mapping.append(intify_coordinate(ridx, cidx))
def before_matrix_scan(self, keyboard): def before_matrix_scan(self, keyboard):
if self._is_target: if self._is_target or self.uart_pin2:
return self._receive() return self._receive()
return None return None