From ae38bdd5dc720e307266ba4cedd92933069024d8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 12 Mar 2024 04:28:02 +0000 Subject: [PATCH 01/29] Flag LAYOUT macros still defined in .h files (#23260) --- lib/python/qmk/info.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 13588abdb85..815b8514742 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -78,7 +78,7 @@ def _find_invalid_encoder_index(info_data): return ret -def _validate_layouts(keyboard, info_data): +def _validate_layouts(keyboard, info_data): # noqa C901 """Non schema checks """ col_num = info_data.get('matrix_size', {}).get('cols', 0) @@ -92,6 +92,11 @@ def _validate_layouts(keyboard, info_data): if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()): _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.') + # Make sure all layouts are DD + for layout_name, layout_data in layouts.items(): + if layout_data.get('c_macro', False): + _log_error(info_data, f'{layout_name}: Layout macro should not be defined within ".h" files.') + # Make sure all matrix values are in bounds for layout_name, layout_data in layouts.items(): for index, key_data in enumerate(layout_data['layout']): From 654dc267db5c34d5b9beb49c21966f08ebe358c2 Mon Sep 17 00:00:00 2001 From: Allie <25503691+GalaxyAllie@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:28:20 +0000 Subject: [PATCH 02/29] Fix Magicforce MF17 RGB matrix (#23263) --- keyboards/magic_force/mf17/info.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/magic_force/mf17/info.json b/keyboards/magic_force/mf17/info.json index 2619c5f8b41..705318e71e0 100644 --- a/keyboards/magic_force/mf17/info.json +++ b/keyboards/magic_force/mf17/info.json @@ -74,23 +74,23 @@ }, "driver": "ws2812", "layout": [ - {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, - {"flags": 1, "matrix": [0, 1], "x": 75, "y": 0}, - {"flags": 1, "matrix": [0, 2], "x": 150, "y": 0}, - {"flags": 1, "matrix": [0, 3], "x": 224, "y": 0}, - {"flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, - {"flags": 1, "matrix": [1, 1], "x": 75, "y": 16}, - {"flags": 1, "matrix": [1, 2], "x": 150, "y": 16}, + {"flags": 1, "matrix": [4, 1], "x": 37, "y": 64}, + {"flags": 1, "matrix": [4, 2], "x": 150, "y": 64}, + {"flags": 1, "matrix": [4, 3], "x": 224, "y": 56}, + {"flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, + {"flags": 1, "matrix": [3, 1], "x": 75, "y": 48}, + {"flags": 1, "matrix": [3, 2], "x": 150, "y": 48}, {"flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, {"flags": 1, "matrix": [2, 1], "x": 75, "y": 32}, {"flags": 1, "matrix": [2, 2], "x": 150, "y": 32}, {"flags": 1, "matrix": [2, 3], "x": 224, "y": 24}, - {"flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, - {"flags": 1, "matrix": [3, 1], "x": 75, "y": 48}, - {"flags": 1, "matrix": [3, 2], "x": 150, "y": 48}, - {"flags": 1, "matrix": [4, 0], "x": 32, "y": 64}, - {"flags": 1, "matrix": [4, 1], "x": 150, "y": 64}, - {"flags": 1, "matrix": [4, 2], "x": 224, "y": 64} + {"flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, + {"flags": 1, "matrix": [1, 1], "x": 75, "y": 16}, + {"flags": 1, "matrix": [1, 2], "x": 150, "y": 16}, + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 1, "matrix": [0, 1], "x": 75, "y": 0}, + {"flags": 1, "matrix": [0, 2], "x": 150, "y": 0}, + {"flags": 1, "matrix": [0, 3], "x": 224, "y": 0} ], "max_brightness": 180, "sleep": true From 7cbbcdc5d41ca0bf00dff330131c3f68f8817af3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 12 Mar 2024 15:13:37 -0700 Subject: [PATCH 03/29] KBDfans KBD75 Layout Additions (#23234) --- keyboards/kbdfans/kbd75/readme.md | 10 +- keyboards/kbdfans/kbd75/rev1/info.json | 603 +++++++++++++++++- .../kbdfans/kbd75/rev1/matrix_diagram.md | 32 + keyboards/kbdfans/kbd75/rev2/info.json | 603 +++++++++++++++++- .../kbdfans/kbd75/rev2/matrix_diagram.md | 35 + 5 files changed, 1235 insertions(+), 48 deletions(-) create mode 100644 keyboards/kbdfans/kbd75/rev1/matrix_diagram.md create mode 100644 keyboards/kbdfans/kbd75/rev2/matrix_diagram.md diff --git a/keyboards/kbdfans/kbd75/readme.md b/keyboards/kbdfans/kbd75/readme.md index 60e71fdc943..834a70ce813 100644 --- a/keyboards/kbdfans/kbd75/readme.md +++ b/keyboards/kbdfans/kbd75/readme.md @@ -1,20 +1,18 @@ # KBD75 -The KBD75 was sold through various rounds, with various PCB changes between them. +The KBD75 was sold through various rounds, with various PCB changes between them. * **Round 1 (2017)**: Black PCB - Bootmapper Client, atmega32a MCU (Use [Winkeyless.kr B.mini](../../winkeyless/bmini/) firmware) * **Round 2 (2018)**: White PCB - Bootmapper Client, atmega32a MCU (Use [ymdk/ymd75/rev1](../../ymdk/ymd75/rev1/) firmware) -* **Round 3-5 (2018)**: White PCB - QMK Firmware, atmega32u4 MCU (Use KBD75 rev1 or rev2(without numpad support)) +* **Round 3-5 (2018)**: White PCB - QMK Firmware, atmega32u4 MCU (Use KBD75 rev1 or rev2(without numpad support)) * **Round 6 (2019)**: White PCB with USB C - QMK Firmware, atmega32u4 MCU (Use KBD75 rev1 or rev2(with numpad support)) * **V2 (2019-)**: Same as **Round 6** (above). -**Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the other.** +**Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the others.** * Keyboard Maintainer: [The QMK Community](https://github.com/qmk) * Hardware Supported: KBD75 PCB [rev1](./rev1) and [rev2](./rev2) -* Hardware Availability: - * [KBD75 rev2 Kit – KBDfans.com](https://kbdfans.com/collections/75-diy-kit/products/kbd75v2-custom-keyboard-diy-kit) - * [KBD75 rev2 PCB – KBDfans.com](https://kbdfans.com/collections/pcb/products/kbdfans-75-pcb-75) +* Hardware Availability: no longer available Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index d9d149f1e1a..efbfbe60ddc 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -239,7 +239,7 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_iso": { + "LAYOUT_75_ansi_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -271,7 +271,8 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, @@ -287,6 +288,7 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -301,12 +303,10 @@ {"matrix": [3, 10], "x": 9.75, "y": 3}, {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, - {"matrix": [2, 14], "x": 12.75, "y": 3}, - {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, {"matrix": [4, 2], "x": 2.25, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4}, @@ -333,6 +333,191 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, + "LAYOUT_75_ansi_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_ansi_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, "LAYOUT_75_ansi_wkl": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -424,7 +609,7 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_iso_wkl": { + "LAYOUT_75_ansi_wkl_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -456,7 +641,8 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, @@ -472,7 +658,7 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, - {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -487,11 +673,10 @@ {"matrix": [3, 10], "x": 9.75, "y": 3}, {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, - {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, {"matrix": [4, 2], "x": 2.25, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4}, @@ -516,7 +701,7 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_ansi_rwkl": { + "LAYOUT_75_iso": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -564,7 +749,6 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, - {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -579,10 +763,12 @@ {"matrix": [3, 10], "x": 9.75, "y": 3}, {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, - {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, {"matrix": [4, 2], "x": 2.25, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4}, @@ -601,14 +787,15 @@ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, - {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, - {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, {"matrix": [5, 13], "x": 13, "y": 5}, {"matrix": [5, 14], "x": 14, "y": 5}, {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_iso_rwkl": { + "LAYOUT_75_iso_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -640,7 +827,8 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, @@ -656,7 +844,6 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, - {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -672,6 +859,7 @@ {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, {"matrix": [3, 15], "x": 15, "y": 3}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, @@ -694,6 +882,379 @@ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 3, "y": 5, "w": 7}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_wkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 3, "y": 5, "w": 7}, {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, {"matrix": [5, 13], "x": 13, "y": 5}, diff --git a/keyboards/kbdfans/kbd75/rev1/matrix_diagram.md b/keyboards/kbdfans/kbd75/rev1/matrix_diagram.md new file mode 100644 index 00000000000..82bc199b538 --- /dev/null +++ b/keyboards/kbdfans/kbd75/rev1/matrix_diagram.md @@ -0,0 +1,32 @@ +# Matrix Diagram for KBDfans KBD75 rev1 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ┌───────┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ │1E │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤ +│20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐3D │ ISO Enter +│30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3F │ │2E │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D │4E │4F │ +├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ +│50 │51 │53 │54 │56 │58 │5A │5B │5C │5D │5E │5F │ +└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘ +┌────────┐ +│40 │ 2.25u LShift +└────────┘ +┌────┬────┬────┬────────────────────────┬───┬───┬───┐ +│50 │51 │53 │56 │5A │5B │5C │ Standard +└────┴────┴────┴────────────────────────┴───┴───┴───┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┐ +│50 │51 │53 │56 │5A │5C │ RWKL +└────┴────┴────┴────────────────────────┴─────┴─────┘ +┌─────┬─────┬───────────────────────────┬───┬───┬───┐ +│50 │51 │56 │5A │5B │5C │ LWKL +└─────┴─────┴───────────────────────────┴───┴───┴───┘ +┌─────┬─────┬───────────────────────────┬─────┬─────┐ +│50 │51 │56 │5A │5C │ WKL +└─────┴─────┴───────────────────────────┴─────┴─────┘ +``` diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 7cf43b93a76..12a1737eadd 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -239,7 +239,7 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_iso": { + "LAYOUT_75_ansi_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -271,7 +271,8 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, @@ -287,6 +288,7 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -301,12 +303,10 @@ {"matrix": [3, 10], "x": 9.75, "y": 3}, {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, - {"matrix": [2, 14], "x": 12.75, "y": 3}, - {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, {"matrix": [4, 2], "x": 2.25, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4}, @@ -333,6 +333,191 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, + "LAYOUT_75_ansi_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_ansi_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, "LAYOUT_75_ansi_wkl": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -424,7 +609,7 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_iso_wkl": { + "LAYOUT_75_ansi_wkl_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -456,7 +641,8 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, @@ -472,7 +658,7 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, - {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -487,11 +673,10 @@ {"matrix": [3, 10], "x": 9.75, "y": 3}, {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, - {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, {"matrix": [4, 2], "x": 2.25, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4}, @@ -516,7 +701,7 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_ansi_rwkl": { + "LAYOUT_75_iso": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -564,7 +749,6 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, - {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -579,10 +763,12 @@ {"matrix": [3, 10], "x": 9.75, "y": 3}, {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, - {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, {"matrix": [4, 2], "x": 2.25, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4}, @@ -601,14 +787,15 @@ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, - {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, - {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, {"matrix": [5, 13], "x": 13, "y": 5}, {"matrix": [5, 14], "x": 14, "y": 5}, {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_iso_rwkl": { + "LAYOUT_75_iso_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -640,7 +827,8 @@ {"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 11], "x": 11, "y": 1}, {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, @@ -656,7 +844,6 @@ {"matrix": [2, 11], "x": 10.5, "y": 2}, {"matrix": [2, 12], "x": 11.5, "y": 2}, {"matrix": [2, 13], "x": 12.5, "y": 2}, - {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, @@ -672,6 +859,7 @@ {"matrix": [3, 11], "x": 10.75, "y": 3}, {"matrix": [3, 12], "x": 11.75, "y": 3}, {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, {"matrix": [3, 15], "x": 15, "y": 3}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, @@ -694,6 +882,379 @@ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 3, "y": 5, "w": 7}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + }, + "LAYOUT_75_iso_wkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 14], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 3, "y": 5, "w": 7}, {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, {"matrix": [5, 13], "x": 13, "y": 5}, diff --git a/keyboards/kbdfans/kbd75/rev2/matrix_diagram.md b/keyboards/kbdfans/kbd75/rev2/matrix_diagram.md new file mode 100644 index 00000000000..0de62fbefde --- /dev/null +++ b/keyboards/kbdfans/kbd75/rev2/matrix_diagram.md @@ -0,0 +1,35 @@ +# Matrix Diagram for KBDfans KBD75 rev2 + +``` + ┌───────┬───────┐ + Numpad 2u Backspace │1C │1E │ 2u Backspace + └───────┴───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ ┌───┬───┬─────┐ ┌─────┬───┬───┐ ┌─────┬───┬───┐ +│20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │ │2C │2D │ │ │2C │2D │2E │ │ │2D │2E │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┬──┴┬──┴┐3D │ ┌──┴─────┼───┼───┤ ┌──┴┐3B ├───┼───┤ +│30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3F │ │3B │3C │2E │ │ │3B │3C │3D │ │2C │ │3C │3D │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴───┴───┴────┘ └────────┴───┴───┘ └───┴────┴───┴───┘ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D │4E │4F │ ISO Enter Numpad ANSI Enter Numpad ISO Enter +├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ +│50 │51 │53 │54 │56 │58 │5A │5B │5C │5D │5E │5F │ +└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘ +┌────────┐ ┌──────┬───┬───┐ +│40 │ 2.25u LShift │4A │4B │4D │ Numpad RShift (1/1/1.75u) +└────────┘ └──────┴───┴───┘ +┌────┬────┬────┬────────────────────────┬───┬───┬───┐ +│50 │51 │53 │56 │5A │5B │5C │ Standard +└────┴────┴────┴────────────────────────┴───┴───┴───┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┐ +│50 │51 │53 │56 │5A │5C │ RWKL +└────┴────┴────┴────────────────────────┴─────┴─────┘ +┌─────┬─────┬───────────────────────────┬───┬───┬───┐ +│50 │51 │56 │5A │5B │5C │ LWKL +└─────┴─────┴───────────────────────────┴───┴───┴───┘ +┌─────┬─────┬───────────────────────────┬─────┬─────┐ +│50 │51 │56 │5A │5C │ WKL +└─────┴─────┴───────────────────────────┴─────┴─────┘ +``` From 2121931e34b54e5d648dbba2b41db4b70daaba17 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 12 Mar 2024 15:16:22 -0700 Subject: [PATCH 04/29] Aero 75 Hotswap: correct layout data (#23253) --- keyboards/gray_studio/aero75/info.json | 16 ++++++++-------- keyboards/gray_studio/aero75/matrix_diagram.md | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index 06d11e8467b..f6de1b9f966 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json @@ -57,15 +57,15 @@ {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, - {"label": "F5", "matrix": [0, 5], "x": 6, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0}, - {"label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0}, - {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "F12", "matrix": [0, 13], "x": 13, "y": 0}, {"label": "PrtSc", "matrix": [0, 15], "x": 15, "y": 0}, diff --git a/keyboards/gray_studio/aero75/matrix_diagram.md b/keyboards/gray_studio/aero75/matrix_diagram.md index 64bb3af675c..d777c6cd447 100644 --- a/keyboards/gray_studio/aero75/matrix_diagram.md +++ b/keyboards/gray_studio/aero75/matrix_diagram.md @@ -1,9 +1,9 @@ # Matrix Diagram for GrayStudio Aero 75 Hotswap ``` -┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ -│00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0D │ │0F │ -└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘ +┌───┐ ┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ ┌───┐ +│00 │ │01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0D │ │0F │ +└───┘ └───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ └───┘ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1F │ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ From 3a3b4d155eb3b84eb101c85b559f1cc0a5d9a934 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 12 Mar 2024 15:18:19 -0700 Subject: [PATCH 05/29] Ares Layout Additions (#23254) --- keyboards/ares/info.json | 765 ++++++++++++++++++++++++++++++- keyboards/ares/matrix_diagram.md | 27 ++ 2 files changed, 789 insertions(+), 3 deletions(-) create mode 100644 keyboards/ares/matrix_diagram.md diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index dceb80da043..125db97ed28 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json @@ -45,7 +45,7 @@ "layout_aliases": { "LAYOUT": "LAYOUT_all" }, - "community_layouts": ["60_ansi_split_bs_rshift", "60_hhkb"], + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"], "layouts": { "LAYOUT_all": { "layout": [ @@ -120,6 +120,75 @@ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, @@ -191,7 +260,75 @@ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_hhkb": { + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_tsangan_hhkb": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0}, {"matrix": [4, 1], "x": 1, "y": 0}, @@ -252,11 +389,633 @@ {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, {"matrix": [1, 13], "x": 14, "y": 3}, + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, {"matrix": [0, 1], "x": 1.5, "y": 4}, {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [0, 12], "x": 12.5, "y": 4} + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 4}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 12], "x": 12.5, "y": 4}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 3}, + {"matrix": [1, 2], "x": 2.25, "y": 3}, + {"matrix": [1, 3], "x": 3.25, "y": 3}, + {"matrix": [1, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 5], "x": 5.25, "y": 3}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + {"matrix": [1, 7], "x": 7.25, "y": 3}, + {"matrix": [1, 8], "x": 8.25, "y": 3}, + {"matrix": [1, 9], "x": 9.25, "y": 3}, + {"matrix": [1, 10], "x": 10.25, "y": 3}, + {"matrix": [1, 11], "x": 11.25, "y": 3}, + {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/ares/matrix_diagram.md b/keyboards/ares/matrix_diagram.md new file mode 100644 index 00000000000..5be61c98899 --- /dev/null +++ b/keyboards/ares/matrix_diagram.md @@ -0,0 +1,27 @@ +# Matrix Diagram for LSJ Ares + +``` + ┌───────┐ + 2u Backspace │4E │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌─────┐ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ └───┴────┘ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ +│00 │01 │02 │06 │0A │0B │0C │0D │ +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +┌────────┐ ┌──────────┐ +│10 │ 2.25u LShift 2.75u RShift │1C │ +└────────┘ └──────────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│00 │01 │02 │06 │0B │0C │0D │ Tsangan/WKL/HHKB +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +┌─────┬───┬─────┬───────────────────────┬─────┬───┬───┬─────┐ +│00 │01 │02 │06 │0A │0B │0C │0D │ True HHKB +└─────┴───┴─────┴───────────────────────┴─────┴───┴───┴─────┘ +``` From 6788a5eb27b1db5d25ef6388bb8b698899de2f9e Mon Sep 17 00:00:00 2001 From: LLLKST <160975620+LLLKST@users.noreply.github.com> Date: Tue, 12 Mar 2024 23:51:42 +0100 Subject: [PATCH 06/29] [Keyboard] Add PetruziaMini (#23201) * Uploading the PetruziaMini My first try on uploading somethings on github. Hoping it works, this is my handwired PetruziaMini. I don't know if it will be visible on qmk configurator now * 36 key hhbk inspired kb * Required changes done I compiled it locally and works * Last changes requested Added a imgur image (first time using, hoping i did it right) and summarized the description as requeste * Fixed imegur link * Ops, i've lost this. Here it comes Thanks for helping! I'll take notes for next time :) --- keyboards/handwired/petruziamini/info.json | 66 +++++++++++++++++++ .../petruziamini/keymaps/default/keymap.c | 30 +++++++++ keyboards/handwired/petruziamini/readme.md | 26 ++++++++ keyboards/handwired/petruziamini/rules.mk | 1 + 4 files changed, 123 insertions(+) create mode 100644 keyboards/handwired/petruziamini/info.json create mode 100644 keyboards/handwired/petruziamini/keymaps/default/keymap.c create mode 100644 keyboards/handwired/petruziamini/readme.md create mode 100644 keyboards/handwired/petruziamini/rules.mk diff --git a/keyboards/handwired/petruziamini/info.json b/keyboards/handwired/petruziamini/info.json new file mode 100644 index 00000000000..dcd60f2dc7a --- /dev/null +++ b/keyboards/handwired/petruziamini/info.json @@ -0,0 +1,66 @@ +{ + "manufacturer": "LLLKST", + "keyboard_name": "PetruziaMini", + "maintainer": "LLLKST", + "development_board": "promicro", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["D7", "C6", "D4", "D0", "D1", "F4", "F5", "F6", "F7", "B1"], + "rows": ["B4", "E6", "B3", "B2"] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/handwired/petruziamini/keymaps/default/keymap.c b/keyboards/handwired/petruziamini/keymaps/default/keymap.c new file mode 100644 index 00000000000..c0972785d42 --- /dev/null +++ b/keyboards/handwired/petruziamini/keymaps/default/keymap.c @@ -0,0 +1,30 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ │ D │ │ │ G │ │ I │ J │ + * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT( + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, LT(1, KC_E), KC_F + ), + [1] = LAYOUT( + KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO +) +}; diff --git a/keyboards/handwired/petruziamini/readme.md b/keyboards/handwired/petruziamini/readme.md new file mode 100644 index 00000000000..1b303c49c63 --- /dev/null +++ b/keyboards/handwired/petruziamini/readme.md @@ -0,0 +1,26 @@ +# PetruziaMini + +![PetruziaMini](https://i.imgur.com/uk2BSazh.jpeg) + +36 key ortholinear keyboard intended to be mapped as a split keyboard. + +* Keyboard Maintainer: [LLLKST](https://github.com/LLLKST) +* Hardware Supported: *promicro compatible controller* +* Hardware Availability: [Aliexpress Pro Micro](https://www.aliexpress.us/item/3256805781371913.html) + + +Make example for this keyboard (after setting up your build environment): + + make handwired/petruziamini:default + +Flashing example for this keyboard: + + make handwired/petruziamini:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader with: + +* **Keycode in layout**: Press the key mapped to `QK_BOOT` (3,5) + (0,1) in the matrix \ No newline at end of file diff --git a/keyboards/handwired/petruziamini/rules.mk b/keyboards/handwired/petruziamini/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/handwired/petruziamini/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From fb11330eab2b459d5e510c66a9bdf3961c8e639a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 13 Mar 2024 00:28:08 +0000 Subject: [PATCH 07/29] Absolute paths for -kb argument should error consistently (#23262) --- lib/python/qmk/path.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py index 74364ee04b0..bb588d2e1c3 100644 --- a/lib/python/qmk/path.py +++ b/lib/python/qmk/path.py @@ -12,11 +12,19 @@ from qmk.errors import NoSuchKeyboardError def is_keyboard(keyboard_name): """Returns True if `keyboard_name` is a keyboard we can compile. """ - if keyboard_name: - keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name - rules_mk = keyboard_path / 'rules.mk' + if not keyboard_name: + return False + + # keyboard_name values of 'c:/something' or '/something' trigger append issues + # due to "If the argument is an absolute path, the previous path is ignored" + # however it should always be a folder located under qmk_firmware/keyboards + if Path(keyboard_name).is_absolute(): + return False + + keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name + rules_mk = keyboard_path / 'rules.mk' - return rules_mk.exists() + return rules_mk.exists() def under_qmk_firmware(path=Path(os.environ['ORIG_CWD'])): From 49596b0692c557e0278f54d1a03314d42b3031da Mon Sep 17 00:00:00 2001 From: wind <108604699+yelishang@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:20:46 +0800 Subject: [PATCH 08/29] Add KM113 keyboard (#22669) --- keyboards/jidohun/km113/config.h | 15 + keyboards/jidohun/km113/halconf.h | 10 + keyboards/jidohun/km113/info.json | 269 ++++++++++++++++++ .../jidohun/km113/keymaps/default/keymap.c | 43 +++ keyboards/jidohun/km113/keymaps/via/keymap.c | 53 ++++ keyboards/jidohun/km113/keymaps/via/rules.mk | 2 + keyboards/jidohun/km113/mcuconf.h | 9 + keyboards/jidohun/km113/readme.md | 23 ++ keyboards/jidohun/km113/rules.mk | 1 + 9 files changed, 425 insertions(+) create mode 100644 keyboards/jidohun/km113/config.h create mode 100644 keyboards/jidohun/km113/halconf.h create mode 100644 keyboards/jidohun/km113/info.json create mode 100644 keyboards/jidohun/km113/keymaps/default/keymap.c create mode 100644 keyboards/jidohun/km113/keymaps/via/keymap.c create mode 100644 keyboards/jidohun/km113/keymaps/via/rules.mk create mode 100644 keyboards/jidohun/km113/mcuconf.h create mode 100644 keyboards/jidohun/km113/readme.md create mode 100644 keyboards/jidohun/km113/rules.mk diff --git a/keyboards/jidohun/km113/config.h b/keyboards/jidohun/km113/config.h new file mode 100644 index 00000000000..aaf717eca42 --- /dev/null +++ b/keyboards/jidohun/km113/config.h @@ -0,0 +1,15 @@ +// Copyright 2023 wind (@yelishang) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* SPI Config */ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 +#define SPI_MOSI_PAL_MODE 5 + +/* SPI Flash Config */ +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 + diff --git a/keyboards/jidohun/km113/halconf.h b/keyboards/jidohun/km113/halconf.h new file mode 100644 index 00000000000..6ff2f1ec677 --- /dev/null +++ b/keyboards/jidohun/km113/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2023 wind (@yelishang) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/jidohun/km113/info.json b/keyboards/jidohun/km113/info.json new file mode 100644 index 00000000000..05fb901d4c6 --- /dev/null +++ b/keyboards/jidohun/km113/info.json @@ -0,0 +1,269 @@ +{ + "manufacturer": "JIDOHUN", + "keyboard_name": "KM113", + "maintainer": "wind", + "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "eeprom": { + "wear_leveling": { + "backing_size": 4096, + "driver": "spi_flash" + } + }, + "encoder": { + "rotary": [ + {"pin_a": "A10", "pin_b": "A9"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "A5", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9"], + "rows": ["A0", "A1", "A2", "A3", "A4", "C13"] + }, + "processor": "WB32FQ95", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [5, 8], "x": 119, "y": 64, "flags": 4}, + {"matrix": [5, 9], "x": 134, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 149, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 164, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 179, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 194, "y": 64, "flags": 4}, + {"matrix": [5, 14], "x": 209, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 224, "y": 64, "flags": 4}, + {"matrix": [4, 15], "x": 224, "y": 51, "flags": 4}, + {"matrix": [4, 14], "x": 209, "y": 51, "flags": 4}, + {"matrix": [4, 13], "x": 194, "y": 51, "flags": 4}, + {"matrix": [4, 12], "x": 179, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 164, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 149, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 134, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 119, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 105, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 90, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 75, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 60, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 45, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 30, "y": 51, "flags": 4}, + {"matrix": [3, 1], "x": 15, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 30, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 60, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 75, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 90, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 105, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 119, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 134, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 149, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 164, "y": 38, "flags": 4}, + {"matrix": [3, 12], "x": 179, "y": 38, "flags": 4}, + {"matrix": [3, 14], "x": 209, "y": 38, "flags": 4}, + {"matrix": [3, 15], "x": 224, "y": 38, "flags": 4}, + {"matrix": [2, 15], "x": 224, "y": 26, "flags": 4}, + {"matrix": [2, 14], "x": 209, "y": 26, "flags": 4}, + {"matrix": [2, 13], "x": 194, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 179, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 164, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 149, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 134, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 119, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 105, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 90, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 75, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 60, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 45, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 15, "y": 26, "flags": 4}, + {"matrix": [1, 1], "x": 15, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 30, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 45, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 60, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 75, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 90, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 105, "y": 13, "flags": 4}, + {"matrix": [1, 8], "x": 119, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 134, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 149, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 164, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 179, "y": 13, "flags": 4}, + {"matrix": [1, 13], "x": 194, "y": 13, "flags": 4}, + {"matrix": [0, 13], "x": 194, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 15, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 30, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 75, "y": 64, "flags": 4} + ], + "max_brightness": 108 + }, + "url": "http://www.frscn.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x3671", + "suspend_wakeup_delay": 1000, + "vid": "0x3555" + }, + "ws2812": { + "pin": "A8" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 14], "x": 17, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 16.5, "y": 2}, + {"matrix": [2, 15], "x": 17.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 16.5, "y": 3}, + {"matrix": [3, 15], "x": 17.5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 16.5, "y": 4}, + {"matrix": [4, 15], "x": 17.5, "y": 4}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5}, + {"matrix": [5, 9], "x": 11, "y": 5}, + {"matrix": [5, 10], "x": 12, "y": 5}, + {"matrix": [5, 11], "x": 13.25, "y": 5.25}, + {"matrix": [5, 12], "x": 14.25, "y": 5.25}, + {"matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"matrix": [5, 14], "x": 16.5, "y": 5}, + {"matrix": [5, 15], "x": 17.5, "y": 5} + ] + } + } +} diff --git a/keyboards/jidohun/km113/keymaps/default/keymap.c b/keyboards/jidohun/km113/keymaps/default/keymap.c new file mode 100644 index 00000000000..088adc8742c --- /dev/null +++ b/keyboards/jidohun/km113/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +// Copyright 2023 wind (@yelishang) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TO(0), KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TO(1), KC_END, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(2), KC_PGUP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3), KC_PGDN + ), + + [1] = LAYOUT( + EE_CLR, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_MYCM, KC_CALC, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, _______, _______, + _______, _______, _______, _______, RGB_MOD, _______, _______, KC_PSCR, KC_PGUP, KC_DEL, _______, _______, _______, _______, TO(0), _______, + _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGDN, KC_END, _______, _______, _______, TO(1), _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, TO(2), _______, + _______, GU_TOGG, _______, RGB_TOG, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI,TO(3), _______ + ), + + [2] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TO(0), KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TO(1), KC_END, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(2), KC_PGUP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3), KC_PGDN + ), + + [3] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TO(0), _______, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TO(1), _______, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(2), _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3), _______ + ) +}; diff --git a/keyboards/jidohun/km113/keymaps/via/keymap.c b/keyboards/jidohun/km113/keymaps/via/keymap.c new file mode 100644 index 00000000000..b87dc22614d --- /dev/null +++ b/keyboards/jidohun/km113/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +// Copyright 2023 wind (@yelishang) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TO(0), KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TO(1), KC_END, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(2), KC_PGUP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3), KC_PGDN + ), + + [1] = LAYOUT( + EE_CLR, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_MYCM, KC_CALC, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, _______, _______, + _______, _______, _______, _______, RGB_MOD, _______, _______, KC_PSCR, KC_PGUP, KC_DEL, _______, _______, _______, _______, TO(0), _______, + _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGDN, KC_END, _______, _______, _______, TO(1), _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, TO(2), _______, + _______, GU_TOGG, _______, RGB_TOG, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI,TO(3), _______ + ), + + [2] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TO(0), KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TO(1), KC_END, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(2), KC_PGUP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3), KC_PGDN + ), + + [3] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TO(0), _______, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TO(1), _______, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(2), _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3), _______ + ) +}; + +/* encoder; start */ +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif diff --git a/keyboards/jidohun/km113/keymaps/via/rules.mk b/keyboards/jidohun/km113/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/jidohun/km113/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/jidohun/km113/mcuconf.h b/keyboards/jidohun/km113/mcuconf.h new file mode 100644 index 00000000000..bdf256bc1a1 --- /dev/null +++ b/keyboards/jidohun/km113/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2023 wind (@yelishang) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE diff --git a/keyboards/jidohun/km113/readme.md b/keyboards/jidohun/km113/readme.md new file mode 100644 index 00000000000..0951a474c0a --- /dev/null +++ b/keyboards/jidohun/km113/readme.md @@ -0,0 +1,23 @@ + +# KM113 + +* Keyboard Maintainer: [wind](https://github.com/yelishang) +* Hardware Supported: KM113 PCB + +Make example for this keyboard (after setting up your build environment): + + make jidohun/km113:default + +Flashing example for this keyboard: + + make jidohun/km113:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/jidohun/km113/rules.mk b/keyboards/jidohun/km113/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/jidohun/km113/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From be9fcbd5036b28afb1b52587c704d0bf523c9e12 Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Wed, 13 Mar 2024 12:21:06 +0900 Subject: [PATCH 09/29] Add SIRIND Brick65 (#23245) --- keyboards/era/sirind/brick65/info.json | 201 ++++++++++++++++++ .../sirind/brick65/keymaps/default/keymap.c | 35 +++ .../era/sirind/brick65/keymaps/via/keymap.c | 21 ++ .../era/sirind/brick65/keymaps/via/rules.mk | 1 + keyboards/era/sirind/brick65/readme.md | 26 +++ keyboards/era/sirind/brick65/rules.mk | 1 + 6 files changed, 285 insertions(+) create mode 100644 keyboards/era/sirind/brick65/info.json create mode 100644 keyboards/era/sirind/brick65/keymaps/default/keymap.c create mode 100644 keyboards/era/sirind/brick65/keymaps/via/keymap.c create mode 100644 keyboards/era/sirind/brick65/keymaps/via/rules.mk create mode 100644 keyboards/era/sirind/brick65/readme.md create mode 100644 keyboards/era/sirind/brick65/rules.mk diff --git a/keyboards/era/sirind/brick65/info.json b/keyboards/era/sirind/brick65/info.json new file mode 100644 index 00000000000..3d35bc0d98f --- /dev/null +++ b/keyboards/era/sirind/brick65/info.json @@ -0,0 +1,201 @@ +{ + "manufacturer": "SR industry", + "keyboard_name": "Brick65", + "maintainer": "Syryan", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "indicators": { + "caps_lock": "C6", + "on_state": 0, + "scroll_lock": "B6" + }, + "matrix_pins": { + "cols": ["B7", "D4", "F1", "D5", "F4", "D3", "F5", "D2", "F6", "D1", "F7", "D0", "C7", "B3", "B1", "B2"], + "rows": ["D6", "D7", "B4", "B5", "F0"] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "dual_beacon": true, + "multisplash": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "raindrops": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_simple": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 208, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 15], "x": 224, "y": 16, "flags": 4}, + {"matrix": [1, 14], "x": 210, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 197, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 181, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 165, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 149, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 133, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 117, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 101, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 85, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 69, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 21, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 30, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 46, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 62, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 78, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 94, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 110, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 126, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 142, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 158, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 206, "y": 32, "flags": 4}, + {"matrix": [3, 14], "x": 208, "y": 48, "flags": 4}, + {"matrix": [3, 12], "x": 197, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, + {"matrix": [3, 0], "x": 8, "y": 48, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 19, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 38, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 78, "y": 64, "flags": 4}, + {"matrix": [4, 7], "x": 104, "y": 64, "flags": 4}, + {"matrix": [4, 9], "x": 136, "y": 64, "flags": 4}, + {"matrix": [4, 10], "x": 160, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4}, + {"matrix": [4, 13], "x": 192, "y": 64, "flags": 4}, + {"matrix": [4, 14], "x": 208, "y": 64, "flags": 4}, + {"matrix": [4, 15], "x": 224, "y": 64, "flags": 4} + ], + "max_brightness": 200, + "val_steps": 20 + }, + "url": "https://srind.mysoho.com/", + "usb": { + "device_version": "0.0.1", + "pid": "0x0005", + "vid": "0x5943" + }, + "ws2812": { + "pin": "B0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14.25, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 4, "y": 4.25, "w": 2.75}, + {"matrix": [4, 7], "x": 6.75, "y": 4.25, "w": 1.25}, + {"matrix": [4, 9], "x": 8, "y": 4.25, "w": 2.25}, + {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"matrix": [4, 15], "x": 15.25, "y": 4.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/sirind/brick65/keymaps/default/keymap.c b/keyboards/era/sirind/brick65/keymaps/default/keymap.c new file mode 100644 index 00000000000..f77a7aabff0 --- /dev/null +++ b/keyboards/era/sirind/brick65/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 PyuPyu + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCRL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/era/sirind/brick65/keymaps/via/keymap.c b/keyboards/era/sirind/brick65/keymaps/via/keymap.c new file mode 100644 index 00000000000..0c895c84e41 --- /dev/null +++ b/keyboards/era/sirind/brick65/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2018-2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LSCR, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/era/sirind/brick65/keymaps/via/rules.mk b/keyboards/era/sirind/brick65/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/era/sirind/brick65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/era/sirind/brick65/readme.md b/keyboards/era/sirind/brick65/readme.md new file mode 100644 index 00000000000..8d8f07d7c52 --- /dev/null +++ b/keyboards/era/sirind/brick65/readme.md @@ -0,0 +1,26 @@ +# Brick65 + +![Brick65](https://i.imgur.com/qyQYWfjh.jpg) + +Brick65 is a 65% ANSI layout Custom Keyboard + +* Keyboard Maintainer: Pyupyu +* Hardware Supported: Brick65 +* Hardware Availability: Syryan + +## How to enter Bootloader Mode + +Enter the bootloader in 2 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead + +Make example for this keyboard (after setting up your build environment): + + make era/sirind/brick65:default + +Flashing example for this keyboard: + + make era/sirind/brick65:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/era/sirind/brick65/rules.mk b/keyboards/era/sirind/brick65/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/era/sirind/brick65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 8c9dea0d0addf7735ceac2eb7bcf9ab3f2d02bff Mon Sep 17 00:00:00 2001 From: elmo Date: Wed, 13 Mar 2024 08:23:30 +0100 Subject: [PATCH 10/29] Add support new kb_elmo PCBs (#23138) Co-authored-by: Ryan --- keyboards/kb_elmo/bm42/info.json | 72 +++++++++++++++ .../kb_elmo/bm42/keymaps/default/keymap.c | 25 +++++ keyboards/kb_elmo/bm42/keymaps/via/keymap.c | 25 +++++ keyboards/kb_elmo/bm42/keymaps/via/rules.mk | 2 + keyboards/kb_elmo/bm42/readme.md | 28 ++++++ keyboards/kb_elmo/bm42/rules.mk | 1 + keyboards/kb_elmo/dizzy40/info.json | 91 +++++++++++++++++++ .../kb_elmo/dizzy40/keymaps/default/keymap.c | 25 +++++ .../kb_elmo/dizzy40/keymaps/via/keymap.c | 25 +++++ .../kb_elmo/dizzy40/keymaps/via/rules.mk | 2 + keyboards/kb_elmo/dizzy40/readme.md | 28 ++++++ keyboards/kb_elmo/dizzy40/rules.mk | 1 + keyboards/kb_elmo/eliza/info.json | 71 +++++++++++++++ .../kb_elmo/eliza/keymaps/default/keymap.c | 25 +++++ keyboards/kb_elmo/eliza/keymaps/via/keymap.c | 25 +++++ keyboards/kb_elmo/eliza/keymaps/via/rules.mk | 2 + keyboards/kb_elmo/eliza/readme.md | 28 ++++++ keyboards/kb_elmo/eliza/rules.mk | 1 + keyboards/kb_elmo/gamehand/info.json | 61 +++++++++++++ .../kb_elmo/gamehand/keymaps/default/keymap.c | 33 +++++++ .../kb_elmo/gamehand/keymaps/via/keymap.c | 33 +++++++ .../kb_elmo/gamehand/keymaps/via/rules.mk | 2 + keyboards/kb_elmo/gamehand/readme.md | 28 ++++++ keyboards/kb_elmo/gamehand/rules.mk | 1 + 24 files changed, 635 insertions(+) create mode 100644 keyboards/kb_elmo/bm42/info.json create mode 100644 keyboards/kb_elmo/bm42/keymaps/default/keymap.c create mode 100644 keyboards/kb_elmo/bm42/keymaps/via/keymap.c create mode 100644 keyboards/kb_elmo/bm42/keymaps/via/rules.mk create mode 100644 keyboards/kb_elmo/bm42/readme.md create mode 100644 keyboards/kb_elmo/bm42/rules.mk create mode 100644 keyboards/kb_elmo/dizzy40/info.json create mode 100644 keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c create mode 100644 keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c create mode 100644 keyboards/kb_elmo/dizzy40/keymaps/via/rules.mk create mode 100644 keyboards/kb_elmo/dizzy40/readme.md create mode 100644 keyboards/kb_elmo/dizzy40/rules.mk create mode 100644 keyboards/kb_elmo/eliza/info.json create mode 100644 keyboards/kb_elmo/eliza/keymaps/default/keymap.c create mode 100644 keyboards/kb_elmo/eliza/keymaps/via/keymap.c create mode 100644 keyboards/kb_elmo/eliza/keymaps/via/rules.mk create mode 100644 keyboards/kb_elmo/eliza/readme.md create mode 100644 keyboards/kb_elmo/eliza/rules.mk create mode 100644 keyboards/kb_elmo/gamehand/info.json create mode 100644 keyboards/kb_elmo/gamehand/keymaps/default/keymap.c create mode 100644 keyboards/kb_elmo/gamehand/keymaps/via/keymap.c create mode 100644 keyboards/kb_elmo/gamehand/keymaps/via/rules.mk create mode 100644 keyboards/kb_elmo/gamehand/readme.md create mode 100644 keyboards/kb_elmo/gamehand/rules.mk diff --git a/keyboards/kb_elmo/bm42/info.json b/keyboards/kb_elmo/bm42/info.json new file mode 100644 index 00000000000..a06019ca0bc --- /dev/null +++ b/keyboards/kb_elmo/bm42/info.json @@ -0,0 +1,72 @@ +{ + "manufacturer": "kb_elmo", + "keyboard_name": "BM42", + "url": "https://github.com/kb-elmo/bm42", + "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0xDC9B", + "device_version": "0.0.1" + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "matrix_pins": { + "cols": ["C5", "D1", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D4"], + "rows": ["D2", "D3", "C7", "C6"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "y": 0}, + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [3, 9], "x": 10.75, "y": 2, "w": 1.25}, + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 9.75, "y": 3}, + {"matrix": [3, 8], "x": 10.75, "y": 3, "w": 1.25} + ] + } + } +} diff --git a/keyboards/kb_elmo/bm42/keymaps/default/keymap.c b/keyboards/kb_elmo/bm42/keymaps/default/keymap.c new file mode 100644 index 00000000000..77dac80a1e1 --- /dev/null +++ b/keyboards/kb_elmo/bm42/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 kb-elmo (@kb-elmo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, MO(2) + ), + [1] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_GRV, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PSCR, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kb_elmo/bm42/keymaps/via/keymap.c b/keyboards/kb_elmo/bm42/keymaps/via/keymap.c new file mode 100644 index 00000000000..77dac80a1e1 --- /dev/null +++ b/keyboards/kb_elmo/bm42/keymaps/via/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 kb-elmo (@kb-elmo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, MO(2) + ), + [1] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_GRV, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PSCR, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kb_elmo/bm42/keymaps/via/rules.mk b/keyboards/kb_elmo/bm42/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/kb_elmo/bm42/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kb_elmo/bm42/readme.md b/keyboards/kb_elmo/bm42/readme.md new file mode 100644 index 00000000000..422d6080c5d --- /dev/null +++ b/keyboards/kb_elmo/bm42/readme.md @@ -0,0 +1,28 @@ +# BM42 + +![BM42](https://i.imgur.com/DljDoaTh.jpeg) + +A simple drop-in replacement PCB for the KPRepublic BM43 keyboard. + +* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo) +* Hardware Supported: BM42 rev.1 PCB +* Hardware Availability: [Open source project](https://github.com/kb-elmo/bm42) + +Make example for this keyboard (after setting up your build environment): + + make kb_elmo/bm42:default + +Flashing example for this keyboard: + + make kb_elmo/bm42:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/kb_elmo/bm42/rules.mk b/keyboards/kb_elmo/bm42/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/kb_elmo/bm42/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/kb_elmo/dizzy40/info.json b/keyboards/kb_elmo/dizzy40/info.json new file mode 100644 index 00000000000..0bac157c443 --- /dev/null +++ b/keyboards/kb_elmo/dizzy40/info.json @@ -0,0 +1,91 @@ +{ + "manufacturer": "kb_elmo", + "keyboard_name": "Dizzy40", + "url": "https://github.com/kb-elmo/dizzy40", + "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x7BB2", + "device_version": "0.0.1" + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "matrix_pins": { + "cols": ["C6", "C7", "B7", "B6", "B5", "D2", "B1", "B0", "D3", "D4", "D5"], + "rows": ["C4", "C5", "C2", "B2"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgblight": true, + "nkro": false + }, + "rgblight": { + "led_count": 8, + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B4" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "y": 0}, + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [3, 9], "x": 10.75, "y": 2, "w": 1.25}, + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 9.75, "y": 3}, + {"matrix": [3, 8], "x": 10.75, "y": 3, "w": 1.25} + ] + } + } +} diff --git a/keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c b/keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c new file mode 100644 index 00000000000..77dac80a1e1 --- /dev/null +++ b/keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 kb-elmo (@kb-elmo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, MO(2) + ), + [1] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_GRV, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PSCR, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c b/keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c new file mode 100644 index 00000000000..77dac80a1e1 --- /dev/null +++ b/keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 kb-elmo (@kb-elmo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, MO(2) + ), + [1] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_GRV, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PSCR, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kb_elmo/dizzy40/keymaps/via/rules.mk b/keyboards/kb_elmo/dizzy40/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/kb_elmo/dizzy40/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kb_elmo/dizzy40/readme.md b/keyboards/kb_elmo/dizzy40/readme.md new file mode 100644 index 00000000000..0fb02c36ae7 --- /dev/null +++ b/keyboards/kb_elmo/dizzy40/readme.md @@ -0,0 +1,28 @@ +# Dizzy40 + +![Dizzy40](https://i.imgur.com/TNXHaUGh.jpeg) + +A simple drop-in replacement PCB for the KPRepublic Daisy40 keyboard. + +* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo) +* Hardware Supported: Dizzy40 rev.1 PCB +* Hardware Availability: [Open source project](https://github.com/kb-elmo/dizzy40) + +Make example for this keyboard (after setting up your build environment): + + make kb_elmo/dizzy40:default + +Flashing example for this keyboard: + + make kb_elmo/dizzy40:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/kb_elmo/dizzy40/rules.mk b/keyboards/kb_elmo/dizzy40/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/kb_elmo/dizzy40/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/kb_elmo/eliza/info.json b/keyboards/kb_elmo/eliza/info.json new file mode 100644 index 00000000000..37c12b5ca97 --- /dev/null +++ b/keyboards/kb_elmo/eliza/info.json @@ -0,0 +1,71 @@ +{ + "manufacturer": "kb_elmo", + "keyboard_name": "Eliza", + "url": "https://github.com/kb-elmo/eliza", + "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0xC762", + "device_version": "0.0.1" + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "matrix_pins": { + "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "D1", "B1", "B0", "D6", "D5", "D4"], + "rows": ["D0", "D2", "B2", "D3"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0.35, "y": 0}, + {"matrix": [0, 1], "x": 1.35, "y": 0}, + {"matrix": [0, 2], "x": 2.65, "y": 0}, + {"matrix": [0, 3], "x": 3.65, "y": 0}, + {"matrix": [0, 4], "x": 4.65, "y": 0}, + {"matrix": [0, 5], "x": 5.65, "y": 0}, + {"matrix": [0, 6], "x": 7.9, "y": 0}, + {"matrix": [0, 7], "x": 8.9, "y": 0}, + {"matrix": [0, 8], "x": 9.9, "y": 0}, + {"matrix": [0, 9], "x": 10.9, "y": 0}, + {"matrix": [0, 10], "x": 12.2, "y": 0}, + {"matrix": [0, 11], "x": 13.2, "y": 0}, + {"matrix": [1, 0], "x": 0.2, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.45, "y": 1}, + {"matrix": [1, 2], "x": 2.9, "y": 1}, + {"matrix": [1, 3], "x": 3.9, "y": 1}, + {"matrix": [1, 4], "x": 4.9, "y": 1}, + {"matrix": [1, 5], "x": 5.9, "y": 1}, + {"matrix": [1, 6], "x": 8.15, "y": 1}, + {"matrix": [1, 7], "x": 9.15, "y": 1}, + {"matrix": [1, 8], "x": 10.15, "y": 1}, + {"matrix": [1, 9], "x": 11.15, "y": 1}, + {"matrix": [1, 11], "x": 12.6, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 3.4, "y": 2}, + {"matrix": [2, 3], "x": 4.4, "y": 2}, + {"matrix": [2, 4], "x": 5.4, "y": 2}, + {"matrix": [2, 5], "x": 6.4, "y": 2}, + {"matrix": [2, 6], "x": 7.65, "y": 2}, + {"matrix": [2, 7], "x": 8.65, "y": 2}, + {"matrix": [2, 8], "x": 9.65, "y": 2}, + {"matrix": [2, 9], "x": 10.65, "y": 2}, + {"matrix": [2, 10], "x": 12.3, "y": 2}, + {"matrix": [2, 11], "x": 13.3, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0.2, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 3.15, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.4, "y": 3, "w": 2.75}, + {"matrix": [3, 7], "x": 7.9, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 10.15, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 12.85, "y": 3, "w": 1.5} + ] + } + } +} diff --git a/keyboards/kb_elmo/eliza/keymaps/default/keymap.c b/keyboards/kb_elmo/eliza/keymaps/default/keymap.c new file mode 100644 index 00000000000..9a8b1e1965d --- /dev/null +++ b/keyboards/kb_elmo/eliza/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 kb-elmo (@kb-elmo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_RALT, MO(2) + ), + [1] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_GRV, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PSCR, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kb_elmo/eliza/keymaps/via/keymap.c b/keyboards/kb_elmo/eliza/keymaps/via/keymap.c new file mode 100644 index 00000000000..9a8b1e1965d --- /dev/null +++ b/keyboards/kb_elmo/eliza/keymaps/via/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 kb-elmo (@kb-elmo) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_RALT, MO(2) + ), + [1] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_GRV, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PSCR, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/kb_elmo/eliza/keymaps/via/rules.mk b/keyboards/kb_elmo/eliza/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/kb_elmo/eliza/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kb_elmo/eliza/readme.md b/keyboards/kb_elmo/eliza/readme.md new file mode 100644 index 00000000000..fd8b9e74e52 --- /dev/null +++ b/keyboards/kb_elmo/eliza/readme.md @@ -0,0 +1,28 @@ +# Eliza + +![Eliza](https://i.imgur.com/OGpPhReh.jpeg) + +40% alice-style ergo keyboard with a seamless 3D printed gasket-mount case. + +* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo) +* Hardware Supported: Eliza rev.1 PCB +* Hardware Availability: [Open source project](https://github.com/kb-elmo/eliza) + +Make example for this keyboard (after setting up your build environment): + + make kb_elmo/eliza:default + +Flashing example for this keyboard: + + make kb_elmo/eliza:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/kb_elmo/eliza/rules.mk b/keyboards/kb_elmo/eliza/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/kb_elmo/eliza/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/kb_elmo/gamehand/info.json b/keyboards/kb_elmo/gamehand/info.json new file mode 100644 index 00000000000..39795bf2502 --- /dev/null +++ b/keyboards/kb_elmo/gamehand/info.json @@ -0,0 +1,61 @@ +{ + "manufacturer": "kb-elmo", + "keyboard_name": "GameHand", + "url": "https://github.com/kb-elmo/gamehand", + "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x4D90", + "device_version": "0.0.1", + "force_nkro": true + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "matrix_pins": { + "cols": ["B2", "B1", "B0", "B7", "C7", "C6"], + "rows": ["D6", "D5", "D4", "D3", "D2"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + }, + "build": { + "debounce_type": "sym_defer_pk" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2} + ] + } + } +} diff --git a/keyboards/kb_elmo/gamehand/keymaps/default/keymap.c b/keyboards/kb_elmo/gamehand/keymaps/default/keymap.c new file mode 100644 index 00000000000..d22614cb0b2 --- /dev/null +++ b/keyboards/kb_elmo/gamehand/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 kb-elmo + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, + KC_LCTL, KC_M, KC_H, KC_SPC + ), + [1] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT + ) +}; diff --git a/keyboards/kb_elmo/gamehand/keymaps/via/keymap.c b/keyboards/kb_elmo/gamehand/keymaps/via/keymap.c new file mode 100644 index 00000000000..d9e5dc747c6 --- /dev/null +++ b/keyboards/kb_elmo/gamehand/keymaps/via/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 kb-elmo + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, + KC_LCTL, KC_M, KC_H, KC_SPC + ), + [1] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT + ), +}; diff --git a/keyboards/kb_elmo/gamehand/keymaps/via/rules.mk b/keyboards/kb_elmo/gamehand/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/kb_elmo/gamehand/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kb_elmo/gamehand/readme.md b/keyboards/kb_elmo/gamehand/readme.md new file mode 100644 index 00000000000..a78e1ee205c --- /dev/null +++ b/keyboards/kb_elmo/gamehand/readme.md @@ -0,0 +1,28 @@ +# GameHand + +![gamehand](https://i.imgur.com/ia3bcUBh.jpg) + +A left-hand gaming keypad with a 3D printed case + +* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo) +* Hardware Supported: GameHand rev.1 PCB +* Hardware Availability: [OpenSource Project](https://github.com/kb-elmo/GameHand) + +Make example for this keyboard (after setting up your build environment): + + make kb_elmo/gamehand:default + +Flashing example for this keyboard: + + make kb_elmo/gamehand:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/kb_elmo/gamehand/rules.mk b/keyboards/kb_elmo/gamehand/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/kb_elmo/gamehand/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From aa73362674028bf6603a7a2df701f4617e09f8cb Mon Sep 17 00:00:00 2001 From: galile0 <134774462+galile0-designs@users.noreply.github.com> Date: Wed, 13 Mar 2024 08:24:21 +0100 Subject: [PATCH 11/29] [Keyboard] add glyphkbd_v2 (#23131) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan --- keyboards/galile0/glyphkbd_v2/info.json | 104 +++++++++++++++++ .../glyphkbd_v2/keymaps/default/keymap.c | 105 ++++++++++++++++++ .../galile0/glyphkbd_v2/keymaps/via/keymap.c | 105 ++++++++++++++++++ .../galile0/glyphkbd_v2/keymaps/via/rules.mk | 1 + keyboards/galile0/glyphkbd_v2/readme.md | 27 +++++ keyboards/galile0/glyphkbd_v2/rules.mk | 1 + 6 files changed, 343 insertions(+) create mode 100644 keyboards/galile0/glyphkbd_v2/info.json create mode 100644 keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c create mode 100644 keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c create mode 100644 keyboards/galile0/glyphkbd_v2/keymaps/via/rules.mk create mode 100644 keyboards/galile0/glyphkbd_v2/readme.md create mode 100644 keyboards/galile0/glyphkbd_v2/rules.mk diff --git a/keyboards/galile0/glyphkbd_v2/info.json b/keyboards/galile0/glyphkbd_v2/info.json new file mode 100644 index 00000000000..664b4c491ff --- /dev/null +++ b/keyboards/galile0/glyphkbd_v2/info.json @@ -0,0 +1,104 @@ +{ + "manufacturer": "galile0", + "keyboard_name": "glyphkbd_v2", + "maintainer": "galile0-designs", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B1", "A1", "B0", "A0", "C5", "C3", "C4", "C2", "A7", "C1", "A6", "C0", "A5", "B12", "B13", "B14"], + "rows": ["B10", "B2", "A2", "F0", "F1"] + }, + "processor": "STM32F072", + "url": "https://github.com/galile0-designs/glyphkbd", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x4744" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 14.5, "y": 0}, + {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1}, + {"matrix": [1, 14], "x": 14.5, "y": 1}, + {"matrix": [1, 15], "x": 15.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 14], "x": 14.5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4}, + {"matrix": [4, 14], "x": 14.5, "y": 4}, + {"matrix": [4, 15], "x": 15.5, "y": 4} + ] + } + } +} diff --git a/keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c b/keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c new file mode 100644 index 00000000000..15ad99b61fb --- /dev/null +++ b/keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c @@ -0,0 +1,105 @@ +/* + *Copyright 2024 Fabian Leijström (@galile0-designs) + * + *This program is free software: you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation, either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* LAYER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┐ + * │ ESC │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ BS │ │ INS │HOME │PGUP │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┤ + * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ DEL │ END │PGDN │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ └─────┴─────┴─────┘ + * │CAPS │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ENTER│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┐ + * │SHIFT│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │SHIFT│ │ UP │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┼─────┼─────┐ + * │CTRL │ │ SYS │ ALT │LOWER│ SPACE │SPACE│RAISE│ ALT │ SYS │ │CTRL │ │LEFT │DOWN │RIGHT│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┘ + */ + + [0] = LAYOUT( + //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_NO, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_RALT, KC_RGUI, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* FUNCTION LAYER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┐ + * │PAUSE│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ PRT │ │ │ + * │PLAY │ │ │ │ │ │ │ │ │ │ │ │ │ │ SCR │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ └─────┴─────┴─────┘ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┼─────┼─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┘ + */ + + [1] = LAYOUT( + //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** + KC_MPLY, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), + + /* SYMBOLS LAYER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┐ + * │ │ │ │ │ │ │ │ │ │ ` │ = │ + │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ └─────┴─────┴─────┘ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┼─────┼─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┘ + */ + + [2] = LAYOUT( + //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_EQL, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ) +}; diff --git a/keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c b/keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c new file mode 100644 index 00000000000..15ad99b61fb --- /dev/null +++ b/keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c @@ -0,0 +1,105 @@ +/* + *Copyright 2024 Fabian Leijström (@galile0-designs) + * + *This program is free software: you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation, either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* LAYER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┐ + * │ ESC │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ BS │ │ INS │HOME │PGUP │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┤ + * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ DEL │ END │PGDN │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ └─────┴─────┴─────┘ + * │CAPS │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ENTER│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┐ + * │SHIFT│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │SHIFT│ │ UP │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┼─────┼─────┐ + * │CTRL │ │ SYS │ ALT │LOWER│ SPACE │SPACE│RAISE│ ALT │ SYS │ │CTRL │ │LEFT │DOWN │RIGHT│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┘ + */ + + [0] = LAYOUT( + //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_NO, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_RALT, KC_RGUI, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* FUNCTION LAYER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┐ + * │PAUSE│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ PRT │ │ │ + * │PLAY │ │ │ │ │ │ │ │ │ │ │ │ │ │ SCR │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ └─────┴─────┴─────┘ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┼─────┼─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┘ + */ + + [1] = LAYOUT( + //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** + KC_MPLY, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), + + /* SYMBOLS LAYER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┐ + * │ │ │ │ │ │ │ │ │ │ ` │ = │ + │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ └─────┴─────┴─────┘ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤ ┌─────┼─────┼─────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┘ + */ + + [2] = LAYOUT( + //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_EQL, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ) +}; diff --git a/keyboards/galile0/glyphkbd_v2/keymaps/via/rules.mk b/keyboards/galile0/glyphkbd_v2/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/galile0/glyphkbd_v2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/galile0/glyphkbd_v2/readme.md b/keyboards/galile0/glyphkbd_v2/readme.md new file mode 100644 index 00000000000..378238c38d4 --- /dev/null +++ b/keyboards/galile0/glyphkbd_v2/readme.md @@ -0,0 +1,27 @@ +# glyphkbd_v2 + +![glyphkbd_v2](https://i.imgur.com/9PxLaPlh.jpeg) + +5x13 ortholinear plus TKL nav and arrow clusters. + +* Keyboard Maintainer: [Fabian Leijström](https://github.com/galile0-designs) +* Hardware Supported: glyphkbd_v2 PCB +* Hardware Availability: [Github Repository](https://github.com/galile0-designs/glyphkbd) + +Make example for this keyboard (after setting up your build environment): + + make galile0/glyphkbd_v2:default + +Flashing example for this keyboard: + + make galile0/glyphkbd_v2:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/galile0/glyphkbd_v2/rules.mk b/keyboards/galile0/glyphkbd_v2/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/galile0/glyphkbd_v2/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 10800259739e1bf35db7a8d0c8acfa102f3de7a9 Mon Sep 17 00:00:00 2001 From: achim-t Date: Thu, 14 Mar 2024 04:28:54 +0100 Subject: [PATCH 12/29] Update feature_tri_layer.md - typo (#23275) --- docs/feature_tri_layer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/feature_tri_layer.md b/docs/feature_tri_layer.md index ade0040cc7b..3087fb5a550 100644 --- a/docs/feature_tri_layer.md +++ b/docs/feature_tri_layer.md @@ -45,4 +45,4 @@ Eg, if you wanted to set the "Adjust" layer to be layer 5, you'd add this to you | `get_tri_layer_upper_layer()` | Gets the current "upper" layer. | | `get_tri_layer_adjust_layer()` | Gets the current "adjust" layer. | -!> Note: these settings are not persisent, and will be reset to the default on power loss or power cycling of the controller. +!> Note: these settings are not persistent, and will be reset to the default on power loss or power cycling of the controller. From 67df06eb441316d03256a962d4dad85d3a76cb37 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 15 Mar 2024 04:52:30 +1100 Subject: [PATCH 13/29] Fixup cipulot eeprom. (#23280) --- keyboards/cipulot/common/ec_switch_matrix.h | 1 + keyboards/cipulot/ec_23u/config.h | 2 +- keyboards/cipulot/ec_60/config.h | 2 +- keyboards/cipulot/ec_alveus/1_0_0/config.h | 2 +- keyboards/cipulot/ec_alveus/1_2_0/config.h | 2 +- keyboards/cipulot/ec_pro2/config.h | 2 +- keyboards/cipulot/ec_prox/ansi_iso/config.h | 2 +- keyboards/cipulot/ec_prox/jis/config.h | 2 +- keyboards/cipulot/ec_theca/config.h | 2 +- keyboards/cipulot/rf_r1_8_9xu/config.h | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/keyboards/cipulot/common/ec_switch_matrix.h b/keyboards/cipulot/common/ec_switch_matrix.h index ad03f093de7..4b424911da8 100644 --- a/keyboards/cipulot/common/ec_switch_matrix.h +++ b/keyboards/cipulot/common/ec_switch_matrix.h @@ -20,6 +20,7 @@ #include #include "matrix.h" #include "eeconfig.h" +#include "util.h" typedef struct PACKED { uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h index da210fe0c63..3a3d482e3d3 100644 --- a/keyboards/cipulot/ec_23u/config.h +++ b/keyboards/cipulot/ec_23u/config.h @@ -60,7 +60,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 58 +#define EECONFIG_KB_DATA_SIZE 57 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_60/config.h b/keyboards/cipulot/ec_60/config.h index d4dc8cf68ac..c936b248c45 100644 --- a/keyboards/cipulot/ec_60/config.h +++ b/keyboards/cipulot/ec_60/config.h @@ -63,7 +63,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 160 +#define EECONFIG_KB_DATA_SIZE 159 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_alveus/1_0_0/config.h b/keyboards/cipulot/ec_alveus/1_0_0/config.h index 775c7906adb..ea43ba348d5 100644 --- a/keyboards/cipulot/ec_alveus/1_0_0/config.h +++ b/keyboards/cipulot/ec_alveus/1_0_0/config.h @@ -62,7 +62,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 170 +#define EECONFIG_KB_DATA_SIZE 169 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_alveus/1_2_0/config.h b/keyboards/cipulot/ec_alveus/1_2_0/config.h index 775c7906adb..ea43ba348d5 100644 --- a/keyboards/cipulot/ec_alveus/1_2_0/config.h +++ b/keyboards/cipulot/ec_alveus/1_2_0/config.h @@ -62,7 +62,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 170 +#define EECONFIG_KB_DATA_SIZE 169 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index d4dc8cf68ac..c936b248c45 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -63,7 +63,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 160 +#define EECONFIG_KB_DATA_SIZE 159 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_prox/ansi_iso/config.h b/keyboards/cipulot/ec_prox/ansi_iso/config.h index ec15808274c..6a165cf3abd 100644 --- a/keyboards/cipulot/ec_prox/ansi_iso/config.h +++ b/keyboards/cipulot/ec_prox/ansi_iso/config.h @@ -63,7 +63,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 160 +#define EECONFIG_KB_DATA_SIZE 159 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_prox/jis/config.h b/keyboards/cipulot/ec_prox/jis/config.h index 8761b692aad..6a686d74044 100644 --- a/keyboards/cipulot/ec_prox/jis/config.h +++ b/keyboards/cipulot/ec_prox/jis/config.h @@ -63,7 +63,7 @@ // #define DEBUG_MATRIX_SCAN_RATE -#define EECONFIG_KB_DATA_SIZE 150 +#define EECONFIG_KB_DATA_SIZE 149 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/ec_theca/config.h b/keyboards/cipulot/ec_theca/config.h index 23a0bb4eb40..4b834fdff68 100644 --- a/keyboards/cipulot/ec_theca/config.h +++ b/keyboards/cipulot/ec_theca/config.h @@ -62,7 +62,7 @@ // #define DEBUG_MATRIX_SCAN_RATE #define DYNAMIC_KEYMAP_LAYER_COUNT 3 -#define EECONFIG_KB_DATA_SIZE 202 +#define EECONFIG_KB_DATA_SIZE 201 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cipulot/rf_r1_8_9xu/config.h b/keyboards/cipulot/rf_r1_8_9xu/config.h index bd020ff4333..fbd65f259fd 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/config.h +++ b/keyboards/cipulot/rf_r1_8_9xu/config.h @@ -62,7 +62,7 @@ // #define DEBUG_MATRIX_SCAN_RATE #define DYNAMIC_KEYMAP_LAYER_COUNT 3 -#define EECONFIG_KB_DATA_SIZE 202 +#define EECONFIG_KB_DATA_SIZE 201 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From 7d417b78eb76b498f10a2924cb82030a244b1594 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 14 Mar 2024 18:32:17 -0700 Subject: [PATCH 14/29] AMJKeyboard AMJ96 Layout Additions (#23267) --- keyboards/amjkeyboard/amj96/info.json | 221 ++++++++++++++++++ keyboards/amjkeyboard/amj96/matrix_diagram.md | 25 ++ 2 files changed, 246 insertions(+) create mode 100644 keyboards/amjkeyboard/amj96/matrix_diagram.md diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json index 973e6b33759..60cb8ee9e83 100644 --- a/keyboards/amjkeyboard/amj96/info.json +++ b/keyboards/amjkeyboard/amj96/info.json @@ -130,6 +130,227 @@ {"matrix": [0, 14], "x": 17, "y": 4}, {"matrix": [0, 7], "x": 18, "y": 4}, + {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [6, 6], "x": 13, "y": 5}, + {"matrix": [6, 8], "x": 14, "y": 5}, + {"matrix": [6, 9], "x": 15, "y": 5}, + {"matrix": [6, 10], "x": 16, "y": 5}, + {"matrix": [6, 11], "x": 17, "y": 5}, + {"matrix": [6, 12], "x": 18, "y": 5} + ] + }, + "LAYOUT_96_ansi_rwkl_split_num_plus_enter": { + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [1, 2], "x": 2, "y": 0}, + {"matrix": [1, 3], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [1, 5], "x": 5, "y": 0}, + {"matrix": [1, 6], "x": 6, "y": 0}, + {"matrix": [1, 7], "x": 7, "y": 0}, + {"matrix": [1, 8], "x": 8, "y": 0}, + {"matrix": [1, 9], "x": 9, "y": 0}, + {"matrix": [1, 10], "x": 10, "y": 0}, + {"matrix": [1, 11], "x": 11, "y": 0}, + {"matrix": [1, 12], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + {"matrix": [1, 15], "x": 15, "y": 0}, + {"matrix": [0, 9], "x": 16, "y": 0}, + {"matrix": [0, 10], "x": 17, "y": 0}, + {"matrix": [0, 12], "x": 18, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [2, 6], "x": 6, "y": 1}, + {"matrix": [2, 7], "x": 7, "y": 1}, + {"matrix": [2, 8], "x": 8, "y": 1}, + {"matrix": [2, 9], "x": 9, "y": 1}, + {"matrix": [2, 10], "x": 10, "y": 1}, + {"matrix": [2, 11], "x": 11, "y": 1}, + {"matrix": [2, 12], "x": 12, "y": 1}, + {"matrix": [2, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [2, 15], "x": 15, "y": 1}, + {"matrix": [0, 11], "x": 16, "y": 1}, + {"matrix": [0, 15], "x": 17, "y": 1}, + {"matrix": [6, 15], "x": 18, "y": 1}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2}, + {"matrix": [3, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 3], "x": 3.5, "y": 2}, + {"matrix": [3, 4], "x": 4.5, "y": 2}, + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 6], "x": 6.5, "y": 2}, + {"matrix": [3, 7], "x": 7.5, "y": 2}, + {"matrix": [3, 8], "x": 8.5, "y": 2}, + {"matrix": [3, 9], "x": 9.5, "y": 2}, + {"matrix": [3, 10], "x": 10.5, "y": 2}, + {"matrix": [3, 11], "x": 11.5, "y": 2}, + {"matrix": [3, 12], "x": 12.5, "y": 2}, + {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [3, 14], "x": 15, "y": 2}, + {"matrix": [3, 15], "x": 16, "y": 2}, + {"matrix": [0, 13], "x": 17, "y": 2}, + {"matrix": [6, 13], "x": 18, "y": 2}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 3}, + {"matrix": [4, 2], "x": 2.75, "y": 3}, + {"matrix": [4, 3], "x": 3.75, "y": 3}, + {"matrix": [4, 4], "x": 4.75, "y": 3}, + {"matrix": [4, 5], "x": 5.75, "y": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 3}, + {"matrix": [4, 7], "x": 7.75, "y": 3}, + {"matrix": [4, 8], "x": 8.75, "y": 3}, + {"matrix": [4, 9], "x": 9.75, "y": 3}, + {"matrix": [4, 10], "x": 10.75, "y": 3}, + {"matrix": [4, 11], "x": 11.75, "y": 3}, + {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [4, 13], "x": 15, "y": 3}, + {"matrix": [4, 14], "x": 16, "y": 3}, + {"matrix": [4, 15], "x": 17, "y": 3}, + {"matrix": [6, 14], "x": 18, "y": 3}, + + {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [5, 2], "x": 2.25, "y": 4}, + {"matrix": [5, 3], "x": 3.25, "y": 4}, + {"matrix": [5, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 5], "x": 5.25, "y": 4}, + {"matrix": [5, 6], "x": 6.25, "y": 4}, + {"matrix": [5, 7], "x": 7.25, "y": 4}, + {"matrix": [5, 8], "x": 8.25, "y": 4}, + {"matrix": [5, 9], "x": 9.25, "y": 4}, + {"matrix": [5, 10], "x": 10.25, "y": 4}, + {"matrix": [5, 11], "x": 11.25, "y": 4}, + {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [5, 13], "x": 14, "y": 4}, + {"matrix": [5, 14], "x": 15, "y": 4}, + {"matrix": [5, 15], "x": 16, "y": 4}, + {"matrix": [0, 14], "x": 17, "y": 4}, + {"matrix": [0, 7], "x": 18, "y": 4}, + + {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [6, 6], "x": 13, "y": 5}, + {"matrix": [6, 8], "x": 14, "y": 5}, + {"matrix": [6, 9], "x": 15, "y": 5}, + {"matrix": [6, 10], "x": 16, "y": 5}, + {"matrix": [6, 11], "x": 17, "y": 5}, + {"matrix": [6, 12], "x": 18, "y": 5} + ] + }, + "LAYOUT_96_ansi_rwkl_split_bs_num_plus_enter": { + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [1, 2], "x": 2, "y": 0}, + {"matrix": [1, 3], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [1, 5], "x": 5, "y": 0}, + {"matrix": [1, 6], "x": 6, "y": 0}, + {"matrix": [1, 7], "x": 7, "y": 0}, + {"matrix": [1, 8], "x": 8, "y": 0}, + {"matrix": [1, 9], "x": 9, "y": 0}, + {"matrix": [1, 10], "x": 10, "y": 0}, + {"matrix": [1, 11], "x": 11, "y": 0}, + {"matrix": [1, 12], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + {"matrix": [1, 15], "x": 15, "y": 0}, + {"matrix": [0, 9], "x": 16, "y": 0}, + {"matrix": [0, 10], "x": 17, "y": 0}, + {"matrix": [0, 12], "x": 18, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [2, 6], "x": 6, "y": 1}, + {"matrix": [2, 7], "x": 7, "y": 1}, + {"matrix": [2, 8], "x": 8, "y": 1}, + {"matrix": [2, 9], "x": 9, "y": 1}, + {"matrix": [2, 10], "x": 10, "y": 1}, + {"matrix": [2, 11], "x": 11, "y": 1}, + {"matrix": [2, 12], "x": 12, "y": 1}, + {"matrix": [2, 13], "x": 13, "y": 1}, + {"matrix": [2, 14], "x": 14, "y": 1}, + {"matrix": [2, 15], "x": 15, "y": 1}, + {"matrix": [0, 11], "x": 16, "y": 1}, + {"matrix": [0, 15], "x": 17, "y": 1}, + {"matrix": [6, 15], "x": 18, "y": 1}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2}, + {"matrix": [3, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 3], "x": 3.5, "y": 2}, + {"matrix": [3, 4], "x": 4.5, "y": 2}, + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 6], "x": 6.5, "y": 2}, + {"matrix": [3, 7], "x": 7.5, "y": 2}, + {"matrix": [3, 8], "x": 8.5, "y": 2}, + {"matrix": [3, 9], "x": 9.5, "y": 2}, + {"matrix": [3, 10], "x": 10.5, "y": 2}, + {"matrix": [3, 11], "x": 11.5, "y": 2}, + {"matrix": [3, 12], "x": 12.5, "y": 2}, + {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [3, 14], "x": 15, "y": 2}, + {"matrix": [3, 15], "x": 16, "y": 2}, + {"matrix": [0, 13], "x": 17, "y": 2}, + {"matrix": [6, 13], "x": 18, "y": 2}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 3}, + {"matrix": [4, 2], "x": 2.75, "y": 3}, + {"matrix": [4, 3], "x": 3.75, "y": 3}, + {"matrix": [4, 4], "x": 4.75, "y": 3}, + {"matrix": [4, 5], "x": 5.75, "y": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 3}, + {"matrix": [4, 7], "x": 7.75, "y": 3}, + {"matrix": [4, 8], "x": 8.75, "y": 3}, + {"matrix": [4, 9], "x": 9.75, "y": 3}, + {"matrix": [4, 10], "x": 10.75, "y": 3}, + {"matrix": [4, 11], "x": 11.75, "y": 3}, + {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [4, 13], "x": 15, "y": 3}, + {"matrix": [4, 14], "x": 16, "y": 3}, + {"matrix": [4, 15], "x": 17, "y": 3}, + {"matrix": [6, 14], "x": 18, "y": 3}, + + {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [5, 2], "x": 2.25, "y": 4}, + {"matrix": [5, 3], "x": 3.25, "y": 4}, + {"matrix": [5, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 5], "x": 5.25, "y": 4}, + {"matrix": [5, 6], "x": 6.25, "y": 4}, + {"matrix": [5, 7], "x": 7.25, "y": 4}, + {"matrix": [5, 8], "x": 8.25, "y": 4}, + {"matrix": [5, 9], "x": 9.25, "y": 4}, + {"matrix": [5, 10], "x": 10.25, "y": 4}, + {"matrix": [5, 11], "x": 11.25, "y": 4}, + {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [5, 13], "x": 14, "y": 4}, + {"matrix": [5, 14], "x": 15, "y": 4}, + {"matrix": [5, 15], "x": 16, "y": 4}, + {"matrix": [0, 14], "x": 17, "y": 4}, + {"matrix": [0, 7], "x": 18, "y": 4}, + {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25}, {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25}, {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25}, diff --git a/keyboards/amjkeyboard/amj96/matrix_diagram.md b/keyboards/amjkeyboard/amj96/matrix_diagram.md new file mode 100644 index 00000000000..6bd94f88bef --- /dev/null +++ b/keyboards/amjkeyboard/amj96/matrix_diagram.md @@ -0,0 +1,25 @@ +# Matrix Diagram for Han Chen AMJ96 + +There's a lot of options available on the PCB, including some on the +bottom row, but I haven't ever found high quality images of a bare PCB +with which to determine what's actually supported. :\\\ +\- @noroadsleft, 19 January, 2024 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │09 │0A │0C │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ┌───────┐ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │0B │0F │6F │ │2D │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤ └─┬─────┤ ┌─────┐ ┌───┐ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │0D │6D │ │ │ │3D │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤ ┌──┴┐?? │ ISO Enter ┌──┴┬────┤ Split Enter │?? │ 2u Numpad Plus +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │4F │6E │ │?? │ │ │?? │?? │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤ ┌─┴───┴────┤ └───┴────┘ ├───┤ +│50 │51 │52 │53 │54 │55 │56 │57 │58 │59 │5A │5B │5C │5D │5E │5F │0E │07 │ │?? │ 2.75u │ │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┼───┤ └──────────┘ RShift │?? │ 2u Numpad Enter +│60 │61 │62 │63 │64 │65 │66 │68 │69 │6A │6B │6C │ │ │ +└────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘ └───┘ +┌────────┐ ┌───────┐ +│50 │ 2.25u LShift │?? │ 2u Numpad Zero +└────────┘ └───────┘ +``` From 0d9399234dbbe68d7db8c955cb3f3a2bc3cfd33f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 01:44:32 +0000 Subject: [PATCH 15/29] Bump tj-actions/changed-files from 42 to 43 (#23282) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v42...v43) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/format.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index df080cfe8ce..a7d3d40974f 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -35,7 +35,7 @@ jobs: - name: Get changed files id: file_changes - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v43 with: use_rest_api: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a008ebb829f..290f5b66ebe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs: - name: Get changed files id: file_changes - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v43 with: use_rest_api: true From f0e219a1c8f5590976fede31c8fac5bf1e6f20ef Mon Sep 17 00:00:00 2001 From: AlanLiu <125098342+AlanSub@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:00:03 +0800 Subject: [PATCH 16/29] Modify wording in 'getting_started_introduction.md' (#23232) Co-authored-by: Joel Challis --- docs/getting_started_introduction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting_started_introduction.md b/docs/getting_started_introduction.md index 6dc51b82b73..80203353452 100644 --- a/docs/getting_started_introduction.md +++ b/docs/getting_started_introduction.md @@ -4,7 +4,7 @@ This page attempts to explain the basic information you need to know to work wit ## Basic QMK Structure -QMK is a fork of [Jun Wako](https://github.com/tmk)'s [tmk_keyboard](https://github.com/tmk/tmk_keyboard) project. The original TMK code, with modifications, can be found in the `tmk_core` folder. The QMK additions to the project may be found in the `quantum` folder. Keyboard projects may be found in the `handwired` and `keyboard` folders. +QMK is a fork of [Jun Wako](https://github.com/tmk)'s [tmk_keyboard](https://github.com/tmk/tmk_keyboard) project. The original TMK code, with modifications, can be found in the `tmk_core` folder. The QMK additions to the project may be found in the `quantum` folder. Keyboard projects may be found in the `keyboards` folder. ### Userspace Structure From cba2b5645ff57adb42b6b9f8a23b4cfb09d4decb Mon Sep 17 00:00:00 2001 From: Wilba Date: Fri, 15 Mar 2024 16:09:20 +1100 Subject: [PATCH 17/29] Added WT65-G3 (HIBI HIBIKI) (#22888) --- keyboards/wilba_tech/wt65_g3/info.json | 395 ++++++++++++++++++ .../wt65_g3/keymaps/default/keymap.c | 25 ++ .../wilba_tech/wt65_g3/keymaps/via/keymap.c | 4 + .../wilba_tech/wt65_g3/keymaps/via/rules.mk | 1 + keyboards/wilba_tech/wt65_g3/readme.md | 19 + keyboards/wilba_tech/wt65_g3/rules.mk | 1 + 6 files changed, 445 insertions(+) create mode 100644 keyboards/wilba_tech/wt65_g3/info.json create mode 100644 keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c create mode 100644 keyboards/wilba_tech/wt65_g3/keymaps/via/keymap.c create mode 100644 keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk create mode 100644 keyboards/wilba_tech/wt65_g3/readme.md create mode 100644 keyboards/wilba_tech/wt65_g3/rules.mk diff --git a/keyboards/wilba_tech/wt65_g3/info.json b/keyboards/wilba_tech/wt65_g3/info.json new file mode 100644 index 00000000000..bf0e0ed9d06 --- /dev/null +++ b/keyboards/wilba_tech/wt65_g3/info.json @@ -0,0 +1,395 @@ +{ + "manufacturer": "wilba.tech", + "keyboard_name": "WT65-G3", + "maintainer": "Wilba", + "bootloader": "atmel-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "processor": "atmega32u4", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x003A", + "vid": "0x6582" + }, + "layouts": { + "LAYOUT_65_ansi_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_iso_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_iso_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c new file mode 100644 index 00000000000..159c2b0be26 --- /dev/null +++ b/keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + +// Default layout for WT65-G3 +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // Default layer + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + // Fn1 Layer + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_INS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +}; diff --git a/keyboards/wilba_tech/wt65_g3/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_g3/keymaps/via/keymap.c new file mode 100644 index 00000000000..4fc052443e4 --- /dev/null +++ b/keyboards/wilba_tech/wt65_g3/keymaps/via/keymap.c @@ -0,0 +1,4 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "../default/keymap.c" diff --git a/keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk b/keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/wilba_tech/wt65_g3/readme.md b/keyboards/wilba_tech/wt65_g3/readme.md new file mode 100644 index 00000000000..12744874d75 --- /dev/null +++ b/keyboards/wilba_tech/wt65_g3/readme.md @@ -0,0 +1,19 @@ +# wilba.tech WT65-G3 + +WT65-G3 is a keyboard PCB supporting 65% ANSI/ISO layout, 6.25U/7U bottom row (no blocker) and full/split backspace. + +Initially designed for the [HIBI HIBIKI](https://hibi.mx/products/hibiki) + +- Keyboard Maintainer: [wilba](https://github.com/wilba) +- Hardware Supported: wilba.tech WT65-G3-HIBI +- Hardware Availability: [HIBI](https://hibi.mx/products/hibiki) + +Make example for this keyboard (after setting up your build environment): + + make wilba_tech/wt65_g3:default + +Flashing example for this keyboard: + + make wilba_tech/wt65_g3:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/wilba_tech/wt65_g3/rules.mk b/keyboards/wilba_tech/wt65_g3/rules.mk new file mode 100644 index 00000000000..c80812f6e0a --- /dev/null +++ b/keyboards/wilba_tech/wt65_g3/rules.mk @@ -0,0 +1 @@ +# This file is intentionally blank From c5f544cd9696eb607e88b921d3fc31959ada914a Mon Sep 17 00:00:00 2001 From: Wilba Date: Fri, 15 Mar 2024 16:10:17 +1100 Subject: [PATCH 18/29] Added WT65-H3 (HIBI HIBIKI) (#22886) --- keyboards/wilba_tech/wt65_h3/info.json | 390 ++++++++++++++++++ .../wt65_h3/keymaps/default/keymap.c | 24 ++ .../wilba_tech/wt65_h3/keymaps/via/keymap.c | 4 + .../wilba_tech/wt65_h3/keymaps/via/rules.mk | 1 + keyboards/wilba_tech/wt65_h3/readme.md | 19 + keyboards/wilba_tech/wt65_h3/rules.mk | 1 + 6 files changed, 439 insertions(+) create mode 100644 keyboards/wilba_tech/wt65_h3/info.json create mode 100644 keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c create mode 100644 keyboards/wilba_tech/wt65_h3/keymaps/via/keymap.c create mode 100644 keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk create mode 100644 keyboards/wilba_tech/wt65_h3/readme.md create mode 100644 keyboards/wilba_tech/wt65_h3/rules.mk diff --git a/keyboards/wilba_tech/wt65_h3/info.json b/keyboards/wilba_tech/wt65_h3/info.json new file mode 100644 index 00000000000..7cef91a68c1 --- /dev/null +++ b/keyboards/wilba_tech/wt65_h3/info.json @@ -0,0 +1,390 @@ +{ + "manufacturer": "wilba.tech", + "keyboard_name": "WT65-H3", + "maintainer": "Wilba", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4", "F6", "F7"] + }, + "processor": "atmega32u4", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x0036", + "vid": "0x6582" + }, + "layouts": { + "LAYOUT_65_ansi_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_wkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c new file mode 100644 index 00000000000..3fd505a748d --- /dev/null +++ b/keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + +// Default layout for WT65-H3 +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // Default layer + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + // Fn1 Layer + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_INS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/wilba_tech/wt65_h3/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_h3/keymaps/via/keymap.c new file mode 100644 index 00000000000..4fc052443e4 --- /dev/null +++ b/keyboards/wilba_tech/wt65_h3/keymaps/via/keymap.c @@ -0,0 +1,4 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "../default/keymap.c" diff --git a/keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk b/keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/wilba_tech/wt65_h3/readme.md b/keyboards/wilba_tech/wt65_h3/readme.md new file mode 100644 index 00000000000..7e57842e8f2 --- /dev/null +++ b/keyboards/wilba_tech/wt65_h3/readme.md @@ -0,0 +1,19 @@ +# wilba.tech WT65-H3 + +WT65-H3 is a keyboard PCB supporting 65% ANSI layout, 6.25U/7U bottom row (no blocker) and full/split backspace. + +Initially designed for the [HIBI HIBIKI](https://hibi.mx/products/hibiki) + +- Keyboard Maintainer: [wilba](https://github.com/wilba) +- Hardware Supported: wilba.tech WT65-H3-HIBI +- Hardware Availability: [HIBI](https://hibi.mx/products/hibiki) + +Make example for this keyboard (after setting up your build environment): + + make wilba_tech/wt65_h3:default + +Flashing example for this keyboard: + + make wilba_tech/wt65_h3:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/wilba_tech/wt65_h3/rules.mk b/keyboards/wilba_tech/wt65_h3/rules.mk new file mode 100644 index 00000000000..c80812f6e0a --- /dev/null +++ b/keyboards/wilba_tech/wt65_h3/rules.mk @@ -0,0 +1 @@ +# This file is intentionally blank From b1235baf42f08c3fdce1f6b7db9e528c5990de2e Mon Sep 17 00:00:00 2001 From: joliverMI <36174681+joliverMI@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:52:20 -0400 Subject: [PATCH 19/29] [Keyboard] Add posey_split v4/v5 (#23258) * Created posey_split keyboards and included default keymaps. * Update keyboards/pmk/posey_split/posey_split_v4/config.h Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/pmk/posey_split/posey_split_v4/config.h Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/pmk/posey_split/posey_split_v4/info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/pmk/posey_split/posey_split_v4/info.json Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/posey_split_v4/info.json Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/posey_split_v4/readme.md Co-authored-by: jack <0x6a73@protonmail.com> * Various cleanup updates per QMK maintainers on PR #23258 * removed config files from via keymaps * removed additional keyboard for PR. * changed folder structure per PR suggestion * Update keyboards/pmk/posey_split/v5/info.json Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v5/rules.mk Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v4/rules.mk Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v5/keymaps/VIA/keymap.c Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v5/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v4/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v4/keymaps/VIA/keymap.c Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v5/readme.md Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v4/readme.md Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v4/info.json Co-authored-by: Joel Challis * changed via folders to lowercase * cleaned up extra via files in wrong folder * Added better descriptions to keyboard projects and added hardware listing to v5 * Cleaned up keymap format * removed extra rules * Update keyboards/pmk/posey_split/v4/keymaps/via/keymap.c Co-authored-by: Joel Challis * Update keyboards/pmk/posey_split/v5/readme.md Co-authored-by: Joel Challis * removed "about" from readme on v4 * Removed title from readme --------- Co-authored-by: joliverMI Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis --- keyboards/pmk/posey_split/config.h | 18 +++ keyboards/pmk/posey_split/v4/info.json | 145 ++++++++++++++++++ .../posey_split/v4/keymaps/default/keymap.c | 73 +++++++++ .../pmk/posey_split/v4/keymaps/via/keymap.c | 73 +++++++++ .../pmk/posey_split/v4/keymaps/via/rules.mk | 1 + keyboards/pmk/posey_split/v4/readme.md | 30 ++++ keyboards/pmk/posey_split/v4/rules.mk | 1 + keyboards/pmk/posey_split/v5/info.json | 145 ++++++++++++++++++ .../posey_split/v5/keymaps/default/keymap.c | 73 +++++++++ .../pmk/posey_split/v5/keymaps/via/keymap.c | 73 +++++++++ .../pmk/posey_split/v5/keymaps/via/rules.mk | 1 + keyboards/pmk/posey_split/v5/readme.md | 30 ++++ keyboards/pmk/posey_split/v5/rules.mk | 1 + 13 files changed, 664 insertions(+) create mode 100644 keyboards/pmk/posey_split/config.h create mode 100644 keyboards/pmk/posey_split/v4/info.json create mode 100644 keyboards/pmk/posey_split/v4/keymaps/default/keymap.c create mode 100644 keyboards/pmk/posey_split/v4/keymaps/via/keymap.c create mode 100644 keyboards/pmk/posey_split/v4/keymaps/via/rules.mk create mode 100644 keyboards/pmk/posey_split/v4/readme.md create mode 100644 keyboards/pmk/posey_split/v4/rules.mk create mode 100644 keyboards/pmk/posey_split/v5/info.json create mode 100644 keyboards/pmk/posey_split/v5/keymaps/default/keymap.c create mode 100644 keyboards/pmk/posey_split/v5/keymaps/via/keymap.c create mode 100644 keyboards/pmk/posey_split/v5/keymaps/via/rules.mk create mode 100644 keyboards/pmk/posey_split/v5/readme.md create mode 100644 keyboards/pmk/posey_split/v5/rules.mk diff --git a/keyboards/pmk/posey_split/config.h b/keyboards/pmk/posey_split/config.h new file mode 100644 index 00000000000..f115e5fc2c6 --- /dev/null +++ b/keyboards/pmk/posey_split/config.h @@ -0,0 +1,18 @@ +// Copyright 2023 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/*Split keyboard configuration*/ +// Hardware Settings +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN GP1 +#define SERIAL_USART_RX_PIN GP0 + +// Communication Settings +#define FORCED_SYNC_THROTTLE_MS 1000 +#define SPLIT_MAX_CONNECTION_ERRORS 5 +#define SPLIT_CONNECTION_CHECK_TIMEOUT 2000 + +// RGB Configuration +#define RGBLIGHT_EFFECT_BREATHE_CENTER 2.0 //1.0 to 2.7 \ No newline at end of file diff --git a/keyboards/pmk/posey_split/v4/info.json b/keyboards/pmk/posey_split/v4/info.json new file mode 100644 index 00000000000..016c4d7122e --- /dev/null +++ b/keyboards/pmk/posey_split/v4/info.json @@ -0,0 +1,145 @@ +{ + "manufacturer": "Posey's Mechanical Keyboards", + "keyboard_name": "posey_split_v4", + "maintainer": "joliverMI", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "rgblight": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], + "rows": ["GP10", "GP11", "GP12", "GP13", "GP14", "GP15"] + }, + "processor": "RP2040", + "ws2812": { + "pin": "GP17", + "driver": "vendor" + }, + "rgblight": { + "animations": { + "breathing": true + }, + "layers": { + "enabled": true, + "max": 4 + }, + "led_count": 1, + "sleep": true, + "split": true, + "split_count": [1, 0] + }, + "split": { + "enabled": true, + "handedness": { + "pin": "GP18" + } + }, + "tags": ["split"], + "url": "poseysmechanicalkeyboards.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x0003", + "vid": "0x4A4F" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0}, + {"matrix": [0, 1], "label": "LED", "x": 1, "y": 0}, + {"matrix": [0, 2], "label": "F1", "x": 2, "y": 0}, + {"matrix": [0, 3], "label": "F2", "x": 3, "y": 0}, + {"matrix": [0, 4], "label": "F3", "x": 4, "y": 0}, + {"matrix": [0, 5], "label": "F4", "x": 5, "y": 0}, + {"matrix": [0, 6], "label": "F5", "x": 6, "y": 0}, + {"matrix": [0, 7], "label": "F6", "x": 7, "y": 0}, + {"matrix": [6, 0], "label": "Layer", "x": 9.294, "y": 0}, + {"matrix": [6, 1], "label": "F7", "x": 10.294, "y": 0}, + {"matrix": [6, 2], "label": "F8", "x": 11.294, "y": 0}, + {"matrix": [6, 3], "label": "F9", "x": 12.294, "y": 0}, + {"matrix": [6, 4], "label": "F10", "x": 13.294, "y": 0}, + {"matrix": [6, 5], "label": "F11", "x": 14.294, "y": 0}, + {"matrix": [6, 6], "label": "Pause", "x": 15.294, "y": 0}, + {"matrix": [6, 7], "label": "Delete", "x": 16.294, "y": 0}, + {"matrix": [1, 0], "label": "~", "x": 0, "y": 1}, + {"matrix": [1, 1], "label": "1", "x": 1, "y": 1}, + {"matrix": [1, 2], "label": "2", "x": 2, "y": 1}, + {"matrix": [1, 3], "label": "3", "x": 3, "y": 1}, + {"matrix": [1, 4], "label": "4", "x": 4, "y": 1}, + {"matrix": [1, 5], "label": "5", "x": 5, "y": 1}, + {"matrix": [1, 6], "label": "6", "x": 6, "y": 1}, + {"matrix": [1, 7], "label": "7", "x": 7, "y": 1}, + {"matrix": [7, 0], "label": "&", "x": 9.294, "y": 1}, + {"matrix": [7, 1], "label": "*", "x": 10.294, "y": 1}, + {"matrix": [7, 2], "label": "(", "x": 11.294, "y": 1}, + {"matrix": [7, 3], "label": ")", "x": 12.294, "y": 1}, + {"matrix": [7, 4], "label": "_", "x": 13.294, "y": 1}, + {"matrix": [7, 5], "label": "+", "x": 14.294, "y": 1}, + {"matrix": [7, 6], "label": "Backspace", "x": 15.294, "y": 1, "w": 2}, + {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2}, + {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2}, + {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2}, + {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2}, + {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2}, + {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2}, + {"matrix": [8, 0], "label": "Y", "x": 8.794, "y": 2}, + {"matrix": [8, 1], "label": "U", "x": 9.794, "y": 2}, + {"matrix": [8, 2], "label": "I", "x": 10.794, "y": 2}, + {"matrix": [8, 3], "label": "O", "x": 11.794, "y": 2}, + {"matrix": [8, 4], "label": "P", "x": 12.794, "y": 2}, + {"matrix": [8, 5], "label": "{", "x": 13.794, "y": 2}, + {"matrix": [8, 6], "label": "}", "x": 14.794, "y": 2}, + {"matrix": [8, 7], "label": "|", "x": 15.794, "y": 2, "w": 1.5}, + {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3}, + {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3}, + {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3}, + {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3}, + {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3}, + {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3}, + {"matrix": [9, 0], "label": "H", "x": 9.044, "y": 3}, + {"matrix": [9, 1], "label": "J", "x": 10.044, "y": 3}, + {"matrix": [9, 2], "label": "K", "x": 11.044, "y": 3}, + {"matrix": [9, 3], "label": "L", "x": 12.044, "y": 3}, + {"matrix": [9, 4], "label": ":", "x": 13.044, "y": 3}, + {"matrix": [9, 5], "label": "\"", "x": 14.044, "y": 3}, + {"matrix": [9, 6], "label": "Enter", "x": 15.044, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4}, + {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4}, + {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4}, + {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4}, + {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4}, + {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4}, + {"matrix": [10, 0], "label": "B", "x": 8.544, "y": 4}, + {"matrix": [10, 1], "label": "N", "x": 9.544, "y": 4}, + {"matrix": [10, 2], "label": "M", "x": 10.544, "y": 4}, + {"matrix": [10, 3], "label": "<", "x": 11.544, "y": 4}, + {"matrix": [10, 4], "label": ">", "x": 12.544, "y": 4}, + {"matrix": [10, 5], "label": "?", "x": 13.544, "y": 4}, + {"matrix": [10, 6], "label": "Shift", "x": 14.544, "y": 4, "w": 2.75}, + {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "label": "L2", "x": 3.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "label": "Space", "x": 5.5, "y": 5, "w": 2.75}, + {"matrix": [11, 1], "label": "Space", "x": 8.794, "y": 5, "w": 2.25}, + {"matrix": [11, 2], "label": "Space", "x": 11.044, "y": 5, "w": 1.25}, + {"matrix": [11, 3], "label": "L2", "x": 12.294, "y": 5, "w": 1.25}, + {"matrix": [11, 4], "label": "Win", "x": 13.544, "y": 5, "w": 1.25}, + {"matrix": [11, 5], "label": "Menu", "x": 14.794, "y": 5, "w": 1.25}, + {"matrix": [11, 7], "label": "Ctrl", "x": 16.044, "y": 5, "w": 1.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/pmk/posey_split/v4/keymaps/default/keymap.c b/keyboards/pmk/posey_split/v4/keymaps/default/keymap.c new file mode 100644 index 00000000000..3a607c0296c --- /dev/null +++ b/keyboards/pmk/posey_split/v4/keymaps/default/keymap.c @@ -0,0 +1,73 @@ +// Copyright 2024 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum my_layers { + _QWERTY, + _NAV, + _SYMB, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │ │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16 + * ├───┼───┼───┼───┼───┼───┼───┴───┤ ├───┴───┼───┼───┼───┼───┼───┴───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ │7 │8 │ 9 │ 0 │ - │ = │ Backsp│ 15 + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ 15 + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ │ H │J │ K │ L │ ; │ ' │ Enter │ 14 + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ │ B │ N │ M │ , │ . │ / │ Shift │ 14 + * ├────┬───┴┬──┴┬──┴───┴┬──┴───┴───┤ └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤ + * │Ctrl│GUI │L2 │Alt │ │ │ | L3 │ Alt│ GUI│Menu│Ctrl│ 11 + * └────┴────┴───┴───────┴──────────┘ └────────┴────┴────┴────┴────┴────┘ + */ + [_QWERTY] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, MO(_SYMB), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BACKSPACE, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────────────┤ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_LCTL, KC_LGUI, MO(_NAV), KC_LALT, KC_SPC, KC_SPC, MO(_NAV), KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_NAV] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_SYMB] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_TRNS, KC_TRNS, KC_F12, KC_F13, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ) +}; diff --git a/keyboards/pmk/posey_split/v4/keymaps/via/keymap.c b/keyboards/pmk/posey_split/v4/keymaps/via/keymap.c new file mode 100644 index 00000000000..ffe726ead71 --- /dev/null +++ b/keyboards/pmk/posey_split/v4/keymaps/via/keymap.c @@ -0,0 +1,73 @@ +// Copyright 2024 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum my_layers { + _QWERTY, + _NAV, + _SYMB, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │ │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16 + * ├───┼───┼───┼───┼───┼───┼───┴───┤ ├───┴───┼───┼───┼───┼───┼───┴───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ │7 │8 │ 9 │ 0 │ - │ = │ Backsp│ 15 + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ 15 + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ │ H │J │ K │ L │ ; │ ' │ Enter │ 14 + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ │ B │ N │ M │ , │ . │ / │ Shift │ 14 + * ├────┬───┴┬──┴┬──┴───┴┬──┴───┴───┤ └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤ + * │Ctrl│GUI │L2 │Alt │ │ │ | L3 │ Alt│ GUI│Menu│Ctrl│ 11 + * └────┴────┴───┴───────┴──────────┘ └────────┴────┴────┴────┴────┴────┘ + */ + [_QWERTY] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, MO(_SYMB), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BACKSPACE, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────────────┤ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_LCTL, KC_LGUI, MO(_NAV), KC_LALT, KC_SPC, KC_SPC, MO(_NAV), KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_NAV] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_SYMB] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_TRNS, KC_TRNS, KC_F12, KC_F13, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ) +}; diff --git a/keyboards/pmk/posey_split/v4/keymaps/via/rules.mk b/keyboards/pmk/posey_split/v4/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/pmk/posey_split/v4/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/pmk/posey_split/v4/readme.md b/keyboards/pmk/posey_split/v4/readme.md new file mode 100644 index 00000000000..c4e15656206 --- /dev/null +++ b/keyboards/pmk/posey_split/v4/readme.md @@ -0,0 +1,30 @@ +# posey_split_v4 + +![posey_split_v4](https://i.imgur.com/g3yf6alh.png) + +The Posey split keyboard was designed from the gournd up for gaming. By pushing the left half of your split keyboard out of the way, you'll be able to game with better posture and increase mouse movement. PMK's have additional keys on the right half to make sure you don't need to reach for your other half while gaming. + +Version Changes from v4: +-Changed bottom row on the left half to use standard modifier key sizes + +* Keyboard Maintainer: [Javier Oliver](https://github.com/joliverMI) +* Hardware Supported: posey_split_v4, blizz_sorc_v1 and logic_module_v1 +* Hardware Availability: poseysmechanicalkeyboards.com + +Make example for this keyboard (after setting up your build environment): + + make pmk/posey_split/v4:default + +Flashing example for this keyboard: + + make pmk/posey_split/v4:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key Escape and plug in the keyboard +* **Physical reset button**: Hold the button on the bottom of the keyboard while you plug in the USB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/pmk/posey_split/v4/rules.mk b/keyboards/pmk/posey_split/v4/rules.mk new file mode 100644 index 00000000000..743228e94b6 --- /dev/null +++ b/keyboards/pmk/posey_split/v4/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor \ No newline at end of file diff --git a/keyboards/pmk/posey_split/v5/info.json b/keyboards/pmk/posey_split/v5/info.json new file mode 100644 index 00000000000..9ef7d0af022 --- /dev/null +++ b/keyboards/pmk/posey_split/v5/info.json @@ -0,0 +1,145 @@ +{ + "manufacturer": "Posey's Mechanical Keyboards", + "keyboard_name": "posey_split_v5", + "maintainer": "joliverMI", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "rgblight": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], + "rows": ["GP10", "GP11", "GP12", "GP13", "GP14", "GP15"] + }, + "processor": "RP2040", + "ws2812": { + "pin": "GP17", + "driver": "vendor" + }, + "rgblight": { + "animations": { + "breathing": true + }, + "layers": { + "enabled": true, + "max": 4 + }, + "led_count": 1, + "sleep": true, + "split": true, + "split_count": [1, 0] + }, + "split": { + "enabled": true, + "handedness": { + "pin": "GP18" + } + }, + "tags": ["split"], + "url": "poseysmechanicalkeyboards.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x0005", + "vid": "0x4A4F" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0}, + {"matrix": [0, 1], "label": "LED", "x": 1, "y": 0}, + {"matrix": [0, 2], "label": "F1", "x": 2, "y": 0}, + {"matrix": [0, 3], "label": "F2", "x": 3, "y": 0}, + {"matrix": [0, 4], "label": "F3", "x": 4, "y": 0}, + {"matrix": [0, 5], "label": "F4", "x": 5, "y": 0}, + {"matrix": [0, 6], "label": "F5", "x": 6, "y": 0}, + {"matrix": [0, 7], "label": "F6", "x": 7, "y": 0}, + {"matrix": [6, 0], "label": "Layer", "x": 9.294, "y": 0}, + {"matrix": [6, 1], "label": "F7", "x": 10.294, "y": 0}, + {"matrix": [6, 2], "label": "F8", "x": 11.294, "y": 0}, + {"matrix": [6, 3], "label": "F9", "x": 12.294, "y": 0}, + {"matrix": [6, 4], "label": "F10", "x": 13.294, "y": 0}, + {"matrix": [6, 5], "label": "F11", "x": 14.294, "y": 0}, + {"matrix": [6, 6], "label": "Pause", "x": 15.294, "y": 0}, + {"matrix": [6, 7], "label": "Delete", "x": 16.294, "y": 0}, + {"matrix": [1, 0], "label": "~", "x": 0, "y": 1}, + {"matrix": [1, 1], "label": "1", "x": 1, "y": 1}, + {"matrix": [1, 2], "label": "2", "x": 2, "y": 1}, + {"matrix": [1, 3], "label": "3", "x": 3, "y": 1}, + {"matrix": [1, 4], "label": "4", "x": 4, "y": 1}, + {"matrix": [1, 5], "label": "5", "x": 5, "y": 1}, + {"matrix": [1, 6], "label": "6", "x": 6, "y": 1}, + {"matrix": [1, 7], "label": "7", "x": 7, "y": 1}, + {"matrix": [7, 0], "label": "&", "x": 9.294, "y": 1}, + {"matrix": [7, 1], "label": "*", "x": 10.294, "y": 1}, + {"matrix": [7, 2], "label": "(", "x": 11.294, "y": 1}, + {"matrix": [7, 3], "label": ")", "x": 12.294, "y": 1}, + {"matrix": [7, 4], "label": "_", "x": 13.294, "y": 1}, + {"matrix": [7, 5], "label": "+", "x": 14.294, "y": 1}, + {"matrix": [7, 6], "label": "Backspace", "x": 15.294, "y": 1, "w": 2}, + {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2}, + {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2}, + {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2}, + {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2}, + {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2}, + {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2}, + {"matrix": [8, 0], "label": "Y", "x": 8.794, "y": 2}, + {"matrix": [8, 1], "label": "U", "x": 9.794, "y": 2}, + {"matrix": [8, 2], "label": "I", "x": 10.794, "y": 2}, + {"matrix": [8, 3], "label": "O", "x": 11.794, "y": 2}, + {"matrix": [8, 4], "label": "P", "x": 12.794, "y": 2}, + {"matrix": [8, 5], "label": "{", "x": 13.794, "y": 2}, + {"matrix": [8, 6], "label": "}", "x": 14.794, "y": 2}, + {"matrix": [8, 7], "label": "|", "x": 15.794, "y": 2, "w": 1.5}, + {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3}, + {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3}, + {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3}, + {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3}, + {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3}, + {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3}, + {"matrix": [9, 0], "label": "H", "x": 9.044, "y": 3}, + {"matrix": [9, 1], "label": "J", "x": 10.044, "y": 3}, + {"matrix": [9, 2], "label": "K", "x": 11.044, "y": 3}, + {"matrix": [9, 3], "label": "L", "x": 12.044, "y": 3}, + {"matrix": [9, 4], "label": ":", "x": 13.044, "y": 3}, + {"matrix": [9, 5], "label": "\"", "x": 14.044, "y": 3}, + {"matrix": [9, 6], "label": "Enter", "x": 15.044, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4}, + {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4}, + {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4}, + {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4}, + {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4}, + {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4}, + {"matrix": [10, 0], "label": "B", "x": 8.544, "y": 4}, + {"matrix": [10, 1], "label": "N", "x": 9.544, "y": 4}, + {"matrix": [10, 2], "label": "M", "x": 10.544, "y": 4}, + {"matrix": [10, 3], "label": "<", "x": 11.544, "y": 4}, + {"matrix": [10, 4], "label": ">", "x": 12.544, "y": 4}, + {"matrix": [10, 5], "label": "?", "x": 13.544, "y": 4}, + {"matrix": [10, 6], "label": "Shift", "x": 14.544, "y": 4, "w": 2.75}, + {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "label": "Layer", "x": 2.5, "y": 5}, + {"matrix": [5, 3], "label": "Alt", "x": 3.5, "y": 5, "w": 2}, + {"matrix": [5, 6], "label": "Space", "x": 5.5, "y": 5, "w": 2.75}, + {"matrix": [11, 1], "label": "Space", "x": 8.794, "y": 5, "w": 2.25}, + {"matrix": [11, 2], "label": "Arrows", "x": 11.044, "y": 5, "w": 1.25}, + {"matrix": [11, 3], "label": "Ctrl", "x": 12.294, "y": 5, "w": 1.25}, + {"matrix": [11, 4], "label": "Win", "x": 13.544, "y": 5, "w": 1.25}, + {"matrix": [11, 5], "label": "Menu", "x": 14.794, "y": 5, "w": 1.25}, + {"matrix": [11, 7], "label": "Ctrl", "x": 16.044, "y": 5, "w": 1.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/pmk/posey_split/v5/keymaps/default/keymap.c b/keyboards/pmk/posey_split/v5/keymaps/default/keymap.c new file mode 100644 index 00000000000..fa7fd018a01 --- /dev/null +++ b/keyboards/pmk/posey_split/v5/keymaps/default/keymap.c @@ -0,0 +1,73 @@ +// Copyright 2024 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum my_layers { + _QWERTY, + _NAV, + _SYMB, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │ │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16 + * ├───┼───┼───┼───┼───┼───┼───┴───┤ ├───┴───┼───┼───┼───┼───┼───┴───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ │7 │8 │ 9 │ 0 │ - │ = │ Backsp│ 15 + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ 15 + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ │ H │J │ K │ L │ ; │ ' │ Enter │ 14 + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ │ B │ N │ M │ , │ . │ / │ Shift │ 14 + * ├────┬───┴┬──┴─┬─┴───┴┬──┴───┴───┤ └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤ + * │Ctrl│GUI │Alt │L2 │ │ │ | L3 │ Alt│ GUI│Menu│Ctrl│ 11 + * └────┴────┴────┴──────┴──────────┘ └────────┴────┴────┴────┴────┴────┘ + */ + [_QWERTY] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, MO(_SYMB), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_PAUS, KC_DEL, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BACKSPACE, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────────────┤ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_LCTL, KC_LGUI, KC_LALT, MO(_NAV), KC_SPC, KC_SPC, MO(_NAV), KC_RGUI, KC_LEFT, KC_DOWN,KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_NAV] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS,KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_SYMB] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_TRNS, KC_TRNS, KC_F12, KC_F13, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ) +}; diff --git a/keyboards/pmk/posey_split/v5/keymaps/via/keymap.c b/keyboards/pmk/posey_split/v5/keymaps/via/keymap.c new file mode 100644 index 00000000000..fa7fd018a01 --- /dev/null +++ b/keyboards/pmk/posey_split/v5/keymaps/via/keymap.c @@ -0,0 +1,73 @@ +// Copyright 2024 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum my_layers { + _QWERTY, + _NAV, + _SYMB, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │ │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16 + * ├───┼───┼───┼───┼───┼───┼───┴───┤ ├───┴───┼───┼───┼───┼───┼───┴───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ │7 │8 │ 9 │ 0 │ - │ = │ Backsp│ 15 + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ 15 + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ │ H │J │ K │ L │ ; │ ' │ Enter │ 14 + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ │ B │ N │ M │ , │ . │ / │ Shift │ 14 + * ├────┬───┴┬──┴─┬─┴───┴┬──┴───┴───┤ └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤ + * │Ctrl│GUI │Alt │L2 │ │ │ | L3 │ Alt│ GUI│Menu│Ctrl│ 11 + * └────┴────┴────┴──────┴──────────┘ └────────┴────┴────┴────┴────┴────┘ + */ + [_QWERTY] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, MO(_SYMB), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_PAUS, KC_DEL, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BACKSPACE, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────────────┤ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_LCTL, KC_LGUI, KC_LALT, MO(_NAV), KC_SPC, KC_SPC, MO(_NAV), KC_RGUI, KC_LEFT, KC_DOWN,KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_NAV] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS,KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ), + [_SYMB] = LAYOUT( + // ┌────────┐ ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐ + KC_ESC, KC_TRNS, KC_TRNS, KC_F12, KC_F13, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM, + //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_UP, + //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP + //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘ + ) +}; diff --git a/keyboards/pmk/posey_split/v5/keymaps/via/rules.mk b/keyboards/pmk/posey_split/v5/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/pmk/posey_split/v5/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/pmk/posey_split/v5/readme.md b/keyboards/pmk/posey_split/v5/readme.md new file mode 100644 index 00000000000..57fbf642c3d --- /dev/null +++ b/keyboards/pmk/posey_split/v5/readme.md @@ -0,0 +1,30 @@ +# posey_split_v5 + +![posey_split_v5](https://i.imgur.com/g3yf6al.png) + +The Posey split keyboard was designed from the gournd up for gaming. By pushing the left half of your split keyboard out of the way, you'll be able to game with better posture and increase mouse movement. PMK's have additional keys on the right half to make sure you don't need to reach for your other half while gaming. + +Version Changes from v4: +-Changed bottom row on the left half to use standard modifier key sizes + +* Keyboard Maintainer: [Javier Oliver](https://github.com/joliverMI) +* Hardware Supported: posey_split_v5 and logic_module_v1 +* Hardware Availability: poseysmechanicalkeyboards.com + +Make example for this keyboard (after setting up your build environment): + + make pmk/posey_split/v5:default + +Flashing example for this keyboard: + + make pmk/posey_split/v5:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key Escape and plug in the keyboard +* **Physical reset button**: Hold the button on the bottom of the keyboard while you plug in the USB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/pmk/posey_split/v5/rules.mk b/keyboards/pmk/posey_split/v5/rules.mk new file mode 100644 index 00000000000..743228e94b6 --- /dev/null +++ b/keyboards/pmk/posey_split/v5/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor \ No newline at end of file From 53f46893ce9682513ec291a324977eac5b9069d7 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Wed, 20 Mar 2024 09:09:29 -0600 Subject: [PATCH 20/29] Updates to PR Checklist (#23318) --- docs/pr_checklist.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md index 6a0ae315976..0d503ab4177 100644 --- a/docs/pr_checklist.md +++ b/docs/pr_checklist.md @@ -9,6 +9,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr - PR should be submitted using a non-`master` branch on the source repository - this does not mean you target a different branch for your PR, rather that you're not working out of your own master branch - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](newbs_git_using_your_master_branch.md) page after merging -- (end of this document will contain the contents of the message) + - Note, frequently merging upstream with your branch is not needed and is discouraged. Valid reason for updating your branch may be resolving merge conflicts and pulling in new changes relevant to your PR. - PRs should contain the smallest amount of modifications required for a single change to the codebase - multiple keyboards at the same time is not acceptable - **the smaller the PR, the higher likelihood of a quicker review, higher likelihood of quicker merge, and less chance of conflicts** @@ -43,10 +44,10 @@ If there are any inconsistencies with these recommendations, you're best off [cr - PRs for vendor specific keymaps will be permitted. The naming convention for these should be `default_${vendor}`, `via_${vendor}` i.e. `via_clueboard`. - vendor specific keymaps do not necessarily need to be "vanilla" and can be more richly featured than `default` or `via` stock keymaps. -- #include QMK_KEYBOARD_H preferred to including specific board files +- `#include QMK_KEYBOARD_H` preferred to including specific board files - prefer layer enums to #defines -- custom keycode enums must have first entry = SAFE_RANGE -- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap +- custom keycode enums must have first entry = `QK_USER` +- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap. Spaces are preferred to tabs ## Keyboard PRs @@ -81,6 +82,8 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard - Encoder Configuration - Bootmagic Configuration - LED Indicator Configuration + - RGB Light Configuration + - RGB Matrix Configuration - Run `qmk format-json` on this file before submitting your PR. Be sure to append the `-i` flag to directly modify the file, or paste the outputted code into the file. - `readme.md` - must follow the [template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md) @@ -90,8 +93,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard - a picture about the keyboard and preferably about the PCB, too - images are not to be placed in the `qmk_firmware` repository - images should be uploaded to an external image hosting service, such as [imgur](https://imgur.com/). - - if imgur is used, images should be resized appropriately: append "h" to the image url i.e. [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) becomes [https://i.imgur.com/vqgE7Ok**h**.jpg](https://i.imgur.com/vqgE7Okh.jpg) - - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Okh.jpg](https://i.imgur.com/vqgE7Okh.jpg) when using imgur + - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) when using imgur - `rules.mk` - removed `MIDI_ENABLE`, `FAUXCLICKY_ENABLE` and `HD44780_ENABLE` - modified `# Enable Bluetooth with the Adafruit EZ-Key HID` -> `# Enable Bluetooth` @@ -204,7 +206,7 @@ Additionally, PR reviews are something that is done in our free time. We are not ## Example GPLv2 Header ``` -/* Copyright 2021 Your Name (@yourgithub) +/* Copyright 2024 Your Name (@yourgithub) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -224,6 +226,6 @@ Additionally, PR reviews are something that is done in our free time. We are not Or, optionally, using [SPDX identifier](https://spdx.org/licenses/) instead: ``` -// Copyright 2021 Your Name (@yourgithub) +// Copyright 2024 Your Name (@yourgithub) // SPDX-License-Identifier: GPL-2.0-or-later ``` From a9e9c9acc5dfcd5a98ac97e6a41d34cda04e0859 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 20 Mar 2024 19:51:01 +0000 Subject: [PATCH 21/29] Fix invalid use of stemcell converter (#23317) --- .../bastardkb/charybdis/3x5/v2/stemcell/config.h | 7 +++---- .../bastardkb/charybdis/3x5/v2/stemcell/info.json | 11 +++++------ .../bastardkb/charybdis/3x5/v2/stemcell/rules.mk | 2 -- .../bastardkb/charybdis/3x6/v2/stemcell/config.h | 7 +++---- .../bastardkb/charybdis/3x6/v2/stemcell/info.json | 11 +++++------ .../bastardkb/charybdis/3x6/v2/stemcell/rules.mk | 2 -- .../bastardkb/charybdis/4x6/v2/stemcell/config.h | 7 +++---- .../bastardkb/charybdis/4x6/v2/stemcell/info.json | 11 +++++------ .../bastardkb/charybdis/4x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/stemcell/info.json | 11 +++++------ keyboards/bastardkb/scylla/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/stemcell/info.json | 11 +++++------ keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/stemcell/info.json | 11 +++++------ keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk | 2 -- 15 files changed, 39 insertions(+), 60 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 6aa20712f67..50fc030402b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h @@ -39,15 +39,14 @@ /* SPI config for pmw3360 sensor. */ #define SPI_DRIVER SPID1 -#define SPI_SCK_PIN B1 +#define SPI_SCK_PIN A5 #define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PIN A7 #define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN B3 +#define SPI_MISO_PIN A6 #define SPI_MISO_PAL_MODE 5 /* PMW3360 settings. */ -#define A1 PAL_LINE(GPIOA, 1) #define POINTING_DEVICE_CS_PIN A1 #define PMW3360_CS_MODE 3 #define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index c119df524c3..af74a299be7 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 4436426f303..4bd570ddd8c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 6aa20712f67..50fc030402b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h @@ -39,15 +39,14 @@ /* SPI config for pmw3360 sensor. */ #define SPI_DRIVER SPID1 -#define SPI_SCK_PIN B1 +#define SPI_SCK_PIN A5 #define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PIN A7 #define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN B3 +#define SPI_MISO_PIN A6 #define SPI_MISO_PAL_MODE 5 /* PMW3360 settings. */ -#define A1 PAL_LINE(GPIOA, 1) #define POINTING_DEVICE_CS_PIN A1 #define PMW3360_CS_MODE 3 #define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 85b66277cf2..4309fd5ee30 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 4436426f303..4bd570ddd8c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index 6aa20712f67..50fc030402b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -39,15 +39,14 @@ /* SPI config for pmw3360 sensor. */ #define SPI_DRIVER SPID1 -#define SPI_SCK_PIN B1 +#define SPI_SCK_PIN A5 #define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PIN A7 #define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN B3 +#define SPI_MISO_PIN A6 #define SPI_MISO_PAL_MODE 5 /* PMW3360 settings. */ -#define A1 PAL_LINE(GPIOA, 1) #define POINTING_DEVICE_CS_PIN A1 #define PMW3360_CS_MODE 3 #define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index cfae56715f1..8060c758b88 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F4", "F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B10", "B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 4436426f303..4bd570ddd8c 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index d463418cf19..598ca9d9ee0 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F4", "F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B10", "B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 8dda103d07a..8256842e21d 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index b44d64a47aa..b384da9dbdc 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index 8dda103d07a..8256842e21d 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index a75db584e79..f62427438b7 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -7,20 +7,19 @@ "driver": "ws2812" }, "ws2812": { - "pin": "D3", + "pin": "A2", "driver": "pwm" }, "build": { "debounce_type": "asym_eager_defer_pk" }, "matrix_pins": { - "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], - "rows": ["F7", "C6", "D4", "B5"] + "cols": ["B1", "B2", "A4", "B4", "B5", "B8"], + "rows": ["B0", "B3", "A15", "B9"] }, "diode_direction": "ROW2COL", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "A3" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu" + "development_board": "stemcell" } diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 8dda103d07a..8256842e21d 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,5 +1,3 @@ -CONVERT_TO = stemcell - # Build Options # change yes to no to disable # From 977f667da93754a4471423f321dfeb7389269445 Mon Sep 17 00:00:00 2001 From: zlabkeeb <160311066+zlabkeeb@users.noreply.github.com> Date: Thu, 21 Mar 2024 03:32:04 +0700 Subject: [PATCH 22/29] Add Macropad 6Pad (#23099) --- keyboards/zlabkeeb/6pad/info.json | 65 +++++++++++++++++++ .../zlabkeeb/6pad/keymaps/default/keymap.c | 50 ++++++++++++++ .../zlabkeeb/6pad/keymaps/default/rules.mk | 1 + keyboards/zlabkeeb/6pad/keymaps/via/keymap.c | 38 +++++++++++ keyboards/zlabkeeb/6pad/keymaps/via/rules.mk | 2 + keyboards/zlabkeeb/6pad/readme.md | 26 ++++++++ keyboards/zlabkeeb/6pad/rules.mk | 1 + 7 files changed, 183 insertions(+) create mode 100644 keyboards/zlabkeeb/6pad/info.json create mode 100644 keyboards/zlabkeeb/6pad/keymaps/default/keymap.c create mode 100644 keyboards/zlabkeeb/6pad/keymaps/default/rules.mk create mode 100644 keyboards/zlabkeeb/6pad/keymaps/via/keymap.c create mode 100644 keyboards/zlabkeeb/6pad/keymaps/via/rules.mk create mode 100644 keyboards/zlabkeeb/6pad/readme.md create mode 100644 keyboards/zlabkeeb/6pad/rules.mk diff --git a/keyboards/zlabkeeb/6pad/info.json b/keyboards/zlabkeeb/6pad/info.json new file mode 100644 index 00000000000..cd37d4ca023 --- /dev/null +++ b/keyboards/zlabkeeb/6pad/info.json @@ -0,0 +1,65 @@ +{ + "keyboard_name": "ZLABKEEB 6PAD", + "manufacturer": "zlabkeeb", + "maintainer": "zlabkeeb", + "development_board": "promicro", + "features": { + "bootmagic": true, + "extrakey": true, + "encoder": true, + "mousekey": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "url": "https://github.com/zlabkeeb", + "usb": { + "device_version": "1.0.0", + "vid": "0x4154", + "pid": "0x7A77" + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 4, + "max_brightness": 180, + "saturation_steps": 8, + "sleep": true + }, + "ws2812": { + "pin": "B6" + }, + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B5"} + ] + }, + "matrix_pins": { + "direct": [ + ["D1", "D0", "D4"], + ["C6", "D7", "E6"] + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]} + ] + } + } +} diff --git a/keyboards/zlabkeeb/6pad/keymaps/default/keymap.c b/keyboards/zlabkeeb/6pad/keymaps/default/keymap.c new file mode 100644 index 00000000000..d0048cd88df --- /dev/null +++ b/keyboards/zlabkeeb/6pad/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +/* +Copyright 2024 zlabkeeb (zlabkeeb@gmail.com) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌─────────┌─────────┌─────────┐ + * │ 1 │ layer 1 │ 3 │ + * ├─────────┼─────────┼─────────| + * │ 4 │ 5 │ 6 | + * ├─────────┼─────────┼─────────┘ + */ + [0] = LAYOUT( + KC_1, TO(1), KC_2, + KC_3, KC_4, KC_5 + ), + /* + * ┌─────────┌─────────┌─────────┐ + * │ A │ layer O │ B │ + * ├─────────┼─────────┼─────────| + * │ C │ D │ E | + * ├─────────┼─────────┼─────────┘ + */ + [1] = LAYOUT( + KC_A, TO(0), KC_B, + KC_C, KC_D, KC_E + ) +}; + +#if defined (ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP)} +}; +#endif diff --git a/keyboards/zlabkeeb/6pad/keymaps/default/rules.mk b/keyboards/zlabkeeb/6pad/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/zlabkeeb/6pad/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/zlabkeeb/6pad/keymaps/via/keymap.c b/keyboards/zlabkeeb/6pad/keymaps/via/keymap.c new file mode 100644 index 00000000000..d958bfb5bdf --- /dev/null +++ b/keyboards/zlabkeeb/6pad/keymaps/via/keymap.c @@ -0,0 +1,38 @@ +/* +Copyright 2024 zlabkeeb (zlabkeeb@gmail.com) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌─────────┌─────────┌─────────┐ + * │ 1 │ 2 │ 3 │ + * ├─────────┼─────────┼─────────| + * │ 4 │ 5 │ 6 | + * ├─────────┼─────────┼─────────┘ + */ + [0] = LAYOUT( + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ) +}; + +#if defined (ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} +}; +#endif diff --git a/keyboards/zlabkeeb/6pad/keymaps/via/rules.mk b/keyboards/zlabkeeb/6pad/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/zlabkeeb/6pad/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/zlabkeeb/6pad/readme.md b/keyboards/zlabkeeb/6pad/readme.md new file mode 100644 index 00000000000..9470ee1d6d9 --- /dev/null +++ b/keyboards/zlabkeeb/6pad/readme.md @@ -0,0 +1,26 @@ +# 6PAD + +![6PAD](https://i.imgur.com/yt3dKCBh.jpeg) + +6PAD is a Simple Yet Elegant Macropad, 5 Keys & Single Rotary Encoder, Designed And Manufactured In INDONESIA. + +- Support RGB light UnderGlow +- Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb) +- Hardware Supported: 6Pad PCB, Promicro +- Hardware Availability: (INDONESIA Only) Will be available at [Tokopedia](https://www.tokopedia.com/zahranetid) + +Make example for this keyboard (after setting up your build environment): + + make zlabkeeb/6pad:default + +Flashing example for this keyboard: + + make zlabkeeb/6pad:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 1 way: + +- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead diff --git a/keyboards/zlabkeeb/6pad/rules.mk b/keyboards/zlabkeeb/6pad/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/zlabkeeb/6pad/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 34374d2e2e4f5b827c8a0402b0cc8f177431e25a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 20 Mar 2024 22:23:58 +0000 Subject: [PATCH 23/29] Assume only 32u4 boards can run 'promicro' converters (#23312) --- builddefs/converters.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/builddefs/converters.mk b/builddefs/converters.mk index 96c8656b253..3e77a070f2f 100644 --- a/builddefs/converters.mk +++ b/builddefs/converters.mk @@ -5,8 +5,10 @@ ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),) $(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.) endif -# TODO: opt in rather than assume everything uses a pro micro -PIN_COMPATIBLE ?= promicro +ifneq (,$(filter $(MCU),atmega32u4)) + # TODO: opt in rather than assume everything uses a pro micro + PIN_COMPATIBLE ?= promicro +endif # Remove whitespace from any rule.mk provided vars # - env cannot be overwritten but cannot have whitespace anyway @@ -16,6 +18,10 @@ ifneq ($(CONVERT_TO),) # stash so we can overwrite env provided vars if needed ACTIVE_CONVERTER=$(CONVERT_TO) + ifeq ($(PIN_COMPATIBLE),) + $(call CATASTROPHIC_ERROR,Converting to '$(CONVERT_TO)' not possible!) + endif + # glob to search each platfrorm and/or check for valid converter CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/) ifeq ($(CONVERTER),) From d5374b7e017772643b6bf190e105bcdd84f14f98 Mon Sep 17 00:00:00 2001 From: Bregoliii <34028962+Bregoliii@users.noreply.github.com> Date: Thu, 21 Mar 2024 05:04:14 +0100 Subject: [PATCH 24/29] Add Swiss support (#23272) --- keyboards/swiss/info.json | 97 ++++++++++++++++++++++++ keyboards/swiss/keymaps/default/keymap.c | 23 ++++++ keyboards/swiss/keymaps/via/keymap.c | 23 ++++++ keyboards/swiss/keymaps/via/rules.mk | 1 + keyboards/swiss/readme.md | 28 +++++++ keyboards/swiss/rules.mk | 1 + 6 files changed, 173 insertions(+) create mode 100644 keyboards/swiss/info.json create mode 100644 keyboards/swiss/keymaps/default/keymap.c create mode 100644 keyboards/swiss/keymaps/via/keymap.c create mode 100644 keyboards/swiss/keymaps/via/rules.mk create mode 100644 keyboards/swiss/readme.md create mode 100644 keyboards/swiss/rules.mk diff --git a/keyboards/swiss/info.json b/keyboards/swiss/info.json new file mode 100644 index 00000000000..039153cd7f5 --- /dev/null +++ b/keyboards/swiss/info.json @@ -0,0 +1,97 @@ +{ + "manufacturer": "Bregoli", + "keyboard_name": "swiss", + "maintainer": "Bregoli", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B4", "B5", "B6", "C6", "C7", "D3"], + "rows": ["D6", "D4", "D5", "B2", "D7"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0420", + "vid": "0x4C43" + }, + "community_layouts": ["60_hhkb"], + "layouts": { + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4} + ] + } + } +} diff --git a/keyboards/swiss/keymaps/default/keymap.c b/keyboards/swiss/keymaps/default/keymap.c new file mode 100644 index 00000000000..7f7d2ef6033 --- /dev/null +++ b/keyboards/swiss/keymaps/default/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + /* FN */ + [1] = LAYOUT_60_hhkb( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCT, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + diff --git a/keyboards/swiss/keymaps/via/keymap.c b/keyboards/swiss/keymaps/via/keymap.c new file mode 100644 index 00000000000..7f7d2ef6033 --- /dev/null +++ b/keyboards/swiss/keymaps/via/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + /* FN */ + [1] = LAYOUT_60_hhkb( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCT, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + diff --git a/keyboards/swiss/keymaps/via/rules.mk b/keyboards/swiss/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/swiss/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/swiss/readme.md b/keyboards/swiss/readme.md new file mode 100644 index 00000000000..779f7dcc7fa --- /dev/null +++ b/keyboards/swiss/readme.md @@ -0,0 +1,28 @@ +# Swiss + +![Swiss](https://i.imgur.com/8G6MB5D.png) + +An HHKB that looks like... Cheese? +A fun, not so serious, ridiculously cheesy keyboard. + +* Keyboard Maintainer: [Bregoli](https://geekhack.org/index.php?topic=119509.0) +* Hardware Supported: Custom HHKB PCB and C3 Unified Daughterboard + +Make example for this keyboard (after setting up your build environment): + + make swiss:default + +Flashing example for this keyboard: + + make swiss:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/swiss/rules.mk b/keyboards/swiss/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/swiss/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From a1b16b8227fbf43e67c398f926a922d4241a9829 Mon Sep 17 00:00:00 2001 From: Chad Skeeters Date: Wed, 20 Mar 2024 23:54:02 -0500 Subject: [PATCH 25/29] Support for slice65 from PizzaKeyboards (#23148) --- keyboards/pizzakeyboards/slice65/board.h | 20 ++++ keyboards/pizzakeyboards/slice65/info.json | 105 ++++++++++++++++++ .../slice65/keymaps/default/keymap.c | 26 +++++ .../slice65/keymaps/via/keymap.c | 26 +++++ .../slice65/keymaps/via/rules.mk | 2 + .../pizzakeyboards/slice65/ld/STM32F303xB.ld | 86 ++++++++++++++ keyboards/pizzakeyboards/slice65/mcuconf.h | 22 ++++ keyboards/pizzakeyboards/slice65/readme.md | 27 +++++ keyboards/pizzakeyboards/slice65/rules.mk | 1 + 9 files changed, 315 insertions(+) create mode 100644 keyboards/pizzakeyboards/slice65/board.h create mode 100644 keyboards/pizzakeyboards/slice65/info.json create mode 100644 keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c create mode 100644 keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c create mode 100644 keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk create mode 100644 keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld create mode 100644 keyboards/pizzakeyboards/slice65/mcuconf.h create mode 100644 keyboards/pizzakeyboards/slice65/readme.md create mode 100644 keyboards/pizzakeyboards/slice65/rules.mk diff --git a/keyboards/pizzakeyboards/slice65/board.h b/keyboards/pizzakeyboards/slice65/board.h new file mode 100644 index 00000000000..ba17e3b15ec --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/board.h @@ -0,0 +1,20 @@ +/* +Copyright 2022 Christoph Baumann + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#pragma once + +#define STM32_HSECLK 16000000 +#include_next diff --git a/keyboards/pizzakeyboards/slice65/info.json b/keyboards/pizzakeyboards/slice65/info.json new file mode 100644 index 00000000000..a6ae5a169f8 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/info.json @@ -0,0 +1,105 @@ +{ + "manufacturer": "Pizzakeyboards", + "keyboard_name": "Slice65", + "maintainer": "mm0nte", + "bootloader": "stm32-dfu", + "debounce": 10, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["C14", "C13", "C15", "B6", "B5", "B4", "C4", "A7"], + "rows": ["C11", "C12", "B3", "D2", "A1", "A2", "A5", "A4", "B1", "B0"] + }, + "processor": "STM32F303", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "url": "www.keyboards.pizza", + "usb": { + "device_version": "1.0.0", + "pid": "0x707C", + "vid": "0x504B" + }, + "community_layouts": ["65_ansi_blocker"], + "layouts": { + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [1, 0], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "3", "matrix": [1, 1], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 2], "x": 4, "y": 0}, + {"label": "5", "matrix": [1, 2], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "7", "matrix": [1, 3], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 4], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 4], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 5], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 5], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 6], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"label": "Home", "matrix": [0, 7], "x": 15, "y": 0}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "End", "matrix": [2, 7], "x": 15, "y": 1}, + {"label": "Capslock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "PgUp", "matrix": [4, 7], "x": 15, "y": 2}, + {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [7, 6], "x": 14, "y": 3}, + {"label": "PgDn", "matrix": [6, 7], "x": 15, "y": 3}, + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [8, 5], "x": 10, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [8, 6], "x": 13, "y": 4}, + {"label": "Down", "matrix": [9, 6], "x": 14, "y": 4}, + {"label": "Right", "matrix": [8, 7], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c b/keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c new file mode 100644 index 00000000000..ed1ea2f0c68 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +/* Copyright 2021 Christoph Baumann + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_65_ansi_blocker( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), +}; diff --git a/keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c b/keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c new file mode 100644 index 00000000000..904340ceec2 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c @@ -0,0 +1,26 @@ +/* Copyright 2022 Christoph Baumann + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_65_ansi_blocker( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ) +}; diff --git a/keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk b/keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld b/keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld new file mode 100644 index 00000000000..8ad8b0911cc --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld @@ -0,0 +1,86 @@ +/* + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio + Copyright (C) 2022 Christoph Baumann + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* + * STM32F303xC memory setup. + */ +MEMORY +{ + flash0 (rx) : org = 0x08000000, len = 128k + flash1 (rx) : org = 0x00000000, len = 0 + flash2 (rx) : org = 0x00000000, len = 0 + flash3 (rx) : org = 0x00000000, len = 0 + flash4 (rx) : org = 0x00000000, len = 0 + flash5 (rx) : org = 0x00000000, len = 0 + flash6 (rx) : org = 0x00000000, len = 0 + flash7 (rx) : org = 0x00000000, len = 0 + ram0 (wx) : org = 0x20000000, len = 32k + ram1 (wx) : org = 0x00000000, len = 0 + ram2 (wx) : org = 0x00000000, len = 0 + ram3 (wx) : org = 0x00000000, len = 0 + ram4 (wx) : org = 0x10000000, len = 8k + ram5 (wx) : org = 0x00000000, len = 0 + ram6 (wx) : org = 0x00000000, len = 0 + ram7 (wx) : org = 0x00000000, len = 0 +} + +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash0); +REGION_ALIAS("XTORS_FLASH_LMA", flash0); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash0); +REGION_ALIAS("TEXT_FLASH_LMA", flash0); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash0); +REGION_ALIAS("RODATA_FLASH_LMA", flash0); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash0); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); + +/* RAM region to be used for Main stack. This stack accommodates the processing + of all exceptions and interrupts.*/ +REGION_ALIAS("MAIN_STACK_RAM", ram0); + +/* RAM region to be used for the process stack. This is the stack used by + the main() function.*/ +REGION_ALIAS("PROCESS_STACK_RAM", ram0); + +/* RAM region to be used for data segment.*/ +REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash0); + +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("BSS_RAM", ram0); + +/* RAM region to be used for the default heap.*/ +REGION_ALIAS("HEAP_RAM", ram0); + +/* Generic rules inclusion.*/ +INCLUDE rules.ld diff --git a/keyboards/pizzakeyboards/slice65/mcuconf.h b/keyboards/pizzakeyboards/slice65/mcuconf.h new file mode 100644 index 00000000000..aa059c91708 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/mcuconf.h @@ -0,0 +1,22 @@ +/* +Copyright 2022 Christoph Baumann + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#pragma once + +#include_next + +#undef STM32_PREDIV_VALUE +#define STM32_PREDIV_VALUE 2 diff --git a/keyboards/pizzakeyboards/slice65/readme.md b/keyboards/pizzakeyboards/slice65/readme.md new file mode 100644 index 00000000000..591f51b49e8 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/readme.md @@ -0,0 +1,27 @@ +# Pizza Keyboards (V2) Slice65 + +![Pizza V2](https://i.imgur.com/RfqnpVlh.jpeg) + +A 65% keyboard kit made and sold by [pizza keyboards](https://keyboards.pizza). + +* Keyboard Maintainer: [mm0nte](https://github.com/mm0nte) +* Hardware Supported: Pizza V2 Slice65 (Hotswap) PCB +* Hardware Availability: [Pizza Keyboards Store](https://keyboards.pizza/collections/store) + +Make example for this keyboard (after setting up your build environment): + + make pizzakeyboards/slice65:default + +Flashing example for this keyboard: + + make pizzakeyboards/slice65:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/pizzakeyboards/slice65/rules.mk b/keyboards/pizzakeyboards/slice65/rules.mk new file mode 100644 index 00000000000..a36398ce434 --- /dev/null +++ b/keyboards/pizzakeyboards/slice65/rules.mk @@ -0,0 +1 @@ +MCU_LDSCRIPT = STM32F303xB From 18ae0f61abac97d3dde323e4aad5ec9fc82bc834 Mon Sep 17 00:00:00 2001 From: Ramon Imbao Date: Thu, 21 Mar 2024 13:03:42 +0800 Subject: [PATCH 26/29] Add the EQUATOR keyboard (#23237) --- keyboards/rmi_kb/equator/config.h | 11 ++ keyboards/rmi_kb/equator/equator.c | 30 ++++ keyboards/rmi_kb/equator/halconf.h | 8 + keyboards/rmi_kb/equator/info.json | 152 ++++++++++++++++++ .../rmi_kb/equator/keymaps/default/keymap.c | 21 +++ keyboards/rmi_kb/equator/keymaps/via/keymap.c | 21 +++ keyboards/rmi_kb/equator/keymaps/via/rules.mk | 1 + keyboards/rmi_kb/equator/mcuconf.h | 9 ++ keyboards/rmi_kb/equator/readme.md | 26 +++ keyboards/rmi_kb/equator/rules.mk | 1 + 10 files changed, 280 insertions(+) create mode 100644 keyboards/rmi_kb/equator/config.h create mode 100644 keyboards/rmi_kb/equator/equator.c create mode 100644 keyboards/rmi_kb/equator/halconf.h create mode 100644 keyboards/rmi_kb/equator/info.json create mode 100644 keyboards/rmi_kb/equator/keymaps/default/keymap.c create mode 100644 keyboards/rmi_kb/equator/keymaps/via/keymap.c create mode 100644 keyboards/rmi_kb/equator/keymaps/via/rules.mk create mode 100644 keyboards/rmi_kb/equator/mcuconf.h create mode 100644 keyboards/rmi_kb/equator/readme.md create mode 100644 keyboards/rmi_kb/equator/rules.mk diff --git a/keyboards/rmi_kb/equator/config.h b/keyboards/rmi_kb/equator/config.h new file mode 100644 index 00000000000..c2a22b66711 --- /dev/null +++ b/keyboards/rmi_kb/equator/config.h @@ -0,0 +1,11 @@ +// Copyright 2024 Ramon Imbao (@ramonimbao) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* RGB */ +#define WS2812_SPI_DRIVER SPID2 +#define WS2812_SPI_MOSI_PAL_MODE 0 +#define WS2812_SPI_SCK_PIN B13 +#define WS2812_SPI_SCK_PAL_MODE 0 +#define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/rmi_kb/equator/equator.c b/keyboards/rmi_kb/equator/equator.c new file mode 100644 index 00000000000..508eeea9e56 --- /dev/null +++ b/keyboards/rmi_kb/equator/equator.c @@ -0,0 +1,30 @@ +// Copyright 2024 Ramon Imbao (@ramonimbao) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + led_t state = host_keyboard_led_state(); + uint32_t highest_layer = get_highest_layer(layer_state); + + + if (!(state.compose || state.scroll_lock)) { + RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0); + } + + if (!state.caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0); + } + + if (highest_layer == 0) { + RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 0); + } + + + return false; +} +#endif diff --git a/keyboards/rmi_kb/equator/halconf.h b/keyboards/rmi_kb/equator/halconf.h new file mode 100644 index 00000000000..e215e323c5d --- /dev/null +++ b/keyboards/rmi_kb/equator/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2023 Ramon Imbao (@ramonimbao) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE + +#include_next diff --git a/keyboards/rmi_kb/equator/info.json b/keyboards/rmi_kb/equator/info.json new file mode 100644 index 00000000000..9e1ccab0fb5 --- /dev/null +++ b/keyboards/rmi_kb/equator/info.json @@ -0,0 +1,152 @@ +{ + "manufacturer": "Ramon Imbao", + "keyboard_name": "EQUATOR", + "maintainer": "ramonimbao", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A9", "A8", "B2", "B11", "F1", "F0", "C15", "C14", "C13"], + "rows": ["B12", "B10", "A15", "A10", "B1"] + }, + "processor": "STM32F072", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0xE0A1", + "vid": "0xB16B" + }, + "ws2812": { + "pin": "B15", + "driver": "spi" + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "digital_rain": true + }, + "driver": "ws2812", + "layout": [ + {"flags": 8, "x":224, "y":8}, + {"flags": 8, "x":224, "y":4}, + {"flags": 8, "x":224, "y":0} + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x":10, "y": 0}, + {"matrix": [0, 9], "x":11, "y": 0}, + {"matrix": [0,10], "x":12, "y": 0}, + {"matrix": [0,11], "x":13, "y": 0}, + {"matrix": [0,12], "x":14, "y": 0}, + {"matrix": [0,13], "x":15, "y": 0}, + {"matrix": [0,14], "x":16, "y": 0}, + {"matrix": [0,15], "x":17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x":10.5, "y": 1}, + {"matrix": [1,10], "x":11.5, "y": 1}, + {"matrix": [1,11], "x":12.5, "y": 1}, + {"matrix": [1,12], "x":13.5, "y": 1}, + {"matrix": [1,13], "x":14.5, "y": 1}, + {"matrix": [1,14], "x":15.5, "y": 1, "w": 1.5}, + {"matrix": [1,15], "x":17, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x":10.75, "y": 2}, + {"matrix": [2,10], "x":11.75, "y": 2}, + {"matrix": [2,11], "x":12.75, "y": 2}, + {"matrix": [2,12], "x":13.75, "y": 2}, + {"matrix": [2,14], "x":14.75, "y": 2, "w": 2.25}, + {"matrix": [2,15], "x":17, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x":10.25, "y": 3}, + {"matrix": [3,10], "x":11.25, "y": 3}, + {"matrix": [3,11], "x":12.25, "y": 3}, + {"matrix": [3,12], "x":13.25, "y": 3}, + {"matrix": [3,13], "x":14.25, "y": 3, "w": 1.75}, + {"matrix": [3,14], "x":16, "y": 3}, + {"matrix": [3,15], "x":17, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [4, 3], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [4, 5], "x": 4.5, "y": 3, "w": 2.75}, + {"matrix": [4, 8], "x": 8.25, "y": 3, "w": 2.25}, + {"matrix": [4, 9], "x":10.5, "y": 3, "w": 1.25}, + {"matrix": [4,11], "x":12.5, "y": 3, "w": 1.25}, + {"matrix": [4,12], "x":13.75, "y": 3, "w": 1.25}, + {"matrix": [4,13], "x":15, "y": 3}, + {"matrix": [4,14], "x":15, "y": 3}, + {"matrix": [4,15], "x":15, "y": 3} + ] + } + } +} diff --git a/keyboards/rmi_kb/equator/keymaps/default/keymap.c b/keyboards/rmi_kb/equator/keymaps/default/keymap.c new file mode 100644 index 00000000000..b5a0cdb458b --- /dev/null +++ b/keyboards/rmi_kb/equator/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/equator/keymaps/via/keymap.c b/keyboards/rmi_kb/equator/keymaps/via/keymap.c new file mode 100644 index 00000000000..b5a0cdb458b --- /dev/null +++ b/keyboards/rmi_kb/equator/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/rmi_kb/equator/keymaps/via/rules.mk b/keyboards/rmi_kb/equator/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/rmi_kb/equator/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rmi_kb/equator/mcuconf.h b/keyboards/rmi_kb/equator/mcuconf.h new file mode 100644 index 00000000000..aceb2e3dfc0 --- /dev/null +++ b/keyboards/rmi_kb/equator/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2023 Ramon Imbao (@ramonimbao) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/rmi_kb/equator/readme.md b/keyboards/rmi_kb/equator/readme.md new file mode 100644 index 00000000000..93755490f43 --- /dev/null +++ b/keyboards/rmi_kb/equator/readme.md @@ -0,0 +1,26 @@ +# EQUATOR + +![EQUATOR](https://i.imgur.com/0zjj6btl.png) + +An ergo 65% keyboard designed in collaboration with ronworks. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: STM32F072 + +Make example for this keyboard (after setting up your build environment): + + make rmi_kb/equator:default + +Flashing example for this keyboard: + + make rmi_kb/equator:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Press and hold the button below the right alt and right ctrl keys +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/rmi_kb/equator/rules.mk b/keyboards/rmi_kb/equator/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/rmi_kb/equator/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 4bc57c8d46233db366822793d6abb7a163691b9e Mon Sep 17 00:00:00 2001 From: jotix <69703151+jotix@users.noreply.github.com> Date: Thu, 21 Mar 2024 02:04:25 -0300 Subject: [PATCH 27/29] Add handwired/Jotlily60 (#23212) --- keyboards/handwired/jotlily60/info.json | 104 ++++++++++++++++++ .../jotlily60/keymaps/default/keymap.c | 65 +++++++++++ keyboards/handwired/jotlily60/readme.md | 55 +++++++++ keyboards/handwired/jotlily60/rules.mk | 1 + 4 files changed, 225 insertions(+) create mode 100644 keyboards/handwired/jotlily60/info.json create mode 100644 keyboards/handwired/jotlily60/keymaps/default/keymap.c create mode 100644 keyboards/handwired/jotlily60/readme.md create mode 100644 keyboards/handwired/jotlily60/rules.mk diff --git a/keyboards/handwired/jotlily60/info.json b/keyboards/handwired/jotlily60/info.json new file mode 100644 index 00000000000..65faa354a51 --- /dev/null +++ b/keyboards/handwired/jotlily60/info.json @@ -0,0 +1,104 @@ +{ + "manufacturer": "Jotix", + "keyboard_name": "jotlily60", + "maintainer" : "jotix", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotlily60", + "usb": { + "vid": "0x4A4F", + "pid": "0x2332", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "development_board": "promicro", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": [ "D0", "D4", "C6", "D7", "E6", "B4", "B5" ], + "rows": [ "F7", "B1", "B3", "B2", "B6" ], + }, + "split": { + "enabled": true, + "soft_serial_pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 10, "y": 0.25}, + {"matrix": [5, 4], "x": 11, "y": 0.25}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0.25}, + {"matrix": [5, 1], "x": 14, "y": 0.5}, + {"matrix": [5, 0], "x": 15, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 10, "y": 1.25}, + {"matrix": [6, 4], "x": 11, "y": 1.25}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1.25}, + {"matrix": [6, 1], "x": 14, "y": 1.5}, + {"matrix": [6, 0], "x": 15, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 10, "y": 2.25}, + {"matrix": [7, 4], "x": 11, "y": 2.25}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2.25}, + {"matrix": [7, 1], "x": 14, "y": 2.5}, + {"matrix": [7, 0], "x": 15, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, + + {"matrix": [8, 6], "x": 9, "y": 3.5}, + {"matrix": [8, 5], "x": 10, "y": 3.25}, + {"matrix": [8, 4], "x": 11, "y": 3.25}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3.25}, + {"matrix": [8, 1], "x": 14, "y": 3.5}, + {"matrix": [8, 0], "x": 15, "y": 3.5}, + + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 4.5}, + {"matrix": [4, 6], "x": 6, "y": 4.75}, + + {"matrix": [9, 6], "x": 9, "y": 4.75}, + {"matrix": [9, 5], "x": 10, "y": 4.5}, + {"matrix": [9, 4], "x": 11, "y": 4.25}, + {"matrix": [9, 3], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4.25} + ] + } + } +} diff --git a/keyboards/handwired/jotlily60/keymaps/default/keymap.c b/keyboards/handwired/jotlily60/keymaps/default/keymap.c new file mode 100644 index 00000000000..bccd8225770 --- /dev/null +++ b/keyboards/handwired/jotlily60/keymaps/default/keymap.c @@ -0,0 +1,65 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +enum layers { + _QWERTY, + _FN, + _ADJUST +}; + +#define FN MO(_FN) +#define ADJUST MO(_ADJUST) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + * | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + * | esc | Q | W | E | R | T | | Y | U | I | O | P | tab | + * +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + * | caps | A | S | D | F | G | | H | J | K | L | ; | ' | + * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + * | shift | Z | X | C | V | B | { | } | N | M | , | . | / | enter | + * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + * | alt | super | ctrl | space | fn | fn | bspc | del | meh | ralt | + * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + */ +[_QWERTY] = LAYOUT ( + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, + KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, + KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR,KC_RCBR,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_ENT, + KC_LALT,KC_LGUI,KC_LCTL,KC_SPC, FN, FN, KC_BSPC,KC_DEL, KC_MEH, KC_RALT +), + +/* +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + * | + | ! | @ | # | $ | % | | ^ | & | * | ( | ) | _ | + * +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + * |adjust | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | | + * +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + * | | F11 | F12 | F13 | F14 | F15 | | left | down | up | right | | | " | + * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + * | | vol- | mute | vol+ | ` | ~ | [ | ] | home | end | pgup | pgdn | \ | | + * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + * | | | | | | | | | | | + * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + */ +[_FN] = LAYOUT ( + KC_PLUS,KC_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS, + ADJUST, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______,KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_BSLS,KC_DQUO, + _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_GRV, KC_TILD,KC_LBRC,KC_RBRC,KC_HOME,KC_END, KC_PGUP,KC_PGDN,KC_PIPE,_______, + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______ +), + +[_ADJUST] = LAYOUT ( + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + _______,QK_BOOT,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + _______,_______,_______,DB_TOGG,_______,_______, _______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______ +), +}; + diff --git a/keyboards/handwired/jotlily60/readme.md b/keyboards/handwired/jotlily60/readme.md new file mode 100644 index 00000000000..d0a8750d0ef --- /dev/null +++ b/keyboards/handwired/jotlily60/readme.md @@ -0,0 +1,55 @@ +# jotlily60 + +![jotlily60](https://i.imgur.com/I68WGmJh.jpg) + +A split keyboard kit made by jotix, inspired in the Lily58 keyboard. + +* Keyboard Maintainer: [jotix](https://github.com/jotix) +* Hardware Supported: Arduino Pro Micro + +--- + +### Arduino Pro Micro Pinout + +| Rows | 0 | 1 | 2 | 3 | 4 | +|-------------|----|----|----|----|----| +| Arduino pin | A0 | 15 | 14 | 16 | 10 | +| QMK pin | F7 | B1 | B3 | B2 | B6 | + +| Columns | 0 | 1 | 2 | 3 | 4 | 5 | 6 | +|-------------|----|----|----|----|----|----|----| +| Arduino pin | 3 | 4 | 5 | 6 | 7 | 8 | 9 | +| QMK pin | D0 | D4 | C6 | D7 | E6 | B4 | B5 | + +| Serial | | +|-------------|-----| +| Arduino pin | TX0 | +| QMK pin | D3 | + +--- + +### Compiling the Firmware + +Compile example for this keyboard (after setting up your build environment): + + qmk compile -kb handwired/jotlily60 -km default + +--- + +### The Defaukt Keymap + + +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + | esc | Q | W | E | R | T | | Y | U | I | O | P | tab | + +-------+-------+-------+-------+-------+-------+ +-------+-------+-------+-------+-------+-------+ + | caps | A | S | D | F | G | | H | J | K | L | ; | ' | + +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + | shift | Z | X | C | V | B | { | } | N | M | , | . | / | enter | + +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + | alt | super | ctrl | space | fn | fn | bspc | del | meh | ralt | + +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ + +--- + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/handwired/jotlily60/rules.mk b/keyboards/handwired/jotlily60/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/handwired/jotlily60/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 5d6b2918459668d1b0adf24d21ebd4f7a0aab659 Mon Sep 17 00:00:00 2001 From: NW Date: Thu, 21 Mar 2024 06:05:18 +0100 Subject: [PATCH 28/29] Add TechnicPad macropad (#23238) --- keyboards/handwired/technicpad/info.json | 38 +++++++++++++++++++ .../technicpad/keymaps/default/keymap.json | 8 ++++ .../technicpad/keymaps/via/keymap.json | 13 +++++++ keyboards/handwired/technicpad/readme.md | 27 +++++++++++++ keyboards/handwired/technicpad/rules.mk | 1 + 5 files changed, 87 insertions(+) create mode 100644 keyboards/handwired/technicpad/info.json create mode 100644 keyboards/handwired/technicpad/keymaps/default/keymap.json create mode 100644 keyboards/handwired/technicpad/keymaps/via/keymap.json create mode 100644 keyboards/handwired/technicpad/readme.md create mode 100644 keyboards/handwired/technicpad/rules.mk diff --git a/keyboards/handwired/technicpad/info.json b/keyboards/handwired/technicpad/info.json new file mode 100644 index 00000000000..92a0be7f27a --- /dev/null +++ b/keyboards/handwired/technicpad/info.json @@ -0,0 +1,38 @@ +{ + "manufacturer": "nwhirschfeld", + "keyboard_name": "TechnicPad", + "maintainer": "nwhirschfeld", + "build": { + "lto": true + }, + "development_board": "promicro", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, + "matrix_pins": { + "direct": [ + ["D1"], + ["D0"], + ["D4"], + ["C6"] + ] + }, + "url": "https://github.com/nwhirschfeld/TechnicPad", + "usb": { + "device_version": "0.0.1", + "pid": "0x5450", + "vid": "0x4E57" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "D1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "D0", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "D4", "matrix": [2, 0], "x": 1, "y": 0}, + {"label": "C6", "matrix": [3, 0], "x": 1, "y": 1} + ] + } + } +} diff --git a/keyboards/handwired/technicpad/keymaps/default/keymap.json b/keyboards/handwired/technicpad/keymaps/default/keymap.json new file mode 100644 index 00000000000..6d544a59466 --- /dev/null +++ b/keyboards/handwired/technicpad/keymaps/default/keymap.json @@ -0,0 +1,8 @@ +{ + "keyboard": "technicpad", + "keymap": "default", + "layers": [ + ["KC_A", "KC_B", "KC_C", "KC_D"] + ], + "layout": "LAYOUT" +} diff --git a/keyboards/handwired/technicpad/keymaps/via/keymap.json b/keyboards/handwired/technicpad/keymaps/via/keymap.json new file mode 100644 index 00000000000..845fff0dfba --- /dev/null +++ b/keyboards/handwired/technicpad/keymaps/via/keymap.json @@ -0,0 +1,13 @@ +{ + "keyboard": "technicpad", + "keymap": "via", + "config": { + "features": { + "via": true + } + }, + "layers": [ + ["KC_A", "KC_B", "KC_C", "KC_D"] + ], + "layout": "LAYOUT" +} diff --git a/keyboards/handwired/technicpad/readme.md b/keyboards/handwired/technicpad/readme.md new file mode 100644 index 00000000000..3ca28c984aa --- /dev/null +++ b/keyboards/handwired/technicpad/readme.md @@ -0,0 +1,27 @@ +# TechnicPad + +![TechnicPad](https://i.imgur.com/LPD0KSL.jpg) + +A 4% (2x2) macropad, that is compatible to technic building blocks. + +* Keyboard Maintainer: [Niclas Hirschfeld](https://github.com/nwhirschfeld) +* Hardware Supported: Pro Micro boards +* Hardware Availability: for now TechnicPad is handwired and uses an Arduino pro micro. [TechnicPad repository](https://github.com/nwhirschfeld/TechnicPad) + +Make example for this keyboard (after setting up your build environment): + + make handwired/technicpad:default + +Flashing example for this keyboard: + + make handwired/technicpad:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the upper left key and plug in the keyboard +* **Physical reset**: Short the _RST_ and _GND_ pins of the PCB +* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available diff --git a/keyboards/handwired/technicpad/rules.mk b/keyboards/handwired/technicpad/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/handwired/technicpad/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 8a429fce3364de398ef35d425ea467414e3c80d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Bo=C5=BEi=C4=8D?= Date: Thu, 21 Mar 2024 06:06:38 +0100 Subject: [PATCH 29/29] [Keyboard] Add marshkeys flowerpad (#23240) --- keyboards/marshkeys/flowerpad/info.json | 37 +++++++++++++++++++ .../flowerpad/keymaps/default/keymap.c | 35 ++++++++++++++++++ .../marshkeys/flowerpad/keymaps/via/keymap.c | 35 ++++++++++++++++++ .../marshkeys/flowerpad/keymaps/via/rules.mk | 1 + keyboards/marshkeys/flowerpad/readme.md | 23 ++++++++++++ keyboards/marshkeys/flowerpad/rules.mk | 1 + 6 files changed, 132 insertions(+) create mode 100644 keyboards/marshkeys/flowerpad/info.json create mode 100644 keyboards/marshkeys/flowerpad/keymaps/default/keymap.c create mode 100644 keyboards/marshkeys/flowerpad/keymaps/via/keymap.c create mode 100644 keyboards/marshkeys/flowerpad/keymaps/via/rules.mk create mode 100644 keyboards/marshkeys/flowerpad/readme.md create mode 100644 keyboards/marshkeys/flowerpad/rules.mk diff --git a/keyboards/marshkeys/flowerpad/info.json b/keyboards/marshkeys/flowerpad/info.json new file mode 100644 index 00000000000..79e69c7a031 --- /dev/null +++ b/keyboards/marshkeys/flowerpad/info.json @@ -0,0 +1,37 @@ +{ + "manufacturer": "marshkeys.com", + "keyboard_name": "Flowerpad", + "maintainer": "Ethirallan", + "bootmagic": { + "matrix": [0, 1] + }, + "development_board": "promicro", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5"], + "rows": ["C6", "D4", "D0"] + }, + "url": "marshkeys.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x466C", + "vid": "0x4D61" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 2}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [2, 2], "x": 2, "y": 2} + ] + } + } +} diff --git a/keyboards/marshkeys/flowerpad/keymaps/default/keymap.c b/keyboards/marshkeys/flowerpad/keymaps/default/keymap.c new file mode 100644 index 00000000000..73817ffc95b --- /dev/null +++ b/keyboards/marshkeys/flowerpad/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Benjamin Božič + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * -------- + * | MUTE | + * |------+------+------| + * | PREV | PLAY | NEXT | + * |------+------+------| + * | VOL- | | VOL+ | + * -------- -------- + */ + LAYOUT( + KC_MUTE, + KC_MPRV, KC_MPLY, KC_MNXT, + KC_VOLD, KC_VOLU + ), +}; diff --git a/keyboards/marshkeys/flowerpad/keymaps/via/keymap.c b/keyboards/marshkeys/flowerpad/keymaps/via/keymap.c new file mode 100644 index 00000000000..73817ffc95b --- /dev/null +++ b/keyboards/marshkeys/flowerpad/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Benjamin Božič + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * -------- + * | MUTE | + * |------+------+------| + * | PREV | PLAY | NEXT | + * |------+------+------| + * | VOL- | | VOL+ | + * -------- -------- + */ + LAYOUT( + KC_MUTE, + KC_MPRV, KC_MPLY, KC_MNXT, + KC_VOLD, KC_VOLU + ), +}; diff --git a/keyboards/marshkeys/flowerpad/keymaps/via/rules.mk b/keyboards/marshkeys/flowerpad/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/marshkeys/flowerpad/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/marshkeys/flowerpad/readme.md b/keyboards/marshkeys/flowerpad/readme.md new file mode 100644 index 00000000000..859db5fc664 --- /dev/null +++ b/keyboards/marshkeys/flowerpad/readme.md @@ -0,0 +1,23 @@ +# Flowerpad + +![flowerpad](https://i.imgur.com/SRo0iWLh.jpeg) + +A flourishing 6-key macropad that will catch your eye. + +* Keyboard Maintainer: [Benjamin Božič](https://github.com/Ethirallan) +* Hardware Supported: Onboard ATmega32u4, Flowerpad PCB v1, hotswap v1 +* Hardware Availability: marshkeys.com + +Make example for this keyboard (after setting up your build environment): + + make marshkeys/flowerpad:default + +Flashing example for this keyboard: + + make marshkeys/flowerpad:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader by holding down the top key (where the usb connects) and plug in the keyboard diff --git a/keyboards/marshkeys/flowerpad/rules.mk b/keyboards/marshkeys/flowerpad/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/marshkeys/flowerpad/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank