From dc4fc646aa7d70bde0851ab099009490a3f57891 Mon Sep 17 00:00:00 2001 From: xs5871 Date: Fri, 4 Feb 2022 21:21:46 +0000 Subject: [PATCH] port all boards to new intify_coordinate signature. --- boards/boardsource/microdox/kb.py | 13 +++++++++---- boards/crkbd/kb.py | 12 ++++++++---- boards/crkbd/kb_rp2040.py | 12 ++++++++---- boards/ergo_travel/kb.py | 13 +++++++++---- boards/keebio/iris/kb.py | 20 ++++++++++++-------- boards/keebio/iris/kb_converter.py | 20 ++++++++++++-------- boards/klarank.py | 8 ++++---- boards/lily58/kb.py | 15 ++++++++++----- boards/lunakey_pico/kb.py | 14 ++++++++++---- boards/reviung41/kb.py | 8 ++++---- docs/porting_to_kmk.md | 12 +++++++++++- docs/ptBR/porting_to_kmk.md | 13 ++++++++++++- 12 files changed, 109 insertions(+), 51 deletions(-) diff --git a/boards/boardsource/microdox/kb.py b/boards/boardsource/microdox/kb.py index 2727465..04ae0ca 100644 --- a/boards/boardsource/microdox/kb.py +++ b/boards/boardsource/microdox/kb.py @@ -15,10 +15,15 @@ class KMKKeyboard(_KMKKeyboard): i2c = board.I2C powersave_pin = board.P0_13 + # NOQA coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(10)) - coord_mapping.extend(ic(1, x) for x in range(10)) - coord_mapping.extend(ic(2, x) for x in range(10)) + 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) for x in range(3, 9)) + 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)) diff --git a/boards/crkbd/kb.py b/boards/crkbd/kb.py index c93b487..c3c74c2 100644 --- a/boards/crkbd/kb.py +++ b/boards/crkbd/kb.py @@ -22,9 +22,13 @@ class KMKKeyboard(_KMKKeyboard): powersave_pin = board.P0_13 coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) + 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) for x in range(3, 9)) + 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 b86d44f..b5790cc 100644 --- a/boards/crkbd/kb_rp2040.py +++ b/boards/crkbd/kb_rp2040.py @@ -21,9 +21,13 @@ class KMKKeyboard(_KMKKeyboard): i2c = board.I2C coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) + 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) for x in range(3, 9)) + 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/ergo_travel/kb.py b/boards/ergo_travel/kb.py index 92798f2..8e0e91f 100644 --- a/boards/ergo_travel/kb.py +++ b/boards/ergo_travel/kb.py @@ -24,10 +24,15 @@ class KMKKeyboard(_KMKKeyboard): i2c = board.I2C powersave_pin = board.P0_13 + # NOQA coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(14)) - coord_mapping.extend(ic(1, x) for x in range(14)) - coord_mapping.extend(ic(2, x) for x in range(14)) + 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) for x in range(3, 12)) + 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)) diff --git a/boards/keebio/iris/kb.py b/boards/keebio/iris/kb.py index 0ede7e7..0e9349f 100644 --- a/boards/keebio/iris/kb.py +++ b/boards/keebio/iris/kb.py @@ -24,9 +24,12 @@ class KMKKeyboard(_KMKKeyboard): powersave_pin = board.P0_13 coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) + 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 @@ -36,10 +39,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) for x in range(6)) - coord_mapping.append(ic(4, 2)) - coord_mapping.append(ic(4, 9)) - coord_mapping.extend(ic(3, x) for x in range(6, 12)) # Now, the rest of R3 + 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) for x in range(3, 9)) + 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)) diff --git a/boards/keebio/iris/kb_converter.py b/boards/keebio/iris/kb_converter.py index 80f5bb5..245ae1e 100644 --- a/boards/keebio/iris/kb_converter.py +++ b/boards/keebio/iris/kb_converter.py @@ -24,9 +24,12 @@ class KMKKeyboard(_KMKKeyboard): led_pin = board.D7 coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) + 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 @@ -36,10 +39,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) for x in range(6)) - coord_mapping.append(ic(4, 2)) - coord_mapping.append(ic(4, 9)) - coord_mapping.extend(ic(3, x) for x in range(6, 12)) # Now, the rest of R3 + 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) for x in range(3, 9)) + 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)) diff --git a/boards/klarank.py b/boards/klarank.py index 8ca7a2c..2a46fc9 100644 --- a/boards/klarank.py +++ b/boards/klarank.py @@ -37,10 +37,10 @@ class KMKKeyboard(_KMKKeyboard): diode_orientation = DiodeOrientation.COLUMNS coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) - coord_mapping.extend(ic(3, r3_swap(x)) for x in range(12)) + coord_mapping.extend(ic(0, x, 12) for x in range(12)) + coord_mapping.extend(ic(1, x, 12) for x in range(12)) + coord_mapping.extend(ic(2, x, 12) for x in range(12)) + coord_mapping.extend(ic(3, r3_swap(x), 12) for x in range(12)) layers_ext = Layers() modules = [layers_ext] diff --git a/boards/lily58/kb.py b/boards/lily58/kb.py index 55fb855..900e342 100644 --- a/boards/lily58/kb.py +++ b/boards/lily58/kb.py @@ -23,10 +23,15 @@ class KMKKeyboard(_KMKKeyboard): powersave_pin = board.P0_13 coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) - coord_mapping.extend(ic(3, x) for x in range(12)) + 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) for x in range(1, 11)) + 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)) diff --git a/boards/lunakey_pico/kb.py b/boards/lunakey_pico/kb.py index 9210990..aa1a1cc 100644 --- a/boards/lunakey_pico/kb.py +++ b/boards/lunakey_pico/kb.py @@ -11,7 +11,13 @@ class KMKKeyboard(_KMKKeyboard): diode_orientation = DiodeOrientation.COLUMNS coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) - coord_mapping.extend(ic(3, x) for x in range(2, 10)) + 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)) diff --git a/boards/reviung41/kb.py b/boards/reviung41/kb.py index 9668db1..7db8239 100644 --- a/boards/reviung41/kb.py +++ b/boards/reviung41/kb.py @@ -30,9 +30,9 @@ class KMKKeyboard(_KMKKeyboard): powersave_pin = board.P0_13 coord_mapping = [] - coord_mapping.extend(ic(0, x) for x in range(12)) - coord_mapping.extend(ic(1, x) for x in range(12)) - coord_mapping.extend(ic(2, x) for x in range(12)) + coord_mapping.extend(ic(0, x, 12) for x in range(12)) + coord_mapping.extend(ic(1, x, 12) for x in range(12)) + coord_mapping.extend(ic(2, x, 12) for x in range(12)) # And now, to handle R3, which at this point is down to just five keys - coord_mapping.extend(ic(3, x) for x in range(5)) + coord_mapping.extend(ic(3, x, 12) for x in range(5)) diff --git a/docs/porting_to_kmk.md b/docs/porting_to_kmk.md index 3ced01e..4a3d9bc 100644 --- a/docs/porting_to_kmk.md +++ b/docs/porting_to_kmk.md @@ -49,9 +49,19 @@ from kmk.matrix import intify_coordinate as ic 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(6, 9)) + coord_mapping.extend(ic(7, x, 6) for x in range(0, 3)) ``` +`intify_coordinate` is the traditional way to generate key positions. +Here's an equivalent, maybe visually more explanatory version: +```python +coord_mapping = [ + 0, 1, 2, 3, 4, 5, 24, 25, 26, 27, 28, 29, + 6, 7, 8, 9, 10, 11, 30, 31, 32, 33, 34, 35, +12, 13, 14, 15, 16, 17, 36, 37, 38, 39, 40, 41, + 21, 22, 23, 42, 43, 44, +] +``` ## Keymaps Keymaps are organized as a list of lists. Keycodes are added for every key on diff --git a/docs/ptBR/porting_to_kmk.md b/docs/ptBR/porting_to_kmk.md index 8b64fe9..4b112d8 100644 --- a/docs/ptBR/porting_to_kmk.md +++ b/docs/ptBR/porting_to_kmk.md @@ -55,7 +55,18 @@ from kmk.matrix import intify_coordinate as ic 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(6, 9)) + coord_mapping.extend(ic(7, x, 6) for x in range(0, 3)) +``` + +`intify_coordinate` é a maneira tradicional de gerar posições-chave. +Aqui está uma versão equivalente, talvez visualmente mais explicativa: +```python +coord_mapping = [ + 0, 1, 2, 3, 4, 5, 24, 25, 26, 27, 28, 29, + 6, 7, 8, 9, 10, 11, 30, 31, 32, 33, 34, 35, +12, 13, 14, 15, 16, 17, 36, 37, 38, 39, 40, 41, + 21, 22, 23, 42, 43, 44, +] ``` ## Keymaps