From eec0d839e3603f8685b44051fe86d609b35b9341 Mon Sep 17 00:00:00 2001 From: chalex Date: Fri, 2 Feb 2024 00:14:22 -0500 Subject: [PATCH 01/23] add ppr files --- keyboards/chlx/ppr_merro60/config.h | 26 ++ keyboards/chlx/ppr_merro60/info.json | 372 ++++++++++++++++++ .../chlx/ppr_merro60/keymaps/ansi/keymap.c | 35 ++ .../chlx/ppr_merro60/keymaps/default/keymap.c | 49 +++ .../chlx/ppr_merro60/keymaps/hhkb/keymap.c | 35 ++ .../chlx/ppr_merro60/keymaps/iso/keymap.c | 35 ++ .../chlx/ppr_merro60/keymaps/tsangan/keymap.c | 35 ++ .../chlx/ppr_merro60/keymaps/via/keymap.c | 49 +++ .../chlx/ppr_merro60/keymaps/via/rules.mk | 3 + keyboards/chlx/ppr_merro60/ppr_merro60.c | 38 ++ keyboards/chlx/ppr_merro60/readme.md | 22 ++ keyboards/chlx/ppr_merro60/rules.mk | 14 + 12 files changed, 713 insertions(+) create mode 100644 keyboards/chlx/ppr_merro60/config.h create mode 100644 keyboards/chlx/ppr_merro60/info.json create mode 100644 keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/default/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/via/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/via/rules.mk create mode 100644 keyboards/chlx/ppr_merro60/ppr_merro60.c create mode 100644 keyboards/chlx/ppr_merro60/readme.md create mode 100644 keyboards/chlx/ppr_merro60/rules.mk diff --git a/keyboards/chlx/ppr_merro60/config.h b/keyboards/chlx/ppr_merro60/config.h new file mode 100644 index 000000000000..a77708e00aed --- /dev/null +++ b/keyboards/chlx/ppr_merro60/config.h @@ -0,0 +1,26 @@ +/* +Copyright 2024 Alexander Lee + +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 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json new file mode 100644 index 000000000000..62bea5d3b1e8 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/info.json @@ -0,0 +1,372 @@ +{ + "keyboard_name": "ppr.merro60", + "manufacturer": "chlx bsmt", + "url": "www.github.com/gaclee3b", + "maintainer": "gaclee3b", + "usb": { + "vid": "0x4358", + "pid": "0x0603", + "device_version": "1.0.1" + }, + "matrix_pins": { + "cols": [ "F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4" ], + "rows": [ "F7", "B2", "B3", "B7", "D7", "B4", "B5" ] + }, + "diode_direction": "ROW2COL", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [2, 8], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [3, 8], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [3, 9], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c new file mode 100644 index 000000000000..4012c4a2dacf --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_ansi( + QK_GESC, 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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), + +[1] = LAYOUT_60_ansi( + 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_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c new file mode 100644 index 000000000000..18fb8ec9b4b3 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2024 Alexander Lee + +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_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_BSLS, KC_GRV, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP, KC_ENT, + KC_LSFT, KC_LEFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), + +[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_DEL, + KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, + _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c new file mode 100644 index 000000000000..8614ad284878 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_hhkb( + QK_GESC, 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_GRV, + 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_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + +[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_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c new file mode 100644 index 000000000000..ffdc49a2fb03 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_iso( + QK_GESC, 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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL), + +[1] = LAYOUT_60_iso( + 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, QK_BOOT, + KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, + _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c new file mode 100644 index 000000000000..73282416ab8d --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_tsangan_hhkb( + QK_GESC, 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_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_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, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), + +[1] = LAYOUT_60_tsangan_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_DEL, _______, + KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c new file mode 100644 index 000000000000..723b1155a7f0 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2024 Alexander Lee + +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_all( + QK_GESC, 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_GRV, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT, + KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_LSCR, KC_RALT, KC_RGUI, MO(1), KC_RCTL), + +[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_DEL, + KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, + _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +[3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk new file mode 100644 index 000000000000..5f615ff62b74 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + diff --git a/keyboards/chlx/ppr_merro60/ppr_merro60.c b/keyboards/chlx/ppr_merro60/ppr_merro60.c new file mode 100644 index 000000000000..ae80543406a6 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/ppr_merro60.c @@ -0,0 +1,38 @@ +/* +Copyright 2023 Alexander Lee + +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 "quantum.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + setPinOutput(C7); + setPinOutput(F0); + matrix_init_user(); +} + +bool led_update_kb(led_t led_state) { + if(led_update_user(led_state)) { + writePin(C7, !led_state.caps_lock); + writePin(F0, !led_state.scroll_lock); + } + return true; +} + +void eeconfig_init_kb(void) { // EEPROM is getting reset! + eeconfig_update_kb(0); + eeconfig_init_user(); +} diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md new file mode 100644 index 000000000000..058c4886e0e4 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -0,0 +1,22 @@ +# ppr.merro60 + +ppr.merro60 PCB + +A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. +Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. +Has additional center flex cut. +Meant to be manufactured in 1.2mm. + +Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b) +Hardware Supported: chlx PCB ppr.merro60.x.x.x + +Enter bootloader mode by any of the following options - +- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard +- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region +- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot) + +Make example for this keyboard (after setting up your build environment): + + make chlx/ppr_merro60:default + +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/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk new file mode 100644 index 000000000000..70f82c53f972 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/rules.mk @@ -0,0 +1,14 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +Layouts = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb From d7b8f095b8fa8351dd9b1bae51497878c028ddd1 Mon Sep 17 00:00:00 2001 From: chalex Date: Sat, 3 Feb 2024 21:45:07 -0500 Subject: [PATCH 02/23] update readme --- keyboards/chlx/ppr_merro60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md index 058c4886e0e4..39c7b0516081 100644 --- a/keyboards/chlx/ppr_merro60/readme.md +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -1,6 +1,6 @@ # ppr.merro60 -ppr.merro60 PCB +![ppr.merro60 PCB](https://imgur.com/xyQA68X) A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. From 66925609054506224a0c8c813b2db29a84207cd1 Mon Sep 17 00:00:00 2001 From: chalex Date: Sat, 3 Feb 2024 22:04:16 -0500 Subject: [PATCH 03/23] update imgur link --- keyboards/chlx/ppr_merro60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md index 39c7b0516081..a6861a4b5bd0 100644 --- a/keyboards/chlx/ppr_merro60/readme.md +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -1,6 +1,6 @@ # ppr.merro60 -![ppr.merro60 PCB](https://imgur.com/xyQA68X) +![ppr.merro60 PCB](https://i.imgur.com/xyQA68X.jpg) A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. From 97dfdcc62c0969529ac2d362cafaaeabead097d0 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:23:27 -0500 Subject: [PATCH 04/23] Update keyboards/chlx/ppr_merro60/keymaps/default/keymap.c Co-authored-by: Ryan --- .../chlx/ppr_merro60/keymaps/default/keymap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c index 18fb8ec9b4b3..070f6f022b83 100644 --- a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c +++ b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c @@ -32,18 +32,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - -[2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - -[3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; From 802a20915cdbd4a0d611e6004b4a64886fc9fcd3 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:23:34 -0500 Subject: [PATCH 05/23] Update keyboards/chlx/ppr_merro60/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/keymaps/via/keymap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c index 723b1155a7f0..7c8e0d253015 100644 --- a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c +++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c @@ -32,18 +32,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - -[2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - -[3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; From 703f90f59c62127e3c4ce30adfde981d54ea5775 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:23:53 -0500 Subject: [PATCH 06/23] Update keyboards/chlx/ppr_merro60/readme.md Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md index a6861a4b5bd0..789cfc14c2af 100644 --- a/keyboards/chlx/ppr_merro60/readme.md +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -1,6 +1,6 @@ # ppr.merro60 -![ppr.merro60 PCB](https://i.imgur.com/xyQA68X.jpg) +![ppr.merro60 PCB](https://i.imgur.com/xyQA68Xh.jpg) A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. From 81117d4b31fc66b8eebb0520dc34d86a66c0a39f Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:24:02 -0500 Subject: [PATCH 07/23] Update keyboards/chlx/ppr_merro60/readme.md Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md index 789cfc14c2af..2c6307139780 100644 --- a/keyboards/chlx/ppr_merro60/readme.md +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -7,8 +7,8 @@ Has modified cutouts to allow usage of certain tray mount cases into gummy gaske Has additional center flex cut. Meant to be manufactured in 1.2mm. -Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b) -Hardware Supported: chlx PCB ppr.merro60.x.x.x +* Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b) +* Hardware Supported: chlx PCB ppr.merro60.x.x.x Enter bootloader mode by any of the following options - - When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard From 42a35829e66713dffe93c63db9739f7268cd89d5 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:33:12 -0500 Subject: [PATCH 08/23] Update keyboards/chlx/ppr_merro60/rules.mk Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/rules.mk | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk index 70f82c53f972..6e7633bfe015 100644 --- a/keyboards/chlx/ppr_merro60/rules.mk +++ b/keyboards/chlx/ppr_merro60/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -Layouts = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb +# This file intentionally left blank From 232fe5ead4a75d0bb3ca2fc3fc7323aaf57f7321 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:33:24 -0500 Subject: [PATCH 09/23] Update keyboards/chlx/ppr_merro60/info.json Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/info.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 62bea5d3b1e8..945912049a92 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -13,6 +13,11 @@ "rows": [ "F7", "B2", "B3", "B7", "D7", "B4", "B5" ] }, "diode_direction": "ROW2COL", + "indicators": { + "caps_lock": "C7", + "scroll_lock": "F0", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { From c8023c6681896968985d76d34edcd9375bb57c5c Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:33:36 -0500 Subject: [PATCH 10/23] Update keyboards/chlx/ppr_merro60/info.json Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/info.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 945912049a92..bf5455aa9104 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -20,6 +20,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": [ + "60_ansi", + "60_ansi_split_bs_rshift", + "60_hhkb", + "60_iso", + "60_tsangan_hhkb" + ], "layouts": { "LAYOUT_all": { "layout": [ From a66084dd00c42bf9a26159cc81c21500b07dd240 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:33:47 -0500 Subject: [PATCH 11/23] Update keyboards/chlx/ppr_merro60/info.json Co-authored-by: Ryan --- keyboards/chlx/ppr_merro60/info.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index bf5455aa9104..b6603ee78342 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -3,6 +3,14 @@ "manufacturer": "chlx bsmt", "url": "www.github.com/gaclee3b", "maintainer": "gaclee3b", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true + }, "usb": { "vid": "0x4358", "pid": "0x0603", From 5cd21c4634a6c84565195a5d6b60735228526731 Mon Sep 17 00:00:00 2001 From: chalex Date: Sat, 3 Feb 2024 23:37:14 -0500 Subject: [PATCH 12/23] run 'qmk format-json -i info.json' --- keyboards/chlx/ppr_merro60/info.json | 698 +++++++++++------------ keyboards/chlx/ppr_merro60/ppr_merro60.c | 38 -- 2 files changed, 336 insertions(+), 400 deletions(-) delete mode 100644 keyboards/chlx/ppr_merro60/ppr_merro60.c diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index b6603ee78342..6683c51b40ea 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -1,392 +1,366 @@ { - "keyboard_name": "ppr.merro60", "manufacturer": "chlx bsmt", - "url": "www.github.com/gaclee3b", + "keyboard_name": "ppr.merro60", "maintainer": "gaclee3b", + "bootloader": "atmel-dfu", + "diode_direction": "ROW2COL", "features": { "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, "command": false, + "console": false, + "extrakey": true, + "mousekey": true, "nkro": true }, - "usb": { - "vid": "0x4358", - "pid": "0x0603", - "device_version": "1.0.1" - }, - "matrix_pins": { - "cols": [ "F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4" ], - "rows": [ "F7", "B2", "B3", "B7", "D7", "B4", "B5" ] - }, - "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C7", - "scroll_lock": "F0", - "on_state": 0 + "on_state": 0, + "scroll_lock": "F0" + }, + "matrix_pins": { + "cols": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"], + "rows": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"] }, "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "community_layouts": [ - "60_ansi", - "60_ansi_split_bs_rshift", - "60_hhkb", - "60_iso", - "60_tsangan_hhkb" - ], + "url": "www.github.com/gaclee3b", + "usb": { + "device_version": "1.0.1", + "pid": "0x0603", + "vid": "0x4358" + }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"], "layouts": { - "LAYOUT_all": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, - {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, - {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, - {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, - {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 2, "w": 1.25}, - - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, - {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [2, 8], "x": 3.75, "y": 4, "w": 2.75}, - {"matrix": [3, 8], "x": 6.5, "y": 4, "w": 1.25}, - {"matrix": [3, 9], "x": 7.75, "y": 4, "w": 2.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} - ] - }, "LAYOUT_60_ansi": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, - {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, - {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, - {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, - {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, - {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_hhkb": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, - {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, - {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, - {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, - {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, - {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4} ] }, "LAYOUT_60_iso": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, - {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, - {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, - {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, - {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, - {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_tsangan_hhkb": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, - {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, - {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, - {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, - {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, - {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [2, 8], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [3, 8], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [3, 9], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} ] } } -} +} \ No newline at end of file diff --git a/keyboards/chlx/ppr_merro60/ppr_merro60.c b/keyboards/chlx/ppr_merro60/ppr_merro60.c deleted file mode 100644 index ae80543406a6..000000000000 --- a/keyboards/chlx/ppr_merro60/ppr_merro60.c +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2023 Alexander Lee - -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 "quantum.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - setPinOutput(C7); - setPinOutput(F0); - matrix_init_user(); -} - -bool led_update_kb(led_t led_state) { - if(led_update_user(led_state)) { - writePin(C7, !led_state.caps_lock); - writePin(F0, !led_state.scroll_lock); - } - return true; -} - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - eeconfig_update_kb(0); - eeconfig_init_user(); -} From 4a6ed10edd15a4cd4748d5d704fc128fedef9104 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:40:07 -0500 Subject: [PATCH 13/23] Update keyboards/chlx/ppr_merro60/readme.md Co-authored-by: Joel Challis --- keyboards/chlx/ppr_merro60/readme.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md index 2c6307139780..c97475c50547 100644 --- a/keyboards/chlx/ppr_merro60/readme.md +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -10,13 +10,19 @@ Meant to be manufactured in 1.2mm. * Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b) * Hardware Supported: chlx PCB ppr.merro60.x.x.x -Enter bootloader mode by any of the following options - -- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard -- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region -- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot) - Make example for this keyboard (after setting up your build environment): make chlx/ppr_merro60:default +Flashing example for this keyboard: + + make chlx/ppr_merro60: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 bootloader mode by any of the following options - +- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard +- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region +- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot) From 3e36200e0d55016d7e971a449ec5042ba466cc59 Mon Sep 17 00:00:00 2001 From: chalex Date: Sun, 4 Feb 2024 00:40:45 -0500 Subject: [PATCH 14/23] remove 60_ansi_split_bs_rshift from list of avail layouts --- keyboards/chlx/ppr_merro60/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 6683c51b40ea..c6a58d708af8 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -28,7 +28,7 @@ "pid": "0x0603", "vid": "0x4358" }, - "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"], + "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { "layout": [ @@ -363,4 +363,4 @@ ] } } -} \ No newline at end of file +} From d257f319773e8f14975ce89a9b2ee758f455dd47 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sun, 4 Feb 2024 07:10:02 -0500 Subject: [PATCH 15/23] Update keyboards/chlx/ppr_merro60/keymaps/via/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/chlx/ppr_merro60/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk index 5f615ff62b74..36b7ba9cbc98 100644 --- a/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk +++ b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes LTO_ENABLE = yes - From 682c4bd55a666c7354b4fd150d7c0f2d2680291f Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sun, 4 Feb 2024 07:10:15 -0500 Subject: [PATCH 16/23] Update keyboards/chlx/ppr_merro60/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/chlx/ppr_merro60/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c index 7c8e0d253015..6d668def020f 100644 --- a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c +++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( QK_GESC, 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_GRV, 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP, KC_ENT, + 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_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_LSCR, KC_RALT, KC_RGUI, MO(1), KC_RCTL), From f3fa96e5a761c0af9ed52a76fa5f99876d427e7b Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sun, 4 Feb 2024 07:10:51 -0500 Subject: [PATCH 17/23] Update keyboards/chlx/ppr_merro60/readme.md Co-authored-by: Duncan Sutherland --- keyboards/chlx/ppr_merro60/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md index c97475c50547..14674ff9ab3c 100644 --- a/keyboards/chlx/ppr_merro60/readme.md +++ b/keyboards/chlx/ppr_merro60/readme.md @@ -2,10 +2,10 @@ ![ppr.merro60 PCB](https://i.imgur.com/xyQA68Xh.jpg) -A standard 60% format keyboard pcb with USB-C and unified daughterboard compatibility. -Has modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. -Has additional center flex cut. -Meant to be manufactured in 1.2mm. +- Standard 60% format keyboard PCB with USB-C and unified daughterboard compatibility. +- Modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount. +- Additional center flex cut. +- Meant to be manufactured in 1.2mm thickness. * Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b) * Hardware Supported: chlx PCB ppr.merro60.x.x.x From c5abf8a2992400dd6dcf91030c6d9715ec21874d Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:44:11 -0500 Subject: [PATCH 18/23] Update keyboards/chlx/ppr_merro60/info.json Co-authored-by: Duncan Sutherland --- keyboards/chlx/ppr_merro60/info.json | 257 +++++++++++++++++++++++++++ 1 file changed, 257 insertions(+) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index c6a58d708af8..69b9aae07b02 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -95,6 +95,263 @@ {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "LAYOUT_60_hhkb": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, From 059c1c94e3a602bdf593e1e126e8188bcf537528 Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:46:50 -0500 Subject: [PATCH 19/23] Update keyboards/chlx/ppr_merro60/info.json Co-authored-by: Duncan Sutherland --- keyboards/chlx/ppr_merro60/info.json | 328 +++++++++++++++++++++++++++ 1 file changed, 328 insertions(+) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 69b9aae07b02..8404085e223c 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -482,6 +482,334 @@ {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} ] }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [0, 8], "x": 1.5, "y": 4}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 4}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + {"matrix": [2, 1], "x": 5, "y": 0}, + {"matrix": [3, 0], "x": 6, "y": 0}, + {"matrix": [3, 1], "x": 7, "y": 0}, + {"matrix": [4, 0], "x": 8, "y": 0}, + {"matrix": [4, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 9], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 3], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [4, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 5], "x": 1.75, "y": 2}, + {"matrix": [1, 4], "x": 2.75, "y": 2}, + {"matrix": [1, 5], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 4], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 7], "x": 1.25, "y": 3}, + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [1, 7], "x": 3.25, "y": 3}, + {"matrix": [2, 6], "x": 4.25, "y": 3}, + {"matrix": [2, 7], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [4, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "LAYOUT_60_tsangan_hhkb": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, From f1bd7cbd6de3a4f304a9bc61c3b576422f49f68a Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:46:58 -0500 Subject: [PATCH 20/23] Update keyboards/chlx/ppr_merro60/info.json Co-authored-by: Duncan Sutherland --- keyboards/chlx/ppr_merro60/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 8404085e223c..27cacab3f0aa 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -28,7 +28,7 @@ "pid": "0x0603", "vid": "0x4358" }, - "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_tsangan_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_60_ansi": { "layout": [ From 6dd63890eea36dbf2ff45ef53dfe410927731941 Mon Sep 17 00:00:00 2001 From: chalex Date: Sun, 4 Feb 2024 15:00:18 -0500 Subject: [PATCH 21/23] add ansi variants --- .../keymaps/ansi_split_bs_rshift/keymap.c | 35 +++++++++++++++++++ .../ppr_merro60/keymaps/ansi_tsangan/keymap.c | 35 +++++++++++++++++++ .../ppr_merro60/keymaps/ansi_wkl/keymap.c | 35 +++++++++++++++++++ .../keymaps/ansi_wkl_split_bs_rshift/keymap.c | 35 +++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c create mode 100644 keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c new file mode 100644 index 000000000000..ebb2ced9f7a4 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_ansi_split_bs_rshift( + QK_GESC, 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_GRV, + 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_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, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL), + +[1] = LAYOUT_60_ansi_split_bs_rshift( + 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_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c new file mode 100644 index 000000000000..a51098d586b5 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_ansi_tsangan( + QK_GESC, 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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), + +[1] = LAYOUT_60_ansi_tsangan( + 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_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, + _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c new file mode 100644 index 000000000000..ca3686c071b3 --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_ansi_wkl( + QK_GESC, 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_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_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_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL), + +[1] = LAYOUT_60_ansi_wkl( + 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_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, + _______, _______, _______, _______, _______), +}; diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c new file mode 100644 index 000000000000..1f6ff266d8dc --- /dev/null +++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,35 @@ +/* +Copyright 2024 Alexander Lee + +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_60_ansi_wkl_split_bs_rshift( + QK_GESC, 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_GRV, + 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_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, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL), + +[1] = LAYOUT_60_ansi_wkl_split_bs_rshift( + 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_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT, + _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______), +}; From 8a1e3c56a8b47badbf21f40c7314f05f284b381b Mon Sep 17 00:00:00 2001 From: chalex Date: Sun, 4 Feb 2024 23:23:46 -0500 Subject: [PATCH 22/23] row / col was flipped from last working version. local corruption. update row/col and working test. --- keyboards/chlx/ppr_merro60/info.json | 1530 +++++++++++++------------- 1 file changed, 765 insertions(+), 765 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 27cacab3f0aa..9afad27351f4 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -18,8 +18,8 @@ "scroll_lock": "F0" }, "matrix_pins": { - "cols": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"], - "rows": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"] + "rows": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"], + "cols": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"] }, "processor": "atmega32u4", "url": "www.github.com/gaclee3b", @@ -33,918 +33,918 @@ "LAYOUT_60_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_ansi_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 0], "x": 1.5, "y": 4}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 5], "x": 12.5, "y": 4}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_ansi_wkl": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_ansi_wkl_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_hhkb": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [8, 0], "x": 1.5, "y": 4}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 5], "x": 12.5, "y": 4} ] }, "LAYOUT_60_iso": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_iso_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [3, 8], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_iso_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 0], "x": 1.5, "y": 4}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 5], "x": 12.5, "y": 4}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_iso_tsangan_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 0], "x": 1.5, "y": 4}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 5], "x": 12.5, "y": 4}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_iso_wkl": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_iso_wkl_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_tsangan_hhkb": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [0, 8], "x": 1.5, "y": 4}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [3, 8], "x": 4, "y": 4, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 4}, - {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 0], "x": 1.5, "y": 4}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [8, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 5], "x": 12.5, "y": 4}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_all": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [1, 1], "x": 3, "y": 0}, - {"matrix": [2, 0], "x": 4, "y": 0}, - {"matrix": [2, 1], "x": 5, "y": 0}, - {"matrix": [3, 0], "x": 6, "y": 0}, - {"matrix": [3, 1], "x": 7, "y": 0}, - {"matrix": [4, 0], "x": 8, "y": 0}, - {"matrix": [4, 1], "x": 9, "y": 0}, - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [6, 0], "x": 12, "y": 0}, - {"matrix": [6, 1], "x": 13, "y": 0}, - {"matrix": [6, 9], "x": 14, "y": 0}, - {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [0, 3], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [9, 6], "x": 14, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, {"matrix": [2, 2], "x": 4.5, "y": 1}, - {"matrix": [2, 3], "x": 5.5, "y": 1}, - {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, {"matrix": [3, 3], "x": 7.5, "y": 1}, - {"matrix": [4, 2], "x": 8.5, "y": 1}, - {"matrix": [4, 3], "x": 9.5, "y": 1}, - {"matrix": [5, 2], "x": 10.5, "y": 1}, - {"matrix": [5, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [0, 4], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [0, 5], "x": 1.75, "y": 2}, - {"matrix": [1, 4], "x": 2.75, "y": 2}, - {"matrix": [1, 5], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [3, 4], "x": 6.75, "y": 2}, - {"matrix": [3, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, {"matrix": [4, 4], "x": 8.75, "y": 2}, - {"matrix": [4, 5], "x": 9.75, "y": 2}, - {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, {"matrix": [5, 5], "x": 11.75, "y": 2}, - {"matrix": [6, 4], "x": 12.75, "y": 2}, - {"matrix": [6, 5], "x": 13.75, "y": 2, "w": 1.25}, - {"matrix": [0, 6], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [0, 7], "x": 1.25, "y": 3}, - {"matrix": [1, 6], "x": 2.25, "y": 3}, - {"matrix": [1, 7], "x": 3.25, "y": 3}, - {"matrix": [2, 6], "x": 4.25, "y": 3}, - {"matrix": [2, 7], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [4, 6], "x": 8.25, "y": 3}, - {"matrix": [4, 7], "x": 9.25, "y": 3}, - {"matrix": [5, 6], "x": 10.25, "y": 3}, - {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [6, 7], "x": 14, "y": 3}, - {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [0, 8], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [2, 9], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [2, 8], "x": 3.75, "y": 4, "w": 2.75}, - {"matrix": [3, 8], "x": 6.5, "y": 4, "w": 1.25}, - {"matrix": [3, 9], "x": 7.75, "y": 4, "w": 2.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [6, 8], "x": 13.75, "y": 4, "w": 1.25} + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [8, 3], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] } } From 386edb1fcbbaa02a0013efd372b59cb684e041d7 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Fri, 16 Feb 2024 16:33:32 -0700 Subject: [PATCH 23/23] Apply suggestions from code review --- keyboards/chlx/ppr_merro60/config.h | 5 ----- keyboards/chlx/ppr_merro60/info.json | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/keyboards/chlx/ppr_merro60/config.h b/keyboards/chlx/ppr_merro60/config.h index a77708e00aed..bdeed0c824e1 100644 --- a/keyboards/chlx/ppr_merro60/config.h +++ b/keyboards/chlx/ppr_merro60/config.h @@ -17,10 +17,5 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* VIA related config */ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json index 9afad27351f4..f8f45232a1a6 100644 --- a/keyboards/chlx/ppr_merro60/info.json +++ b/keyboards/chlx/ppr_merro60/info.json @@ -12,6 +12,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "C7", "on_state": 0,