From 7d2f70f39852fbc8e7954792156cc90921c39f14 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 12 Jul 2021 23:32:54 -0700
Subject: Checker Boards NOP60 touch-up (#13526)
* apply human-friendly formatting to info.json
* fix JSON tree errors in info.json
* rename layout macros
- rename LAYOUT_2x3u to LAYOUT_60_tsangan_hhkb_split_space
- rename LAYOUT_7u to LAYOUT_60_tsangan_hhkb
* rename 2x3u keymap to default
---
keyboards/checkerboards/nop60/info.json | 148 ++++++++++++++++++++-
.../checkerboards/nop60/keymaps/2x3u/config.h | 23 ----
.../checkerboards/nop60/keymaps/2x3u/keymap.c | 83 ------------
keyboards/checkerboards/nop60/keymaps/7u/keymap.c | 6 +-
.../checkerboards/nop60/keymaps/default/config.h | 23 ++++
.../checkerboards/nop60/keymaps/default/keymap.c | 83 ++++++++++++
keyboards/checkerboards/nop60/keymaps/via/keymap.c | 8 +-
keyboards/checkerboards/nop60/nop60.h | 4 +-
8 files changed, 259 insertions(+), 119 deletions(-)
delete mode 100644 keyboards/checkerboards/nop60/keymaps/2x3u/config.h
delete mode 100644 keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c
create mode 100644 keyboards/checkerboards/nop60/keymaps/default/config.h
create mode 100644 keyboards/checkerboards/nop60/keymaps/default/keymap.c
diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json
index 82ff7229fa..ab68c0cdac 100644
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@@ -4,12 +4,152 @@
"maintainer": "nasp",
"width": 15,
"height": 5,
+ "layout_aliases": {
+ "LAYOUT_2x3u": "LAYOUT_60_tsangan_hhkb_split_space",
+ "LAYOUT_7u": "LAYOUT_60_tsangan_hhkb"
+ },
"layouts": {
- "LAYOUT": {
- "2x3u": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+ "LAYOUT_60_tsangan_hhkb_split_space": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"!", "x":1, "y":0},
+ {"label":"@", "x":2, "y":0},
+ {"label":"#", "x":3, "y":0},
+ {"label":"$", "x":4, "y":0},
+ {"label":"%", "x":5, "y":0},
+ {"label":"^", "x":6, "y":0},
+ {"label":"&", "x":7, "y":0},
+ {"label":"*", "x":8, "y":0},
+ {"label":"(", "x":9, "y":0},
+ {"label":")", "x":10, "y":0},
+ {"label":"_", "x":11, "y":0},
+ {"label":"+", "x":12, "y":0},
+ {"label":"~", "x":13, "y":0},
+ {"label":"Bksp", "x":14, "y":0},
+
+ {"label":"Tab", "x":0, "y":1, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1},
+ {"label":"W", "x":2.5, "y":1},
+ {"label":"E", "x":3.5, "y":1},
+ {"label":"R", "x":4.5, "y":1},
+ {"label":"T", "x":5.5, "y":1},
+ {"label":"Y", "x":6.5, "y":1},
+ {"label":"U", "x":7.5, "y":1},
+ {"label":"I", "x":8.5, "y":1},
+ {"label":"O", "x":9.5, "y":1},
+ {"label":"P", "x":10.5, "y":1},
+ {"label":"{", "x":11.5, "y":1},
+ {"label":"}", "x":12.5, "y":1},
+ {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+ {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+ {"label":"A", "x":1.75, "y":2},
+ {"label":"S", "x":2.75, "y":2},
+ {"label":"D", "x":3.75, "y":2},
+ {"label":"F", "x":4.75, "y":2},
+ {"label":"G", "x":5.75, "y":2},
+ {"label":"H", "x":6.75, "y":2},
+ {"label":"J", "x":7.75, "y":2},
+ {"label":"K", "x":8.75, "y":2},
+ {"label":"L", "x":9.75, "y":2},
+ {"label":":", "x":10.75, "y":2},
+ {"label":"\"", "x":11.75, "y":2},
+ {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+ {"label":"Shift", "x":0, "y":3, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3},
+ {"label":"X", "x":3.25, "y":3},
+ {"label":"C", "x":4.25, "y":3},
+ {"label":"V", "x":5.25, "y":3},
+ {"label":"B", "x":6.25, "y":3},
+ {"label":"N", "x":7.25, "y":3},
+ {"label":"M", "x":8.25, "y":3},
+ {"label":"<", "x":9.25, "y":3},
+ {"label":">", "x":10.25, "y":3},
+ {"label":"?", "x":11.25, "y":3},
+ {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+ {"label":"Fn", "x":14, "y":3},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+ {"label":"Win", "x":1.5, "y":4},
+ {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":3},
+ {"x":7, "y":4},
+ {"x":8, "y":4, "w":3},
+ {"label":"Alt", "x":11, "y":4, "w":1.5},
+ {"label":"Win", "x":12.5, "y":4},
+ {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+ ]
},
- "LAYOUT": {
- "7u": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"!", "x":1, "y":0},
+ {"label":"@", "x":2, "y":0},
+ {"label":"#", "x":3, "y":0},
+ {"label":"$", "x":4, "y":0},
+ {"label":"%", "x":5, "y":0},
+ {"label":"^", "x":6, "y":0},
+ {"label":"&", "x":7, "y":0},
+ {"label":"*", "x":8, "y":0},
+ {"label":"(", "x":9, "y":0},
+ {"label":")", "x":10, "y":0},
+ {"label":"_", "x":11, "y":0},
+ {"label":"+", "x":12, "y":0},
+ {"label":"~", "x":13, "y":0},
+ {"label":"Bksp", "x":14, "y":0},
+
+ {"label":"Tab", "x":0, "y":1, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1},
+ {"label":"W", "x":2.5, "y":1},
+ {"label":"E", "x":3.5, "y":1},
+ {"label":"R", "x":4.5, "y":1},
+ {"label":"T", "x":5.5, "y":1},
+ {"label":"Y", "x":6.5, "y":1},
+ {"label":"U", "x":7.5, "y":1},
+ {"label":"I", "x":8.5, "y":1},
+ {"label":"O", "x":9.5, "y":1},
+ {"label":"P", "x":10.5, "y":1},
+ {"label":"{", "x":11.5, "y":1},
+ {"label":"}", "x":12.5, "y":1},
+ {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+ {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+ {"label":"A", "x":1.75, "y":2},
+ {"label":"S", "x":2.75, "y":2},
+ {"label":"D", "x":3.75, "y":2},
+ {"label":"F", "x":4.75, "y":2},
+ {"label":"G", "x":5.75, "y":2},
+ {"label":"H", "x":6.75, "y":2},
+ {"label":"J", "x":7.75, "y":2},
+ {"label":"K", "x":8.75, "y":2},
+ {"label":"L", "x":9.75, "y":2},
+ {"label":":", "x":10.75, "y":2},
+ {"label":"\"", "x":11.75, "y":2},
+ {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+ {"label":"Shift", "x":0, "y":3, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3},
+ {"label":"X", "x":3.25, "y":3},
+ {"label":"C", "x":4.25, "y":3},
+ {"label":"V", "x":5.25, "y":3},
+ {"label":"B", "x":6.25, "y":3},
+ {"label":"N", "x":7.25, "y":3},
+ {"label":"M", "x":8.25, "y":3},
+ {"label":"<", "x":9.25, "y":3},
+ {"label":">", "x":10.25, "y":3},
+ {"label":"?", "x":11.25, "y":3},
+ {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+ {"label":"Fn", "x":14, "y":3},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+ {"label":"Win", "x":1.5, "y":4},
+ {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"label":"Alt", "x":11, "y":4, "w":1.5},
+ {"label":"Win", "x":12.5, "y":4},
+ {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+ ]
}
}
}
diff --git a/keyboards/checkerboards/nop60/keymaps/2x3u/config.h b/keyboards/checkerboards/nop60/keymaps/2x3u/config.h
deleted file mode 100644
index 598074ad2c..0000000000
--- a/keyboards/checkerboards/nop60/keymaps/2x3u/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /*
- Copyright 2020 Alec Penland
- Copyright 2020 Garret Gartner
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
- */
-
-#pragma once
-
-#define TAPPING_TERM 175
-
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c b/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c
deleted file mode 100644
index eb05ab1364..0000000000
--- a/keyboards/checkerboards/nop60/keymaps/2x3u/keymap.c
+++ /dev/null
@@ -1,83 +0,0 @@
- /*
- Copyright 2021 Nathan Spears
-
- 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] = {
- /* Default QWERTY layer
- * ,-------------------------------------------------------------.
- * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ |Del|
- * |-------------------------------------------------------------|
- * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
- * |-------------------------------------------------------------|
- * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
- * |-------------------------------------------------------------|
- * | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | FN |
- * |-------------------------------------------------------------|
- * |Ctrl |GUI |Alt |Space |BLTOG |Space |Alt |GUI |Ctrl |
- * `-------------------------------------------------------------'
- */
- [0] = LAYOUT_2x3u(
- KC_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_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
- KC_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_SPC,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, BL_TOGG, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
- ),
- /* Main Numbers, Symbols & Function Layer (MOMENTARY)
- * ,------------------------------------------------------------------------------.
- * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del | |
- * |------------------------------------------------------------------------------|
- * |RTOG |RMOD| UP | | | | | | | | | | | | |
- * |------------------------------------------------------------------------------|
- * |BRTHE |LFT|DWN|RGHT| | | | | | | | | | |
- * |------------------------------------------------------------------------------|
- * |BINC |BDEC|BTOG| | | | | | | | | | | |
- * |------------------------------------------------------------------------------|
- * | | | | | | | | |RESET |
- * `------------------------------------------------------------------------------'
- */
- [1] = LAYOUT_2x3u(
- 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, _______,
- RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RESET
- ),
-
- /* ALTERNATE Function layer (MOMENTARY)
- * ,------------------------------------------------------------------------------.
- * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del | |
- * |------------------------------------------------------------------------------|
- * |RTOG |RMOD| UP | | | | | | | | | | | | |
- * |------------------------------------------------------------------------------|
- * |BRTHE |LFT|DWN|RGHT| | | | | | | | | | |
- * |------------------------------------------------------------------------------|
- * |BINC |BDEC|BTOG| | | | | | | | | | | |
- * |------------------------------------------------------------------------------|
- * | | | | | | | | |RESET |
- * `------------------------------------------------------------------------------'
- */
- [2] = LAYOUT_2x3u(
- 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, _______,
- RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, RESET
- )
-};
diff --git a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
index 1d230c3632..61bca2616d 100644
--- a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Ctrl |GUI |Alt | Space |Alt |GUI |Ctrl |
* `-------------------------------------------------------------'
*/
- [0] = LAYOUT_7u(
+ [0] = LAYOUT_60_tsangan_hhkb(
KC_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_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_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,
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | |RESET |
* `------------------------------------------------------------------------------'
*/
- [1] = LAYOUT_7u(
+ [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, _______,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | |RESET |
* `------------------------------------------------------------------------------'
*/
- [2] = LAYOUT_7u(
+ [2] = 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, _______,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/checkerboards/nop60/keymaps/default/config.h b/keyboards/checkerboards/nop60/keymaps/default/config.h
new file mode 100644
index 0000000000..598074ad2c
--- /dev/null
+++ b/keyboards/checkerboards/nop60/keymaps/default/config.h
@@ -0,0 +1,23 @@
+ /*
+ Copyright 2020 Alec Penland
+ Copyright 2020 Garret Gartner
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ */
+
+#pragma once
+
+#define TAPPING_TERM 175
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/nop60/keymaps/default/keymap.c b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ef3ff4b8bd
--- /dev/null
+++ b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
@@ -0,0 +1,83 @@
+ /*
+ Copyright 2021 Nathan Spears
+
+ 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] = {
+ /* Default QWERTY layer
+ * ,-------------------------------------------------------------.
+ * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ |Del|
+ * |-------------------------------------------------------------|
+ * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
+ * |-------------------------------------------------------------|
+ * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
+ * |-------------------------------------------------------------|
+ * | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | FN |
+ * |-------------------------------------------------------------|
+ * |Ctrl |GUI |Alt |Space |BLTOG |Space |Alt |GUI |Ctrl |
+ * `-------------------------------------------------------------'
+ */
+ [0] = LAYOUT_60_tsangan_hhkb_split_space(
+ KC_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_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
+ KC_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_SPC,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, BL_TOGG, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+ ),
+ /* Main Numbers, Symbols & Function Layer (MOMENTARY)
+ * ,------------------------------------------------------------------------------.
+ * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del | |
+ * |------------------------------------------------------------------------------|
+ * |RTOG |RMOD| UP | | | | | | | | | | | | |
+ * |------------------------------------------------------------------------------|
+ * |BRTHE |LFT|DWN|RGHT| | | | | | | | | | |
+ * |------------------------------------------------------------------------------|
+ * |BINC |BDEC|BTOG| | | | | | | | | | | |
+ * |------------------------------------------------------------------------------|
+ * | | | | | | | | |RESET |
+ * `------------------------------------------------------------------------------'
+ */
+ [1] = LAYOUT_60_tsangan_hhkb_split_space(
+ 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, _______,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, RESET
+ ),
+
+ /* ALTERNATE Function layer (MOMENTARY)
+ * ,------------------------------------------------------------------------------.
+ * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |Del | |
+ * |------------------------------------------------------------------------------|
+ * |RTOG |RMOD| UP | | | | | | | | | | | | |
+ * |------------------------------------------------------------------------------|
+ * |BRTHE |LFT|DWN|RGHT| | | | | | | | | | |
+ * |------------------------------------------------------------------------------|
+ * |BINC |BDEC|BTOG| | | | | | | | | | | |
+ * |------------------------------------------------------------------------------|
+ * | | | | | | | | |RESET |
+ * `------------------------------------------------------------------------------'
+ */
+ [2] = LAYOUT_60_tsangan_hhkb_split_space(
+ 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, _______,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, RESET
+ )
+};
diff --git a/keyboards/checkerboards/nop60/keymaps/via/keymap.c b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
index 06714115f5..1fbed16ca1 100644
--- a/keyboards/checkerboards/nop60/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/nop60/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴───┴────┴──────────┴────────┴────┴────┘ │ ← │ ↓ │ → │
* └───┴───┴───┘
*/
- [_BASE] = LAYOUT_2x3u(
+ [_BASE] = LAYOUT_60_tsangan_hhkb_split_space(
KC_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_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_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,
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴───┴────┴──────────┴────────┴────┴────┘ │ │ │ │
* └───┴───┴───┘
*/
- [_FN1] = LAYOUT_2x3u(
+ [_FN1] = LAYOUT_60_tsangan_hhkb_split_space(
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, _______,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴────┴────┴──────────┴────────┴────┴────┘ │ │ │ │
* └───┴───┴───┘
*/
- [_FN2] = LAYOUT_2x3u(
+ [_FN2] = LAYOUT_60_tsangan_hhkb_split_space(
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, _______,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, RESET
),
- [_VIA] = LAYOUT_2x3u(
+ [_VIA] = LAYOUT_60_tsangan_hhkb_split_space(
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, _______,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/checkerboards/nop60/nop60.h b/keyboards/checkerboards/nop60/nop60.h
index 57da9d51ed..6e98e854b7 100644
--- a/keyboards/checkerboards/nop60/nop60.h
+++ b/keyboards/checkerboards/nop60/nop60.h
@@ -21,7 +21,7 @@
#define xxx KC_NO
-#define LAYOUT_2x3u( \
+#define LAYOUT_60_tsangan_hhkb_split_space( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
@@ -34,7 +34,7 @@
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, xxx, k3D }, \
{ k40, k41, k42, xxx, k44, xxx, k46, xxx, k48, xxx, k4A, k4B, k4C, k4D } \
}
-#define LAYOUT_7u( \
+#define LAYOUT_60_tsangan_hhkb( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
--
cgit v1.2.3
From 92a029d6f39e2086ec6e5261c42925eeb0e93bc2 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 12 Jul 2021 23:44:56 -0700
Subject: Ergonomic Vertical Keyboard (EVK) handwired info.json touch-up
(#13527)
* scale layout data
Seems the KLE data that was imported to make the original file was scaled 1.25x. This commit removes the scaling.
* human-friendly formatting
Insert line breaks between physical layout rows.
* remove instances where width or height is set to 1
The width and height of a key is defaulted to 1 if not provided by the JSON data, so there's no reason to set it manually.
---
keyboards/handwired/evk/v1_3/info.json | 189 +++++++++++++++++----------------
1 file changed, 97 insertions(+), 92 deletions(-)
diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json
index 65000a97b2..745a72ed3c 100644
--- a/keyboards/handwired/evk/v1_3/info.json
+++ b/keyboards/handwired/evk/v1_3/info.json
@@ -2,101 +2,106 @@
"keyboard_name": "Ergonomic Vertical Keyboard (EVK) version 1.3 with Teensy 2.0",
"url": "https://github.com/YangPiCui/ErgonomicVerticalKeyboard",
"maintainer": "YangPiCui",
- "width": 22.75,
- "height": 8,
+ "width": 18.2,
+ "height": 6.4,
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k0A", "x":0, "y":0.5, "w":1.25, "h":1.25},
- {"label":"k0B", "x":1.25, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0C", "x":2.5, "y":0, "w":1.25, "h":1.25},
- {"label":"k0D", "x":3.75, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0E", "x":5, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0F", "x":6.25, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0G", "x":8.75, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0H", "x":10, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0I", "x":11.25, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0J", "x":12.5, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0K", "x":15.25, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0L", "x":16.5, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0M", "x":17.75, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0N", "x":19, "y":0, "w":1.25, "h":1.25},
- {"label":"k0O", "x":20.25, "y":0.25, "w":1.25, "h":1.25},
- {"label":"k0P", "x":21.5, "y":0.5, "w":1.25, "h":1.25},
- {"label":"k1A", "x":0, "y":1.75, "w":1.25, "h":1.25},
- {"label":"k1B", "x":1.25, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1C", "x":2.5, "y":1.25, "w":1.25, "h":1.25},
- {"label":"k1D", "x":3.75, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1E", "x":5, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1F", "x":6.25, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1G", "x":8.75, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1H", "x":10, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1I", "x":11.25, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1J", "x":12.5, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1K", "x":15.25, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1L", "x":16.5, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1M", "x":17.75, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1N", "x":19, "y":1.25, "w":1.25, "h":1.25},
- {"label":"k1O", "x":20.25, "y":1.5, "w":1.25, "h":1.25},
- {"label":"k1P", "x":21.5, "y":1.75, "w":1.25, "h":1.25},
- {"label":"k2A", "x":0, "y":3, "w":1.25, "h":1.25},
- {"label":"k2B", "x":1.25, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2C", "x":2.5, "y":2.5, "w":1.25, "h":1.25},
- {"label":"k2D", "x":3.75, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2E", "x":5, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2F", "x":6.25, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2G", "x":8.75, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2H", "x":10, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2I", "x":11.25, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2J", "x":12.5, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2K", "x":15.25, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2L", "x":16.5, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2M", "x":17.75, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2N", "x":19, "y":2.5, "w":1.25, "h":1.25},
- {"label":"k2O", "x":20.25, "y":2.75, "w":1.25, "h":1.25},
- {"label":"k2P", "x":21.5, "y":3, "w":1.25, "h":1.25},
- {"label":"k3A", "x":0, "y":4.25, "w":1.25, "h":1.25},
- {"label":"k3B", "x":1.25, "y":4, "w":1.25, "h":1.25},
- {"label":"k3C", "x":2.5, "y":3.75, "w":1.25, "h":1.25},
- {"label":"k3D", "x":3.75, "y":4, "w":1.25, "h":1.25},
- {"label":"k3E", "x":5, "y":4, "w":1.25, "h":1.25},
- {"label":"k3G", "x":8.75, "y":4, "w":1.25, "h":1.25},
- {"label":"k3H", "x":10, "y":4, "w":1.25, "h":1.25},
- {"label":"k3I", "x":11.25, "y":4, "w":1.25, "h":1.25},
- {"label":"k3J", "x":12.5, "y":4, "w":1.25, "h":1.25},
- {"label":"k3L", "x":16.5, "y":4, "w":1.25, "h":1.25},
- {"label":"k3M", "x":17.75, "y":4, "w":1.25, "h":1.25},
- {"label":"k3N", "x":19, "y":3.75, "w":1.25, "h":1.25},
- {"label":"k3O", "x":20.25, "y":4, "w":1.25, "h":1.25},
- {"label":"k3P", "x":21.5, "y":4.25, "w":1.25, "h":1.25},
- {"label":"k4A", "x":0, "y":5.5, "w":1.25, "h":1.25},
- {"label":"k4B", "x":1.25, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4C", "x":2.5, "y":5, "w":1.25, "h":1.25},
- {"label":"k4D", "x":3.75, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4E", "x":5, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4F", "x":6.5, "y":5.5, "w":1.25, "h":1.25},
- {"label":"k4G", "x":8.75, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4H", "x":10, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4I", "x":11.25, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4J", "x":12.5, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4K", "x":15, "y":5.5, "w":1.25, "h":1.25},
- {"label":"k4L", "x":16.5, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4M", "x":17.75, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4N", "x":19, "y":5, "w":1.25, "h":1.25},
- {"label":"k4O", "x":20.25, "y":5.25, "w":1.25, "h":1.25},
- {"label":"k4P", "x":21.5, "y":5.5, "w":1.25, "h":1.25},
- {"label":"k5B", "x":1.25, "y":6.5, "w":1.25, "h":1.25},
- {"label":"k5C", "x":2.5, "y":6.25, "w":1.25, "h":1.25},
- {"label":"k5E", "x":5.25, "y":6.75, "w":1.25, "h":1.25},
- {"label":"k5F", "x":6.55, "y":6.75, "w":1.25, "h":1.25},
- {"label":"k5G", "x":8.75, "y":6.5, "w":1.25, "h":1.25},
- {"label":"k5H", "x":10, "y":6.5, "w":1.25, "h":1.25},
- {"label":"k5I", "x":11.25, "y":6.5, "w":1.25, "h":1.25},
- {"label":"k5J", "x":12.5, "y":6.5, "w":1.25, "h":1.25},
- {"label":"k5K", "x":15, "y":6.75, "w":1.25, "h":1.25},
- {"label":"k5L", "x":16.25, "y":6.75, "w":1.25, "h":1.25},
- {"label":"k5N", "x":19, "y":6.25, "w":1.25, "h":1.25},
- {"label":"k5O", "x":20.25, "y":6.5, "w":1.25, "h":1.25}
+ {"label":"k0A", "x":0, "y":0.4},
+ {"label":"k0B", "x":1, "y":0.2},
+ {"label":"k0C", "x":2, "y":0},
+ {"label":"k0D", "x":3, "y":0.2},
+ {"label":"k0E", "x":4, "y":0.2},
+ {"label":"k0F", "x":5, "y":0.2},
+ {"label":"k0G", "x":7, "y":0.2},
+ {"label":"k0H", "x":8, "y":0.2},
+ {"label":"k0I", "x":9, "y":0.2},
+ {"label":"k0J", "x":10, "y":0.2},
+ {"label":"k0K", "x":12.2, "y":0.2},
+ {"label":"k0L", "x":13.2, "y":0.2},
+ {"label":"k0M", "x":14.2, "y":0.2},
+ {"label":"k0N", "x":15.2, "y":0},
+ {"label":"k0O", "x":16.2, "y":0.2},
+ {"label":"k0P", "x":17.2, "y":0.4},
+
+ {"label":"k1A", "x":0, "y":1.4},
+ {"label":"k1B", "x":1, "y":1.2},
+ {"label":"k1C", "x":2, "y":1},
+ {"label":"k1D", "x":3, "y":1.2},
+ {"label":"k1E", "x":4, "y":1.2},
+ {"label":"k1F", "x":5, "y":1.2},
+ {"label":"k1G", "x":7, "y":1.2},
+ {"label":"k1H", "x":8, "y":1.2},
+ {"label":"k1I", "x":9, "y":1.2},
+ {"label":"k1J", "x":10, "y":1.2},
+ {"label":"k1K", "x":12.2, "y":1.2},
+ {"label":"k1L", "x":13.2, "y":1.2},
+ {"label":"k1M", "x":14.2, "y":1.2},
+ {"label":"k1N", "x":15.2, "y":1},
+ {"label":"k1O", "x":16.2, "y":1.2},
+ {"label":"k1P", "x":17.2, "y":1.4},
+
+ {"label":"k2A", "x":0, "y":2.4},
+ {"label":"k2B", "x":1, "y":2.2},
+ {"label":"k2C", "x":2, "y":2},
+ {"label":"k2D", "x":3, "y":2.2},
+ {"label":"k2E", "x":4, "y":2.2},
+ {"label":"k2F", "x":5, "y":2.2},
+ {"label":"k2G", "x":7, "y":2.2},
+ {"label":"k2H", "x":8, "y":2.2},
+ {"label":"k2I", "x":9, "y":2.2},
+ {"label":"k2J", "x":10, "y":2.2},
+ {"label":"k2K", "x":12.2, "y":2.2},
+ {"label":"k2L", "x":13.2, "y":2.2},
+ {"label":"k2M", "x":14.2, "y":2.2},
+ {"label":"k2N", "x":15.2, "y":2},
+ {"label":"k2O", "x":16.2, "y":2.2},
+ {"label":"k2P", "x":17.2, "y":2.4},
+
+ {"label":"k3A", "x":0, "y":3.4},
+ {"label":"k3B", "x":1, "y":3.2},
+ {"label":"k3C", "x":2, "y":3},
+ {"label":"k3D", "x":3, "y":3.2},
+ {"label":"k3E", "x":4, "y":3.2},
+ {"label":"k3G", "x":7, "y":3.2},
+ {"label":"k3H", "x":8, "y":3.2},
+ {"label":"k3I", "x":9, "y":3.2},
+ {"label":"k3J", "x":10, "y":3.2},
+ {"label":"k3L", "x":13.2, "y":3.2},
+ {"label":"k3M", "x":14.2, "y":3.2},
+ {"label":"k3N", "x":15.2, "y":3},
+ {"label":"k3O", "x":16.2, "y":3.2},
+ {"label":"k3P", "x":17.2, "y":3.4},
+
+ {"label":"k4A", "x":0, "y":4.4},
+ {"label":"k4B", "x":1, "y":4.2},
+ {"label":"k4C", "x":2, "y":4},
+ {"label":"k4D", "x":3, "y":4.2},
+ {"label":"k4E", "x":4, "y":4.2},
+ {"label":"k4F", "x":5.2, "y":4.4},
+ {"label":"k4G", "x":7, "y":4.2},
+ {"label":"k4H", "x":8, "y":4.2},
+ {"label":"k4I", "x":9, "y":4.2},
+ {"label":"k4J", "x":10, "y":4.2},
+ {"label":"k4K", "x":12, "y":4.4},
+ {"label":"k4L", "x":13.2, "y":4.2},
+ {"label":"k4M", "x":14.2, "y":4.2},
+ {"label":"k4N", "x":15.2, "y":4},
+ {"label":"k4O", "x":16.2, "y":4.2},
+ {"label":"k4P", "x":17.2, "y":4.4},
+
+ {"label":"k5B", "x":1, "y":5.2},
+ {"label":"k5C", "x":2, "y":5},
+ {"label":"k5E", "x":4.2, "y":5.4},
+ {"label":"k5F", "x":5.24, "y":5.4},
+ {"label":"k5G", "x":7, "y":5.2},
+ {"label":"k5H", "x":8, "y":5.2},
+ {"label":"k5I", "x":9, "y":5.2},
+ {"label":"k5J", "x":10, "y":5.2},
+ {"label":"k5K", "x":12, "y":5.4},
+ {"label":"k5L", "x":13, "y":5.4},
+ {"label":"k5N", "x":15.2, "y":5},
+ {"label":"k5O", "x":16.2, "y":5.2}
]
}
}
--
cgit v1.2.3
From 6b6ee5fa286c067fbea7da2b5274d47aac84d253 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 13 Jul 2021 00:18:07 -0700
Subject: 1UP Keyboards 1UP60HTE layout macro touch-up (#13529)
* rename LAYOUT_tsangan to LAYOUT_60_tsangan_hhkb
... and enable Community Layout support.
* use four-space indent and QMK-native keycode aliases
* rules.mk touch-up
- remove Bootloader selection header comments
- unify Build Options comment header to QMK template
- align inline comments
* readme.md touch-up
- convert metadata to list
- add Flashing command
* move layout macro alias to info.json
* apply friendly formatting to info.json
* restore badger keymap to previous (don't edit user keymap)
---
keyboards/1upkeyboards/1up60hte/1up60hte.h | 40 +++---
keyboards/1upkeyboards/1up60hte/info.json | 151 +++++++++++++++++++--
.../1upkeyboards/1up60hte/keymaps/default/keymap.c | 26 ++--
.../1upkeyboards/1up60hte/keymaps/hhkb/keymap.c | 26 ++--
.../1upkeyboards/1up60hte/keymaps/via/keymap.c | 52 +++----
keyboards/1upkeyboards/1up60hte/readme.md | 12 +-
keyboards/1upkeyboards/1up60hte/rules.mk | 35 +++--
7 files changed, 242 insertions(+), 100 deletions(-)
diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.h b/keyboards/1upkeyboards/1up60hte/1up60hte.h
index b6d3c8e0d1..c64bcb124d 100644
--- a/keyboards/1upkeyboards/1up60hte/1up60hte.h
+++ b/keyboards/1upkeyboards/1up60hte/1up60hte.h
@@ -19,31 +19,31 @@ along with this program. If not, see .
#include "quantum.h"
-#define LAYOUT_tsangan( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K413, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K400, K401, K402, K406, K410, K411, K412 \
+#define LAYOUT_60_tsangan_hhkb( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K413, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
+ K400, K401, K402, K406, K410, K411, K412 \
) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
- { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413 } \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
+ { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413 } \
}
/* HHKB Variant */
#define LAYOUT_60_hhkb( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K413, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K401, K402, K406, K410, K411 \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
+ K401, K402, K406, K410, K411 \
) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
- { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413 } \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
+ { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413 } \
}
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 86521d36bd..bc98d875e4 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -1,15 +1,150 @@
{
- "keyboard_name": "1up60hte",
- "url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
- "maintainer": "1upkeyboards",
- "width": 15,
- "height": 5,
+ "keyboard_name": "1up60hte",
+ "url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
+ "maintainer": "1upkeyboards",
+ "width": 15,
+ "height": 5,
+ "layout_aliases": {
+ "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
+ },
"layouts": {
- "LAYOUT_tsangan": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4}, {"label":"Meta", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Meta", "x":11, "y":4, "w":1.5}, {"label":"Alt", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"!", "x":1, "y":0},
+ {"label":"@", "x":2, "y":0},
+ {"label":"#", "x":3, "y":0},
+ {"label":"$", "x":4, "y":0},
+ {"label":"%", "x":5, "y":0},
+ {"label":"^", "x":6, "y":0},
+ {"label":"&", "x":7, "y":0},
+ {"label":"*", "x":8, "y":0},
+ {"label":"(", "x":9, "y":0},
+ {"label":")", "x":10, "y":0},
+ {"label":"_", "x":11, "y":0},
+ {"label":"+", "x":12, "y":0},
+ {"label":"|", "x":13, "y":0},
+ {"label":"~", "x":14, "y":0},
+
+ {"label":"Tab", "x":0, "y":1, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1},
+ {"label":"W", "x":2.5, "y":1},
+ {"label":"E", "x":3.5, "y":1},
+ {"label":"R", "x":4.5, "y":1},
+ {"label":"T", "x":5.5, "y":1},
+ {"label":"Y", "x":6.5, "y":1},
+ {"label":"U", "x":7.5, "y":1},
+ {"label":"I", "x":8.5, "y":1},
+ {"label":"O", "x":9.5, "y":1},
+ {"label":"P", "x":10.5, "y":1},
+ {"label":"{", "x":11.5, "y":1},
+ {"label":"}", "x":12.5, "y":1},
+ {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+ {"label":"Control", "x":0, "y":2, "w":1.75},
+ {"label":"A", "x":1.75, "y":2},
+ {"label":"S", "x":2.75, "y":2},
+ {"label":"D", "x":3.75, "y":2},
+ {"label":"F", "x":4.75, "y":2},
+ {"label":"G", "x":5.75, "y":2},
+ {"label":"H", "x":6.75, "y":2},
+ {"label":"J", "x":7.75, "y":2},
+ {"label":"K", "x":8.75, "y":2},
+ {"label":"L", "x":9.75, "y":2},
+ {"label":":", "x":10.75, "y":2},
+ {"label":"\"", "x":11.75, "y":2},
+ {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+ {"label":"Shift", "x":0, "y":3, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3},
+ {"label":"X", "x":3.25, "y":3},
+ {"label":"C", "x":4.25, "y":3},
+ {"label":"V", "x":5.25, "y":3},
+ {"label":"B", "x":6.25, "y":3},
+ {"label":"N", "x":7.25, "y":3},
+ {"label":"M", "x":8.25, "y":3},
+ {"label":"<", "x":9.25, "y":3},
+ {"label":">", "x":10.25, "y":3},
+ {"label":"?", "x":11.25, "y":3},
+ {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+ {"label":"Fn", "x":14, "y":3},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+ {"label":"Alt", "x":1.5, "y":4},
+ {"label":"Meta", "x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"label":"Meta", "x":11, "y":4, "w":1.5},
+ {"label":"Alt", "x":12.5, "y":4},
+ {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+ ]
},
"LAYOUT_60_hhkb": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Alt", "x":1.5, "y":4}, {"label":"Meta", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Meta", "x":11, "y":4, "w":1.5}, {"label":"Alt", "x":12.5, "y":4}]
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"!", "x":1, "y":0},
+ {"label":"@", "x":2, "y":0},
+ {"label":"#", "x":3, "y":0},
+ {"label":"$", "x":4, "y":0},
+ {"label":"%", "x":5, "y":0},
+ {"label":"^", "x":6, "y":0},
+ {"label":"&", "x":7, "y":0},
+ {"label":"*", "x":8, "y":0},
+ {"label":"(", "x":9, "y":0},
+ {"label":")", "x":10, "y":0},
+ {"label":"_", "x":11, "y":0},
+ {"label":"+", "x":12, "y":0},
+ {"label":"|", "x":13, "y":0},
+ {"label":"~", "x":14, "y":0},
+
+ {"label":"Tab", "x":0, "y":1, "w":1.5},
+ {"label":"Q", "x":1.5, "y":1},
+ {"label":"W", "x":2.5, "y":1},
+ {"label":"E", "x":3.5, "y":1},
+ {"label":"R", "x":4.5, "y":1},
+ {"label":"T", "x":5.5, "y":1},
+ {"label":"Y", "x":6.5, "y":1},
+ {"label":"U", "x":7.5, "y":1},
+ {"label":"I", "x":8.5, "y":1},
+ {"label":"O", "x":9.5, "y":1},
+ {"label":"P", "x":10.5, "y":1},
+ {"label":"{", "x":11.5, "y":1},
+ {"label":"}", "x":12.5, "y":1},
+ {"label":"|", "x":13.5, "y":1, "w":1.5},
+
+ {"label":"Control", "x":0, "y":2, "w":1.75},
+ {"label":"A", "x":1.75, "y":2},
+ {"label":"S", "x":2.75, "y":2},
+ {"label":"D", "x":3.75, "y":2},
+ {"label":"F", "x":4.75, "y":2},
+ {"label":"G", "x":5.75, "y":2},
+ {"label":"H", "x":6.75, "y":2},
+ {"label":"J", "x":7.75, "y":2},
+ {"label":"K", "x":8.75, "y":2},
+ {"label":"L", "x":9.75, "y":2},
+ {"label":":", "x":10.75, "y":2},
+ {"label":"\"", "x":11.75, "y":2},
+ {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+
+ {"label":"Shift", "x":0, "y":3, "w":2.25},
+ {"label":"Z", "x":2.25, "y":3},
+ {"label":"X", "x":3.25, "y":3},
+ {"label":"C", "x":4.25, "y":3},
+ {"label":"V", "x":5.25, "y":3},
+ {"label":"B", "x":6.25, "y":3},
+ {"label":"N", "x":7.25, "y":3},
+ {"label":"M", "x":8.25, "y":3},
+ {"label":"<", "x":9.25, "y":3},
+ {"label":">", "x":10.25, "y":3},
+ {"label":"?", "x":11.25, "y":3},
+ {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+ {"label":"Fn", "x":14, "y":3},
+
+ {"label":"Alt", "x":1.5, "y":4},
+ {"label":"Meta", "x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"label":"Meta", "x":11, "y":4, "w":1.5},
+ {"label":"Alt", "x":12.5, "y":4}
+ ]
}
}
}
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
index 2f91e1c76e..79a2fa92a7 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
@@ -17,17 +17,19 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_tsangan(
- 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_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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL),
+ [0] = LAYOUT_60_tsangan_hhkb(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL
+ ),
- [1] = LAYOUT_tsangan(
- RESET, 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, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_CLR,
- KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME