From ef7b29bd434677a3b2c84e8efcb9e3ddc9938da6 Mon Sep 17 00:00:00 2001 From: xs5871 Date: Sun, 20 Feb 2022 20:28:52 +0000 Subject: [PATCH] fix column flipping on rhs of split boards. (boards) --- boards/boardsource/microdox/kb.py | 19 +++++++------------ boards/crkbd/kb.py | 18 +++++++----------- boards/crkbd/kb_rp2040.py | 19 +++++++------------ boards/ergo_travel/kb.py | 18 +++++++----------- boards/keebio/iris/kb.py | 25 ++++++++----------------- boards/keebio/iris/kb_converter.py | 27 +++++++++------------------ boards/lily58/kb.py | 22 ++++++++-------------- boards/lunakey_pico/kb.py | 19 +++++++------------ 8 files changed, 60 insertions(+), 107 deletions(-) diff --git a/boards/boardsource/microdox/kb.py b/boards/boardsource/microdox/kb.py index 04ae0ca..3382ff3 100644 --- a/boards/boardsource/microdox/kb.py +++ b/boards/boardsource/microdox/kb.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -16,14 +15,10 @@ class KMKKeyboard(_KMKKeyboard): powersave_pin = board.P0_13 # NOQA - coord_mapping = [] - coord_mapping.extend(ic(0, x, 5) for x in range(5)) - coord_mapping.extend(ic(4, x, 5) for x in range(5)) - coord_mapping.extend(ic(1, x, 5) for x in range(5)) - coord_mapping.extend(ic(5, x, 5) for x in range(5)) - coord_mapping.extend(ic(2, x, 5) for x in range(5)) - coord_mapping.extend(ic(6, x, 5) for x in range(5)) - - # And now, to handle R3, which at this point is down to just six keys - coord_mapping.extend(ic(3, x, 5) for x in range(2, 5)) - coord_mapping.extend(ic(7, x, 5) for x in range(0, 3)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 20, 21, 22, 23, 24, + 5, 6, 7, 8, 9, 25, 26, 27, 28, 29, + 10, 11, 12, 13, 14, 30, 31, 32, 33, 34, + 17, 18, 19, 35, 36, 37, + ] diff --git a/boards/crkbd/kb.py b/boards/crkbd/kb.py index c3c74c2..eb175f9 100644 --- a/boards/crkbd/kb.py +++ b/boards/crkbd/kb.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -21,14 +20,11 @@ class KMKKeyboard(_KMKKeyboard): i2c = board.I2C powersave_pin = board.P0_13 - coord_mapping = [] - coord_mapping.extend(ic(0, x, 6) for x in range(6)) - coord_mapping.extend(ic(4, x, 6) for x in range(6)) - coord_mapping.extend(ic(1, x, 6) for x in range(6)) - coord_mapping.extend(ic(5, x, 6) for x in range(6)) - coord_mapping.extend(ic(2, x, 6) for x in range(6)) - coord_mapping.extend(ic(6, x, 6) for x in range(6)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 29, 28, 27, 26, 25, 24, + 6, 7, 8, 9, 10, 11, 35, 34, 33, 32, 31, 30, + 12, 13, 14, 15, 16, 17, 41, 40, 39, 38, 37, 36, + 21, 22, 23, 47, 46, 45, + ] - # And now, to handle R3, which at this point is down to just six keys - coord_mapping.extend(ic(3, x, 6) for x in range(3, 6)) - coord_mapping.extend(ic(7, x, 6) for x in range(0, 3)) diff --git a/boards/crkbd/kb_rp2040.py b/boards/crkbd/kb_rp2040.py index b5790cc..280b694 100644 --- a/boards/crkbd/kb_rp2040.py +++ b/boards/crkbd/kb_rp2040.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -20,14 +19,10 @@ class KMKKeyboard(_KMKKeyboard): rgb_pixel_pin = board.D0 i2c = board.I2C - coord_mapping = [] - coord_mapping.extend(ic(0, x, 6) for x in range(6)) - coord_mapping.extend(ic(4, x, 6) for x in range(6)) - coord_mapping.extend(ic(1, x, 6) for x in range(6)) - coord_mapping.extend(ic(5, x, 6) for x in range(6)) - coord_mapping.extend(ic(2, x, 6) for x in range(6)) - coord_mapping.extend(ic(6, x, 6) for x in range(6)) - - # And now, to handle R3, which at this point is down to just six keys - coord_mapping.extend(ic(3, x, 6) for x in range(3, 6)) - coord_mapping.extend(ic(7, x, 6) for x in range(0, 3)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 29, 28, 27, 26, 25, 24, + 6, 7, 8, 9, 10, 11, 35, 34, 33, 32, 31, 30, + 12, 13, 14, 15, 16, 17, 41, 40, 39, 38, 37, 36, + 21, 22, 23, 47, 46, 45, + ] diff --git a/boards/ergo_travel/kb.py b/boards/ergo_travel/kb.py index 8e0e91f..2367348 100644 --- a/boards/ergo_travel/kb.py +++ b/boards/ergo_travel/kb.py @@ -25,14 +25,10 @@ class KMKKeyboard(_KMKKeyboard): powersave_pin = board.P0_13 # NOQA - coord_mapping = [] - coord_mapping.extend(ic(0, x, 7) for x in range(7)) - coord_mapping.extend(ic(4, x, 7) for x in range(7)) - coord_mapping.extend(ic(1, x, 7) for x in range(7)) - coord_mapping.extend(ic(5, x, 7) for x in range(7)) - coord_mapping.extend(ic(2, x, 7) for x in range(7)) - coord_mapping.extend(ic(6, x, 7) for x in range(7)) - - # And now, to handle R3, which at this point is down to just six keys - coord_mapping.extend(ic(3, x, 7) for x in range(0, 6)) - coord_mapping.extend(ic(7, x, 7) for x in range(1, 7)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 6, 34, 33, 32, 31, 30, 29, 28, + 7, 8, 9, 10, 11, 12, 13, 41, 40, 39, 38, 37, 36, 35, + 14, 15, 16, 17, 18, 19, 20, 48, 47, 46, 45, 44, 43, 42, + 21, 22, 23, 24, 25, 26, 54, 53, 52, 51, 50, 49, + ] diff --git a/boards/keebio/iris/kb.py b/boards/keebio/iris/kb.py index 0e9349f..96f2405 100644 --- a/boards/keebio/iris/kb.py +++ b/boards/keebio/iris/kb.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -23,14 +22,6 @@ class KMKKeyboard(_KMKKeyboard): data_pin = board.P0_20 powersave_pin = board.P0_13 - coord_mapping = [] - coord_mapping.extend(ic(0, x, 6) for x in range(6)) - coord_mapping.extend(ic(4, x, 6) for x in range(6)) - coord_mapping.extend(ic(1, x, 6) for x in range(6)) - coord_mapping.extend(ic(5, x, 6) for x in range(6)) - coord_mapping.extend(ic(2, x, 6) for x in range(6)) - coord_mapping.extend(ic(6, x, 6) for x in range(6)) - # Buckle up friends, the bottom row of this keyboard is wild, and making # our layouts match, visually, what the keyboard looks like, requires some # surgery on the bottom two rows of coords @@ -39,11 +30,11 @@ class KMKKeyboard(_KMKKeyboard): # just like the above three rows, however, visually speaking, the # top-right thumb cluster button (when looking at the left-half PCB) # is more inline with R3, so we'll jam that key (and its mirror) in here - coord_mapping.extend(ic(3, x, 6) for x in range(6)) - coord_mapping.append(ic(4, 2, 6)) - coord_mapping.append(ic(8, 3, 6)) - coord_mapping.extend(ic(7, x, 6) for x in range(6)) # Now, the rest of R3 - - # And now, to handle R4, which at this point is down to just six keys - coord_mapping.extend(ic(4, x, 6) for x in range(3, 6)) - coord_mapping.extend(ic(8, x, 6) for x in range(0, 3)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 36, 35, 34, 33, 32, 31, + 6, 7, 8, 9, 10, 11, 42, 41, 40, 39, 38, 37, + 12, 13, 14, 15, 16, 17, 48, 47, 46, 45, 44, 43, + 18, 19, 20, 21, 22, 23, 26, 57, 54, 53, 52, 51, 50, 49, + 28, 29, 30, 60, 59, 58, + ] diff --git a/boards/keebio/iris/kb_converter.py b/boards/keebio/iris/kb_converter.py index 245ae1e..774aafc 100644 --- a/boards/keebio/iris/kb_converter.py +++ b/boards/keebio/iris/kb_converter.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -14,7 +13,7 @@ class KMKKeyboard(_KMKKeyboard): diode_orientation = DiodeOrientation.COLUMNS split_flip = True - split_offsets = (6, 6, 6, 6, 6) + split_offset = (6, 6, 6, 6, 6) split_type = 'UART' data_pin = board.SCL data_pin2 = board.SDA @@ -23,14 +22,6 @@ class KMKKeyboard(_KMKKeyboard): rgb_pixel_pin = board.TX led_pin = board.D7 - coord_mapping = [] - coord_mapping.extend(ic(0, x, 6) for x in range(6)) - coord_mapping.extend(ic(4, x, 6) for x in range(6)) - coord_mapping.extend(ic(1, x, 6) for x in range(6)) - coord_mapping.extend(ic(5, x, 6) for x in range(6)) - coord_mapping.extend(ic(2, x, 6) for x in range(6)) - coord_mapping.extend(ic(6, x, 6) for x in range(6)) - # Buckle up friends, the bottom row of this keyboard is wild, and making # our layouts match, visually, what the keyboard looks like, requires some # surgery on the bottom two rows of coords @@ -39,11 +30,11 @@ class KMKKeyboard(_KMKKeyboard): # just like the above three rows, however, visually speaking, the # top-right thumb cluster button (when looking at the left-half PCB) # is more inline with R3, so we'll jam that key (and its mirror) in here - coord_mapping.extend(ic(3, x, 6) for x in range(6)) - coord_mapping.append(ic(4, 2, 6)) - coord_mapping.append(ic(8, 3, 6)) - coord_mapping.extend(ic(7, x, 6) for x in range(6)) # Now, the rest of R3 - - # And now, to handle R4, which at this point is down to just six keys - coord_mapping.extend(ic(4, x, 6) for x in range(3, 6)) - coord_mapping.extend(ic(8, x, 6) for x in range(0, 3)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 36, 35, 34, 33, 32, 31, + 6, 7, 8, 9, 10, 11, 42, 41, 40, 39, 38, 37, + 12, 13, 14, 15, 16, 17, 48, 47, 46, 45, 44, 43, + 18, 19, 20, 21, 22, 23, 26, 57, 54, 53, 52, 51, 50, 49, + 28, 29, 30, 60, 59, 58, + ] diff --git a/boards/lily58/kb.py b/boards/lily58/kb.py index 900e342..1b7e652 100644 --- a/boards/lily58/kb.py +++ b/boards/lily58/kb.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -22,16 +21,11 @@ class KMKKeyboard(_KMKKeyboard): i2c = board.I2C powersave_pin = board.P0_13 - coord_mapping = [] - coord_mapping.extend(ic(0, x, 6) for x in range(6)) - coord_mapping.extend(ic(4, x, 6) for x in range(6)) - coord_mapping.extend(ic(1, x, 6) for x in range(6)) - coord_mapping.extend(ic(5, x, 6) for x in range(6)) - coord_mapping.extend(ic(2, x, 6) for x in range(6)) - coord_mapping.extend(ic(6, x, 6) for x in range(6)) - coord_mapping.extend(ic(3, x, 6) for x in range(6)) - coord_mapping.extend(ic(7, x, 6) for x in range(6)) - - # And now, to handle R4, which at this point is down to just ten keys - coord_mapping.extend(ic(4, x, 6) for x in range(1, 6)) - coord_mapping.extend(ic(8, x, 6) for x in range(0, 5)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 36, 35, 34, 33, 32, 31, + 6, 7, 8, 9, 10, 11, 42, 41, 40, 39, 38, 37, + 12, 13, 14, 15, 16, 17, 48, 47, 46, 45, 44, 43, + 18, 19, 20, 21, 22, 23, 54, 53, 52, 51, 50, 49, + 26, 27, 28, 29, 30, 60, 59, 58, 57, 56, + ] diff --git a/boards/lunakey_pico/kb.py b/boards/lunakey_pico/kb.py index aa1a1cc..e5eab7d 100644 --- a/boards/lunakey_pico/kb.py +++ b/boards/lunakey_pico/kb.py @@ -2,7 +2,6 @@ import board from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard from kmk.matrix import DiodeOrientation -from kmk.matrix import intify_coordinate as ic class KMKKeyboard(_KMKKeyboard): @@ -10,14 +9,10 @@ class KMKKeyboard(_KMKKeyboard): col_pins = (board.GP21, board.GP20, board.GP19, board.GP18, board.GP17, board.GP16) diode_orientation = DiodeOrientation.COLUMNS - coord_mapping = [] - coord_mapping.extend(ic(0, x, 6) for x in range(6)) - coord_mapping.extend(ic(4, x, 6) for x in range(6)) - coord_mapping.extend(ic(1, x, 6) for x in range(6)) - coord_mapping.extend(ic(5, x, 6) for x in range(6)) - coord_mapping.extend(ic(2, x, 6) for x in range(6)) - coord_mapping.extend(ic(6, x, 6) for x in range(6)) - - # And now, to handle R3, which at this point is down to just six keys - coord_mapping.extend(ic(3, x, 6) for x in range(2, 6)) - coord_mapping.extend(ic(7, x, 6) for x in range(0, 4)) + # flake8: noqa + coord_mapping = [ + 0, 1, 2, 3, 4, 5, 29, 28, 27, 26, 25, 24, + 6, 7, 8, 9, 10, 11, 35, 34, 33, 32, 31, 30, + 12, 13, 14, 15, 16, 17, 41, 40, 39, 38, 37, 36, + 21, 22, 23, 47, 46, 45, + ]