summaryrefslogtreecommitdiff
path: root/keyboards/kinesis
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kinesis')
-rw-r--r--keyboards/kinesis/alvicstep/info.json90
-rw-r--r--keyboards/kinesis/keymaps/default/keymap.c33
-rw-r--r--keyboards/kinesis/keymaps/default_pretty/keymap.c46
-rw-r--r--keyboards/kinesis/keymaps/default_pretty/readme.md5
-rw-r--r--keyboards/kinesis/keymaps/default_pretty/rules.mk9
-rw-r--r--keyboards/kinesis/keymaps/dvorak/keymap.c62
-rw-r--r--keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c31
-rw-r--r--keyboards/kinesis/keymaps/farmergreg/keymap.c214
-rw-r--r--keyboards/kinesis/keymaps/heatxsink/keymap.c188
-rw-r--r--keyboards/kinesis/keymaps/insertsnideremarks/keymap.c22
-rw-r--r--keyboards/kinesis/keymaps/jwon/keymap.c132
-rw-r--r--keyboards/kinesis/keymaps/peott-fr/keymap.c52
-rw-r--r--keyboards/kinesis/keymaps/stapelberg/keymap.c54
-rw-r--r--keyboards/kinesis/keymaps/tuesdayjohn/keymap.c20
-rw-r--r--keyboards/kinesis/keymaps/tw1t611/keymap.c70
-rw-r--r--keyboards/kinesis/keymaps/xyverz/keymap.c135
-rw-r--r--keyboards/kinesis/kint2pp/info.json93
-rw-r--r--keyboards/kinesis/kint2pp/rules.mk3
-rw-r--r--keyboards/kinesis/kint36/info.json93
-rw-r--r--keyboards/kinesis/kint36/rules.mk3
-rw-r--r--keyboards/kinesis/kint41/info.json93
-rw-r--r--keyboards/kinesis/kint41/rules.mk5
-rw-r--r--keyboards/kinesis/kintlc/info.json93
-rw-r--r--keyboards/kinesis/kintlc/rules.mk5
-rw-r--r--keyboards/kinesis/nguyenvietyen/info.json91
-rw-r--r--keyboards/kinesis/nguyenvietyen/rules.mk3
-rw-r--r--keyboards/kinesis/stapelberg/info.json90
27 files changed, 364 insertions, 1371 deletions
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json
index ef3509caf3..82c68367ab 100644
--- a/keyboards/kinesis/alvicstep/info.json
+++ b/keyboards/kinesis/alvicstep/info.json
@@ -20,96 +20,6 @@
{"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [7, 0], "x": 1.25, "y": 1.25},
- {"matrix": [6, 0], "x": 2.25, "y": 1},
- {"matrix": [5, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [3, 0], "x": 5.25, "y": 1},
- {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [7, 1], "x": 1.25, "y": 2.25},
- {"matrix": [6, 1], "x": 2.25, "y": 2},
- {"matrix": [5, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [3, 1], "x": 5.25, "y": 2},
- {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [7, 2], "x": 1.25, "y": 3.25},
- {"matrix": [6, 2], "x": 2.25, "y": 3},
- {"matrix": [5, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [3, 2], "x": 5.25, "y": 3},
- {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [7, 3], "x": 1.25, "y": 4.25},
- {"matrix": [6, 3], "x": 2.25, "y": 4},
- {"matrix": [5, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [3, 3], "x": 5.25, "y": 4},
- {"matrix": [7, 4], "x": 1.25, "y": 5.25},
- {"matrix": [6, 4], "x": 2.25, "y": 5},
- {"matrix": [5, 4], "x": 3.25, "y": 5},
- {"matrix": [3, 4], "x": 4.25, "y": 5},
- {"matrix": [3, 6], "x": 5.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 7},
- {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [7, 5], "x": 6.25, "y": 8},
- {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [9, 4], "x": 9.25, "y": 1},
- {"matrix": [10, 4], "x": 10.25, "y": 1},
- {"matrix": [11, 4], "x": 11.25, "y": 1},
- {"matrix": [13, 4], "x": 12.25, "y": 1},
- {"matrix": [14, 4], "x": 13.25, "y": 1.25},
- {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [9, 5], "x": 9.25, "y": 2},
- {"matrix": [10, 5], "x": 10.25, "y": 2},
- {"matrix": [11, 5], "x": 11.25, "y": 2},
- {"matrix": [13, 5], "x": 12.25, "y": 2},
- {"matrix": [14, 5], "x": 13.25, "y": 2.25},
- {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [9, 6], "x": 9.25, "y": 3},
- {"matrix": [10, 6], "x": 10.25, "y": 3},
- {"matrix": [11, 6], "x": 11.25, "y": 3},
- {"matrix": [13, 6], "x": 12.25, "y": 3},
- {"matrix": [14, 6], "x": 13.25, "y": 3.25},
- {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [9, 7], "x": 9.25, "y": 4},
- {"matrix": [10, 7], "x": 10.25, "y": 4},
- {"matrix": [11, 7], "x": 11.25, "y": 4},
- {"matrix": [13, 7], "x": 12.25, "y": 4},
- {"matrix": [14, 7], "x": 13.25, "y": 4.25},
- {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [9, 3], "x": 10.25, "y": 5},
- {"matrix": [11, 3], "x": 11.25, "y": 5},
- {"matrix": [13, 3], "x": 12.25, "y": 5},
- {"matrix": [14, 3], "x": 13.25, "y": 5.25},
- {"matrix": [4, 7], "x": 8.25, "y": 6},
- {"matrix": [6, 6], "x": 9.25, "y": 6},
- {"matrix": [6, 7], "x": 8.25, "y": 7},
- {"matrix": [8, 7], "x": 8.25, "y": 8},
- {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index e0f114902c..130dbd2b87 100644
--- a/keyboards/kinesis/keymaps/default/keymap.c
+++ b/keyboards/kinesis/keymaps/default/keymap.c
@@ -30,24 +30,17 @@
*/
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[QWERTY] = LAYOUT(
- KC_ESC, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8,
- KC_EQL, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
- KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
- KC_CAPS,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
- KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- KC_GRV ,KC_INS ,KC_LEFT,KC_RGHT,
- KC_LCTL,KC_LALT,
- KC_HOME,
- KC_BSPC,KC_DEL ,KC_END ,
- KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL ,KC_PAUS, KC_NO, QK_BOOT,
- KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
- KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS,
- KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT,
- KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
- KC_UP ,KC_DOWN,KC_LBRC,KC_RBRC,
- KC_RGUI,KC_RCTL,
- KC_PGUP,
- KC_PGDN,KC_ENTER ,KC_SPC
- )
+
+ [QWERTY] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+ KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENTER, KC_SPC
+ )
+
};
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
deleted file mode 100644
index c790e08945..0000000000
--- a/keyboards/kinesis/keymaps/default_pretty/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define QWERTY 0 // Base qwerty
-
-
-/****************************************************************************************************
-*
-* Keymap: Default Layer in Qwerty
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F8 | F9 | F10 | F12 | PSCR | SLCK | PAUS | FN0 | BOOT |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* | =+ | 1! | 2@ | 3# | 4$ | 5% | | 6^ | 7& | 8* | 9( | 0) | -_ |
-* |--------+------+------+------+------+------| +------+------+------+------+------+--------|
-* | Tab | Q | W | E | R | T | | Y | U | I | O | P | \| |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Caps | A | S | D | F | G | | H | J | K | L | ;: | '" |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Shift | Z | X | C | V | B | | N | M | ,. | .> | /? | Shift |
-* `--------+------+------+------+------+------- `------+------+------+------+------+--------'
-* | `~ | INS | Left | Right| | Up | Down | [{ | ]} |
-* `---------------------------' `---------------------------'
-* ,-------------. ,-------------.
-* | Ctrl | Alt | | Gui | Ctrl |
-* ,------|------|------| |------+------+------.
-* | | | Home | | PgUp | | |
-* | BkSp | Del |------| |------|Return| Space|
-* | | | End | | PgDn | | |
-* `--------------------' `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [QWERTY] = LAYOUT_pretty(
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
- KC_HOME, KC_PGUP,
- KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENTER, KC_SPC
- )
-
-};
diff --git a/keyboards/kinesis/keymaps/default_pretty/readme.md b/keyboards/kinesis/keymaps/default_pretty/readme.md
deleted file mode 100644
index a8783b978a..0000000000
--- a/keyboards/kinesis/keymaps/default_pretty/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The default keymap for kinesis-advantage
-
-This keymap is the same as the one in the `default` directory, but is
-formatted to use the `LAYOUT_pretty` matrix, which places the two halves of
-the keyboard side-by-side, rather than the left-hand side being on top.
diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk
deleted file mode 100644
index adb07adf7d..0000000000
--- a/keyboards/kinesis/keymaps/default_pretty/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index 9ebb088cf7..a763f1a948 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -6,51 +6,29 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = LAYOUT(
// left hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y,
- KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X,
- KC_GRV, KC_INS, KC_LEFT, KC_RIGHT,
- // left thumb
- KC_LCTL, KC_LALT,
- KC_HOME,
- KC_BSPC, KC_DEL, KC_END,
- // right hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
- KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
- KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
- KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- // right thumb
- KC_RGUI, KC_RCTL,
- KC_PGUP,
- KC_PGDN, KC_ENT, KC_SPC
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
+ KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
+ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+
+ KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENT, KC_SPC
),
[_MEDIA] = LAYOUT(
// left hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO,
- KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
- KC_NO, KC_NO, KC_MS_D, KC_MS_U,
- // left thumb
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_TRNS,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PWR,
- KC_NO, KC_VOLU, KC_MS_U, KC_VOLD, KC_NO, KC_NO,
- KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
- KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO,
- KC_MS_L, KC_MS_R, KC_NO, KC_NO,
- // right thumb
- KC_NO, KC_NO,
- KC_NO,
- KC_TRNS, KC_ENT, KC_NO
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PWR,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, KC_MS_U, KC_VOLD, KC_NO, KC_NO,
+ KC_NO, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_MS_D, KC_MS_U, KC_MS_L, KC_MS_R, KC_NO, KC_NO,
+
+ KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_ENT, KC_NO
)
};
diff --git a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
index b6a4fa2d10..4708f15ce9 100644
--- a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
@@ -5,26 +5,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[DVORAK_MAC_MODE] = LAYOUT(
// left hand
- KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y,
- KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X,
- KC_GRV, KC_INS, KC_LEFT, KC_RIGHT,
- // left thumb
- KC_LGUI, KC_LALT,
- KC_HOME,
- KC_BSPC, KC_DEL, KC_END,
- // right hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NUM, KC_PWR,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
- KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
- KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
- KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- // right thumb
- KC_RCTL, KC_RGUI,
- KC_PGUP,
- KC_PGDN, KC_ENT, KC_SPC
+ KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NUM, KC_PWR,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
+ KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
+ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+
+ KC_LGUI, KC_LALT, KC_RCTL, KC_RGUI,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENT, KC_SPC
)
};
diff --git a/keyboards/kinesis/keymaps/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c
index 554f6f8f58..cae763d8ec 100644
--- a/keyboards/kinesis/keymaps/farmergreg/keymap.c
+++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c
@@ -70,164 +70,88 @@ const key_override_t **key_overrides = (const key_override_t *[]){
*/
const uint16_t PROGMEM keymaps[_LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
[_COLEMAK] = LAYOUT(
- KC_ESC , KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8,
- KC_EQL , KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
- KC_TAB , KC_Q ,KC_W ,KC_F ,KC_P ,KC_G ,
- TD(TD_CAPS), KC_A ,KC_R ,KC_S ,KC_T ,KC_D ,
- KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- KC_GRV ,KC_BSLS,KC_LEFT,KC_RGHT,
-
- KC_LCTL,KC_LALT,
- KC_HOME,
- KC_BSPC,KC_DEL ,KC_END,
-
- KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL ,KC_PAUS, TG(_KEYPAD), MO(_PROGM), // I would prefer OSL(_PROGM) but MO emulates what Kinesis does in their firmware.
- KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
- KC_J ,KC_L ,KC_U ,KC_Y ,KC_SCLN,KC_BSLS,
- KC_H ,KC_N ,KC_E ,KC_I ,KC_O ,KC_QUOT,
- KC_K ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
- KC_DOWN,KC_UP ,KC_LBRC,KC_RBRC,
-
- KC_RGUI,KC_RCTL,
- KC_PGUP,
- KC_PGDN,KC_ENT ,KC_SPC
+ KC_ESC , KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL ,KC_PAUS, TG(_KEYPAD), MO(_PROGM), // I would prefer OSL(_PROGM) but MO emulates what Kinesis does in their firmware.
+ KC_EQL , KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
+ KC_TAB , KC_Q ,KC_W ,KC_F ,KC_P ,KC_G , KC_J ,KC_L ,KC_U ,KC_Y ,KC_SCLN,KC_BSLS,
+ TD(TD_CAPS), KC_A ,KC_R ,KC_S ,KC_T ,KC_D , KC_H ,KC_N ,KC_E ,KC_I ,KC_O ,KC_QUOT,
+ KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B , KC_K ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
+ KC_GRV ,KC_BSLS,KC_LEFT,KC_RGHT, KC_DOWN,KC_UP ,KC_LBRC,KC_RBRC,
+
+ KC_LCTL,KC_LALT, KC_RGUI,KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC,KC_DEL ,KC_END, KC_PGDN,KC_ENT ,KC_SPC
)
,[_DVORAK] = LAYOUT(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_QUOT,KC_COMM,KC_DOT ,KC_P ,KC_Y ,
- _______,KC_A ,KC_O ,KC_E ,KC_U ,KC_I ,
- _______,KC_SCLN,KC_Q ,KC_J ,KC_K ,KC_X ,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,_______,
-
- _______,_______,_______,_______,_______,_______,_______,_______, _______,
- _______,_______,_______,_______,_______,_______,
- KC_F ,KC_G ,KC_C ,KC_R ,KC_L ,KC_SLSH,
- KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_QUOT,
- KC_B ,KC_M ,KC_W ,KC_V ,KC_Z ,_______,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,KC_QUOT,KC_COMM,KC_DOT ,KC_P ,KC_Y , KC_F ,KC_G ,KC_C ,KC_R ,KC_L ,KC_SLSH,
+ _______,KC_A ,KC_O ,KC_E ,KC_U ,KC_I , KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_QUOT,
+ _______,KC_SCLN,KC_Q ,KC_J ,KC_K ,KC_X , KC_B ,KC_M ,KC_W ,KC_V ,KC_Z ,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
)
,[_QWERTY] = LAYOUT(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
- _______,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
- _______,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- _______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,_______,
-
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,_______,
- KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,_______,
- KC_N ,KC_M ,_______,_______,_______,_______,
- _______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,_______,
+ _______,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,_______,
+ _______,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B , KC_N ,KC_M ,_______,_______,_______,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
)
,[_QWERTY_GAME] = LAYOUT( // Shift WASD over to ESDF (QWERTY). Also move T and G
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_T ,KC_Q , KC_W ,KC_E ,KC_R ,
- _______,KC_G ,KC_A , KC_S ,KC_D ,KC_F ,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- KC_SPC ,_______,_______, // BACKSPACE becomes SPACE
-
- _______,_______,_______,_______,_______,_______,_______, _______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,KC_BSPC // SPACE becomes BACKSPACE
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, _______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,KC_T ,KC_Q , KC_W ,KC_E ,KC_R , _______,_______,_______,_______,_______,_______,
+ _______,KC_G ,KC_A , KC_S ,KC_D ,KC_F , _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+
+ _______,_______, _______,_______,
+ _______, _______,
+ KC_SPC ,_______,_______, _______,_______,KC_BSPC // SPACE becomes BACKSPACE
)
,[_KEYPAD] = LAYOUT(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_INS ,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,_______,
-
- _______,_______,_______ ,_______,KC_MUTE,KC_VOLD,KC_VOLU,TG(_KEYPAD), _______,
- _______,KC_NUM ,KC_PEQL,KC_PSLS,KC_PAST,_______,
- _______,KC_P7 ,KC_P8 ,KC_P9 ,KC_PMNS,_______,
- _______,KC_P4 ,KC_P5 ,KC_P6 ,KC_PPLS,_______,
- _______,KC_P1 ,KC_P2 ,KC_P3 ,KC_PENT,_______,
- _______,_______ ,KC_PDOT,KC_PENT,
-
- _______,_______,
- _______,
- _______,_______,KC_P0
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______ ,_______,KC_MUTE,KC_VOLD,KC_VOLU,TG(_KEYPAD), _______,
+ _______,_______,_______,_______,_______,_______, _______,KC_NUM ,KC_PEQL,KC_PSLS,KC_PAST,_______,
+ _______,_______,_______,_______,_______,_______, _______,KC_P7 ,KC_P8 ,KC_P9 ,KC_PMNS,_______,
+ _______,_______,_______,_______,_______,_______, _______,KC_P4 ,KC_P5 ,KC_P6 ,KC_PPLS,_______,
+ _______,_______,_______,_______,_______,_______, _______,KC_P1 ,KC_P2 ,KC_P3 ,KC_PENT,_______,
+ _______,KC_INS ,_______,_______, _______,_______ ,KC_PDOT,KC_PENT,
+
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,KC_P0
)
,[_PROGM] = LAYOUT(
- _______,_______,_______,DF(_QWERTY),DF(_DVORAK),_______ ,_______,_______,_______,
- _______,_______,_______,_______ ,_______ ,_______ ,
- _______,_______,_______,_______ ,_______ ,DF(_QWERTY_GAME), // The G in Colemak
- _______,_______,_______,_______ ,_______ ,DF(_QWERTY_GAME), // The G in QWERTY
- _______,_______,_______,DF(_COLEMAK),_______ ,_______,
- _______,_______,_______ ,_______,
-
- _______,_______,
- _______,
- _______,_______,_______,
-
- QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,DF(_QWERTY),DF(_DVORAK),_______ ,_______,_______,_______, QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______ ,_______ ,_______ , _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______ ,_______ ,DF(_QWERTY_GAME), _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______ ,_______ ,DF(_QWERTY_GAME), _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,DF(_COLEMAK),_______ ,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______ ,_______, _______,_______,_______,_______,
+
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
)
/*
,[_TEMPLATE] = LAYOUT(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,_______,
-
- _______,_______,_______,_______,_______,_______,_______,_______, _______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
-
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
)
*/
};
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
index 53b4b57cf5..e430df225a 100644
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -36,155 +36,75 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT] = LAYOUT(
- // LHAND
- KC_ESC ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8 ,
- KC_EQL ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
- KC_TAB ,_______,_______,_______,_______,_______,
- HCTLESC,_______,_______,_______,_______,_______,
- SC_LSPO,_______,_______,_______,_______,_______,
- KC_GRV ,LAYERS ,KC_LEFT,KC_RGHT,
- // LTHUMB
- KC_LALT,KC_LCTL,
- KC_HOME,
- KC_BSPC,KC_DEL ,KC_END ,
- // RHAND
- KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KEYPAD ,QK_BOOT,
- KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
- _______,_______,_______,_______,_______,KC_BSLS,
- _______,_______,_______,_______,_______,KC_QUOT,
- _______,_______,_______,_______,_______,SC_RSPC,
- KC_UP ,KC_DOWN,KC_LBRC,KC_RBRC,
- // RTHUMB
- KC_RCTL,KC_LGUI,
- KC_PGUP,
- KC_PGDN,KC_ENT ,KC_SPC
+ KC_ESC ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KEYPAD ,QK_BOOT,
+ KC_EQL ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
+ KC_TAB ,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_BSLS,
+ HCTLESC,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_QUOT,
+ SC_LSPO,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,SC_RSPC,
+ KC_GRV ,LAYERS ,KC_LEFT,KC_RGHT, KC_UP ,KC_DOWN,KC_LBRC,KC_RBRC,
+ KC_LALT,KC_LCTL, KC_RCTL,KC_LGUI,
+ KC_HOME, KC_PGUP,
+ KC_BSPC,KC_DEL ,KC_END , KC_PGDN,KC_ENT ,KC_SPC
),
[_QWERTY] = LAYOUT(
- // LHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
- _______,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
- _______,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- _______,_______,_______,_______,
- // LTHUMB
- _______,_______,
- _______,
- _______,_______,_______,
- // RHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,_______,
- KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,_______,
- KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,_______,
- _______,_______,_______,_______,
- // RTHUMB
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,_______,
+ _______,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,_______,
+ _______,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B , KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
),
[_COLEMAK_MOD_DH] = LAYOUT(
- // LHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_Q ,KC_W ,KC_F ,KC_P ,KC_B,
- _______,KC_A ,KC_R ,KC_S ,KC_T ,KC_G,
- _______,KC_Z ,KC_X ,KC_C ,KC_D ,KC_V,
- _______,_______,_______,_______,
- // LTHUMB
- _______,_______,
- _______,
- _______,_______,_______,
- // RHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- KC_J ,KC_L ,KC_U ,KC_Y ,KC_SCLN,_______,
- KC_M ,KC_N ,KC_E ,KC_I ,KC_O ,_______,
- KC_K ,KC_H ,KC_COMM,KC_DOT ,KC_SLSH,_______,
- _______,_______,_______,_______,
- // RTHUMB
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,KC_Q ,KC_W ,KC_F ,KC_P ,KC_B, KC_J ,KC_L ,KC_U ,KC_Y ,KC_SCLN,_______,
+ _______,KC_A ,KC_R ,KC_S ,KC_T ,KC_G, KC_M ,KC_N ,KC_E ,KC_I ,KC_O ,_______,
+ _______,KC_Z ,KC_X ,KC_C ,KC_D ,KC_V, KC_K ,KC_H ,KC_COMM,KC_DOT ,KC_SLSH,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
),
[_WORKMAN] = LAYOUT(
- // LHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,KC_Q ,KC_D ,KC_R ,KC_W ,KC_B,
- _______,KC_A ,KC_S ,KC_H ,KC_T ,KC_G,
- _______,KC_Z ,KC_X ,KC_M ,KC_C ,KC_V,
- _______,_______,_______,_______,
- // LTHUMB
- _______,_______,
- _______,
- _______,_______,_______,
- // RHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- KC_J ,KC_F ,KC_U ,KC_P ,KC_SCLN,_______,
- KC_Y ,KC_N ,KC_E ,KC_O ,KC_I ,_______,
- KC_K ,KC_L ,KC_COMM,KC_DOT ,KC_SLSH,_______,
- _______,_______,_______,_______,
- // RTHUMB
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,KC_Q ,KC_D ,KC_R ,KC_W ,KC_B, KC_J ,KC_F ,KC_U ,KC_P ,KC_SCLN,_______,
+ _______,KC_A ,KC_S ,KC_H ,KC_T ,KC_G, KC_Y ,KC_N ,KC_E ,KC_O ,KC_I ,_______,
+ _______,KC_Z ,KC_X ,KC_M ,KC_C ,KC_V, KC_K ,KC_L ,KC_COMM,KC_DOT ,KC_SLSH,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
),
[_KEYPAD] = LAYOUT (
- // LHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,
- _______,KC_MSTP,KC_MPRV,KC_MPLY,KC_MNXT,KC_MSEL,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
- // LTHUMB
- _______,_______,
- _______,
- _______,_______,_______,
-
- // RHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,KC_NUM, KC_PEQL,KC_PSLS,KC_PAST,_______,
- _______,KC_P7, KC_P8, KC_P9, KC_PMNS,_______,
- _______,KC_P4, KC_P5, KC_P6, KC_PPLS,_______,
- _______,KC_P1, KC_P2, KC_P3, KC_PENT,_______,
- KC_LPRN,KC_RPRN,KC_PDOT,KC_PENT,
- // RTHUMB
- _______,_______,
- _______,
- _______,KC_PENT,KC_P0
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,KC_NUM, KC_PEQL,KC_PSLS,KC_PAST,_______,
+ _______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______, _______,KC_P7, KC_P8, KC_P9, KC_PMNS,_______,
+ _______,KC_MSTP,KC_MPRV,KC_MPLY,KC_MNXT,KC_MSEL, _______,KC_P4, KC_P5, KC_P6, KC_PPLS,_______,
+ _______,_______,_______,_______,_______,_______, _______,KC_P1, KC_P2, KC_P3, KC_PENT,_______,
+ _______,_______,_______,_______, KC_LPRN,KC_RPRN,KC_PDOT,KC_PENT,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,KC_PENT,KC_P0
),
[_LAYERS] = LAYOUT (
- // LHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,QWERTY ,CMMDH ,WM ,KEYPAD ,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
- // LTHUMB
- _______,_______,
- _______,
- _______,_______,_______,
-
- // RHAND
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,
- // RTHUMB
- _______,_______,
- _______,
- _______,_______,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,QWERTY ,CMMDH ,WM ,KEYPAD ,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______,_______
),
};
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 04fa8d39bc..15e8927889 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| Fn | Number| Bspc | | Enter |Number2| Fn2 |
`-----------------------' `-----------------------'
*/
-[_COLEMAK] = LAYOUT_pretty(
+[_COLEMAK] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD, ADJUST,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| Fn | Number| Bspc | | Enter |Number2| Fn2 |
`-----------------------' `-----------------------'
*/
-[_QWERTY] = LAYOUT_pretty(
+[_QWERTY] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD, ADJUST,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | | | | | | |
`-----------------------' `-----------------------'
*/
-[_NUMBERS] = LAYOUT_pretty(
+[_NUMBERS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_NUMBERS2] = LAYOUT_pretty(
+[_NUMBERS2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | | | | | | |
`-----------------------' `-----------------------'
*/
-[_FUNCTION] = LAYOUT_pretty(
+[_FUNCTION] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UP, LCTL(KC_Y), _______, _______,
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_FUNCTION2] = LAYOUT_pretty(
+[_FUNCTION2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UP, LCTL(KC_Y), _______, _______,
@@ -266,7 +266,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | | | | | | |
`-----------------------' `-----------------------'
*/
-[_NUMPAD] = LAYOUT_pretty(
+[_NUMPAD] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_NUM, _______, _______, _______, _______, KC_TAB, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, _______,
_______, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______,
@@ -302,7 +302,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | | Bspc | | Ent/NS|Number2| Fn2 |
`-----------------------' `-----------------------'
*/
-[_COLEMAKGM] = LAYOUT_pretty(
+[_COLEMAKGM] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD, ADJUST,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
@@ -338,7 +338,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | | Bspc | | Ent/NS|Number2| Fn2 |
`-----------------------' `-----------------------'
*/
-[_QWERTYGM] = LAYOUT_pretty(
+[_QWERTYGM] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD, ADJUST,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
@@ -374,7 +374,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
| | | | | | | |
`-----------------------' `-----------------------'
*/
-[_ADJUST] = LAYOUT_pretty(
+[_ADJUST] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, NUMPAD, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -386,7 +386,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_ADJUST2] = LAYOUT_pretty(
+[_ADJUST2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, NUMPAD, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/jwon/keymap.c b/keyboards/kinesis/keymaps/jwon/keymap.c
index fe335e68ac..c23663da92 100644
--- a/keyboards/kinesis/keymaps/jwon/keymap.c
+++ b/keyboards/kinesis/keymaps/jwon/keymap.c
@@ -40,107 +40,55 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE_DVORAK] = LAYOUT (
- // Left Hand
- MACLOCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_PIPE, KC_PLUS, KC_LBRC, KC_LCBR, KC_LPRN, KC_AMPR,
- KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y,
- SFT_ESC, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LCTL, KC_QUOT, KC_Q, KC_J, KC_K, KC_X,
- KC_DLR, KC_BSLS, KC_LEFT, KC_RGHT,
- // Left Thumb
- KC_LGUI, KC_LALT,
- MACPAST,
- KC_BSPC, KC_SPC, MACCOPY,
-
- // Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, QWERTY, QK_BOOT,
- KC_EQL, KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
- KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS,
- KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
- KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
- KC_DOWN, KC_UP, KC_SLSH, KC_AT,
- // Right Thumb
- KEYPAD, LSA_,
- MACUNDO,
- MACREDO, RAISE, KC_ENT
+ MACLOCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, QWERTY, QK_BOOT,
+ KC_PIPE, KC_PLUS, KC_LBRC, KC_LCBR, KC_LPRN, KC_AMPR, KC_EQL, KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
+ KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS,
+ SFT_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
+ KC_LCTL, KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ KC_DLR, KC_BSLS, KC_LEFT, KC_RGHT, KC_DOWN, KC_UP, KC_SLSH, KC_AT,
+
+ KC_LGUI, KC_LALT, KEYPAD, LSA_,
+ MACPAST, MACUNDO,
+ KC_BSPC, KC_SPC, MACCOPY, MACREDO, RAISE, KC_ENT
),
[_RAISE_DVORAK] = LAYOUT (
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5,
- _______, KC_COLN, KC_LABK, KC_RABK, S(KC_P), S(KC_Y),
- _______, S(KC_A), S(KC_O), S(KC_E), S(KC_U), S(KC_I),
- _______, KC_DQUO, S(KC_Q), S(KC_J), S(KC_K), S(KC_X),
- KC_TILD, KC_PIPE, _______, _______,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
-
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_PERC,
- S(KC_F), S(KC_G), S(KC_C), S(KC_R), S(KC_L), KC_HASH,
- S(KC_D), S(KC_H), S(KC_T), S(KC_N), S(KC_S), KC_UNDS,
- S(KC_B), S(KC_M), S(KC_W), S(KC_V), S(KC_Z), _______,
- _______, _______, KC_QUES, KC_CIRC,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PERC,
+ _______, KC_COLN, KC_LABK, KC_RABK, S(KC_P), S(KC_Y), S(KC_F), S(KC_G), S(KC_C), S(KC_R), S(KC_L), KC_HASH,
+ _______, S(KC_A), S(KC_O), S(KC_E), S(KC_U), S(KC_I), S(KC_D), S(KC_H), S(KC_T), S(KC_N), S(KC_S), KC_UNDS,
+ _______, KC_DQUO, S(KC_Q), S(KC_J), S(KC_K), S(KC_X), S(KC_B), S(KC_M), S(KC_W), S(KC_V), S(KC_Z), _______,
+ KC_TILD, KC_PIPE, _______, _______, _______, _______, KC_QUES, KC_CIRC,
+
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
[_KEYPAD] = LAYOUT (
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
-
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______,
- _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
- _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
- _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
- _______, _______, KC_PDOT, KC_PENT,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, KC_P0
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
+ _______, _______, _______, _______, _______, _______, KC_PDOT, KC_PENT,
+
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, KC_P0
),
[_QWERTY] = LAYOUT(
- // Left Hand
- KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
- // Left Thumb
- KC_LGUI, KC_LALT,
- KC_HOME,
- KC_BSPC, KC_DEL, KC_END ,
-
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- // Right Thumb
- KC_RGUI, KC_RCTL,
- KC_PGUP,
- KC_PGDN, KC_ENT, KC_SPC
+ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+
+ KC_LGUI, KC_LALT, KC_RGUI, KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, KC_END , KC_PGDN, KC_ENT, KC_SPC
)
};
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
index 9bdcb6df31..22453517a9 100644
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ b/keyboards/kinesis/keymaps/peott-fr/keymap.c
@@ -21,8 +21,52 @@
*/
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, KC_PGDN, KC_ENT, LT(2,KC_BSPC)),
- [1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
- [2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
- [3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+ [0] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
+ LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+
+ KC_LBRC, KC_RBRC, KC_RALT, KC_APP,
+ KC_HOME, KC_PGUP,
+ LT(1,KC_SPC), KC_DEL, KC_END, KC_PGDN, KC_ENT, LT(2,KC_BSPC)
+ ),
+ [1] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,
+ KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO,
+
+ KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+ )
};
diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index 7757846390..f8e7b572f1 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -48,24 +48,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[QWERTY] = LAYOUT(
- KC_DEL, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8,
- KC_EQL, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
- KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
- KC_CAPS,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
- KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- KC_GRV ,KC_INS ,KC_LEFT,KC_RGHT,
- KC_LCTL,KC_LALT,
- KC_LGUI,
- KC_BSPC,KC_ESC ,KC_END ,
- KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL ,KC_PAUS, MO(1), QK_BOOT,
- KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
- KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS,
- KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT,
- KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
- KC_UP ,KC_DOWN,KC_LBRC,KC_RBRC,
- KC_RALT,KC_RCTL,
- KC_PGUP,
- KC_PGDN,KC_ENTER ,KC_SPC
+ KC_DEL, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL ,KC_PAUS, MO(1), QK_BOOT,
+ KC_EQL, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
+ KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,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_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B , KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
+ KC_GRV ,KC_INS ,KC_LEFT,KC_RGHT, KC_UP ,KC_DOWN,KC_LBRC,KC_RBRC,
+ KC_LCTL,KC_LALT, KC_RALT,KC_RCTL,
+ KC_LGUI, KC_PGUP,
+ KC_BSPC,KC_ESC ,KC_END , KC_PGDN,KC_ENTER ,KC_SPC
),
// LAYER1 is activated by the keypad key. It has WAKE on Escape (left-most key),
@@ -73,23 +64,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// as printed on the Kinesis Advantage 2.
[LAYER1] = LAYOUT(
- KC_WAKE, KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO,
- KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,
- KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_MUTE ,KC_VOLD ,KC_VOLU, KC_TRNS, KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,KC_NO ,KC_NO ,
- KC_NO ,KC_NO ,
- KC_NO ,
- KC_NO ,KC_NO ,KC_NO
+ KC_WAKE, KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO, KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_MUTE ,KC_VOLD ,KC_VOLU, KC_TRNS, KC_NO ,
+ KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
+ KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
+ KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
+ KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,
+ KC_NO ,KC_NO ,KC_NO ,KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,
+ KC_NO ,KC_NO , KC_NO ,KC_NO ,
+ KC_NO , KC_NO ,
+ KC_NO ,KC_NO ,KC_NO , KC_NO ,KC_NO ,KC_NO
),
};
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
index 6a7a6cc68e..fa230d38d0 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
@@ -119,7 +119,7 @@ Colemak
| Fn | Number | Bspc | | Enter | Number2| Fn2 |
`--------------------------' `--------------------------'
*/
-[_COLEMAK] = LAYOUT_pretty(
+[_COLEMAK] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD, ADJUST,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
@@ -156,7 +156,7 @@ QWERTY
| Fn | Number | Bspc | | Enter | Number2| Fn2 |
`--------------------------' `--------------------------'
*/
-[_QWERTY] = LAYOUT_pretty(
+[_QWERTY] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD, ADJUST,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
@@ -193,7 +193,7 @@ Numbers/Symbols layer
| | | | | | | |
`--------------------------' `--------------------------'
*/
-[_NUMBERS] = LAYOUT_pretty(
+[_NUMBERS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
@@ -205,7 +205,7 @@ Numbers/Symbols layer
_______, _______, _______, _______, _______, _______
),
-[_NUMBERS2] = LAYOUT_pretty(
+[_NUMBERS2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
@@ -241,7 +241,7 @@ Function layer
| | | | | | | |
`--------------------------' `--------------------------'
*/
-[_FUNCTION] = LAYOUT_pretty(
+[_FUNCTION] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UP, CTL_Y, _______, _______,
@@ -253,7 +253,7 @@ Function layer
_______, _______, _______, _______, _______, _______
),
-[_FUNCTION2] = LAYOUT_pretty(
+[_FUNCTION2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UP, CTL_Y, _______, _______,
@@ -290,7 +290,7 @@ Numpad layer
| | | | | | | |
`--------------------------' `--------------------------'
*/
-[_NUMPAD] = LAYOUT_pretty(
+[_NUMPAD] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_NUM, _______, _______, _______, _______, KC_TAB, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, _______,
_______, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______,
@@ -327,7 +327,7 @@ Gaming
| | | Bspc | |Enter/NS| Number2| Fn2 |
`--------------------------' `--------------------------'
*/
-[_GAMING] = LAYOUT_pretty(
+[_GAMING] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -364,7 +364,7 @@ Adjust layer
| | | | | | | |
`--------------------------' `--------------------------'
*/
-[_ADJUST] = LAYOUT_pretty(
+[_ADJUST] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, COLEMAK, QWERTY, _______, GAMING, _______, NUMPAD, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -376,7 +376,7 @@ Adjust layer
_______, _______, _______, _______, _______, _______
),
-[_ADJUST2] = LAYOUT_pretty(
+[_ADJUST2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, COLEMAK, QWERTY, _______, GAMING, _______, NUMPAD, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index 0a812aef35..169cac82f9 100644
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c
@@ -6,59 +6,25 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[QWERTZ] = LAYOUT(
- _______,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8,
- _______,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
- KC_ESC ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
- KC_TAB ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
- DE_PIPE,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- _______,_______,_______,_______,
- KC_RCTL,KC_LALT,
- KC_HOME,
- KC_SPC ,KC_LSFT,KC_BSPC ,
- KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KC_NO ,QK_BOOT,
- KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,DE_SS ,
- KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,DE_ADIA,
- KC_H ,KC_J ,KC_K ,KC_L ,DE_SLSH,DE_ODIA,
- KC_N ,KC_M ,DE_COMM,DE_DOT ,DE_MINS,DE_UDIA,
- _______,_______,_______,_______,
- KC_LGUI,KC_LCTL,
- KC_END ,
- KC_DEL,MO(MOD),KC_ENTER
+ _______,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8, KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KC_NO ,QK_BOOT,
+ _______,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,DE_SS ,
+ KC_ESC ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,DE_ADIA,
+ KC_TAB ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , KC_H ,KC_J ,KC_K ,KC_L ,DE_SLSH,DE_ODIA,
+ DE_PIPE,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B , KC_N ,KC_M ,DE_COMM,DE_DOT ,DE_MINS,DE_UDIA,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ KC_RCTL,KC_LALT, KC_LGUI,KC_LCTL,
+ KC_HOME, KC_END ,
+ KC_SPC ,KC_LSFT,KC_BSPC , KC_DEL,MO(MOD),KC_ENTER
),
[MOD] = LAYOUT(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- DE_CIRC,DE_QUOT,DE_DQUO,DE_LCBR,DE_RCBR,DE_GRV ,
- DE_TILD,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,DE_AMPR,
- DE_BSLS,DE_HASH,DE_LABK,DE_LBRC,DE_RBRC,DE_RABK,
- _______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,_______,
- _______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- KC_HOME,KC_PGDN,KC_PGUP,KC_END ,DE_EQL ,DE_PERC,
- KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,DE_QUES,DE_ASTR,
- DE_AT ,DE_EURO,DE_SCLN,DE_COLN,DE_UNDS,DE_PLUS,
- _______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______ ,_______
+ _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
+ DE_CIRC,DE_QUOT,DE_DQUO,DE_LCBR,DE_RCBR,DE_GRV , KC_HOME,KC_PGDN,KC_PGUP,KC_END ,DE_EQL ,DE_PERC,
+ DE_TILD,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,DE_AMPR, KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,DE_QUES,DE_ASTR,
+ DE_BSLS,DE_HASH,DE_LABK,DE_LBRC,DE_RBRC,DE_RABK, DE_AT ,DE_EURO,DE_SCLN,DE_COLN,DE_UNDS,DE_PLUS,
+ _______,_______,_______,_______, _______,_______,_______,_______,
+ _______,_______, _______,_______,
+ _______, _______,
+ _______,_______,_______, _______,_______ ,_______
)
};
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index 5e4f7c1e88..7509544283 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -110,107 +110,55 @@ enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, KEYPAD };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = LAYOUT (
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y,
- KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X,
- KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
- // Left Thumb
- KC_LCTL, KC_LALT,
- KC_HOME,
- KC_BSPC, KC_DEL, GUI_END,
-
- // Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD), QK_BOOT,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
- KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
- KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
- KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
- KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- // Right Thumb
- KC_RGUI, KC_RCTL,
- KC_PGUP,
- KC_PGDN, KPD_ENT, KC_SPC
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD), QK_BOOT,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
+ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
+ KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
+ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+
+ KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, GUI_END, KC_PGDN, KPD_ENT, KC_SPC
),
[_QWERTY] = LAYOUT (
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
- // Left Thumb
- KC_LCTL, KC_LALT,
- KC_HOME,
- KC_BSPC, KC_DEL, KC_END,
-
- // Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD), QK_BOOT,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS ,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- // Right Thumb
- KC_RGUI, KC_RCTL,
- KC_PGUP,
- KC_PGDN, KPD_ENT, KC_SPC
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD), QK_BOOT,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+
+ KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, KC_END, KC_PGDN, KPD_ENT, KC_SPC
),
[_COLEMAK] = LAYOUT (
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G,
- KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_GRV, KC_INS, KC_LEFT, KC_RGHT,
- // Left Thumb
- KC_LCTL, KC_LALT,
- KC_HOME,
- KC_BSPC, KC_DEL, KC_END,
-
- // Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD), QK_BOOT,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
- KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
- // Right Thumb
- KC_RGUI, KC_RCTL,
- KC_PGUP,
- KC_PGDN, KPD_ENT, KC_SPC
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD), QK_BOOT,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
+ KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
+
+ KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
+ KC_HOME, KC_PGUP,
+ KC_BSPC, KC_DEL, KC_END, KC_PGDN, KPD_ENT, KC_SPC
),
[_KEYPAD] = LAYOUT (
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_PWR, _______, _______, _______, _______, _______,
- KC_SLEP, _______, _______, _______, _______, _______,
- KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
- _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
- _______, QWERTY, COLEMAK, DVORAK,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, MACLOCK,
-
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______,
- _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
- _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
- _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
- _______, _______, KC_PDOT, KC_PENT,
- // Right Thumb
- _______, MACLOCK,
- _______,
- _______, _______, KC_P0
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_PWR, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______,
+ KC_SLEP, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
+ KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
+ _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
+ _______, QWERTY, COLEMAK, DVORAK, _______, _______, KC_PDOT, KC_PENT,
+
+ _______, _______, _______, MACLOCK,
+ _______, _______,
+ _______, _______, MACLOCK, _______, _______, KC_P0
)
};
@@ -232,6 +180,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return true;
};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){};
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index 74d96d59e0..77986bea0a 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -7,6 +7,9 @@
"device_version": "0.0.2",
"max_power": 100
},
+ "build": {
+ "debounce_type": "sym_eager_pk"
+ },
"matrix_pins": {
"cols": ["E7", "F0", "F7", "B1", "B3", "B0", "D5"],
"rows": ["D7", "E0", "E1", "C0", "C6", "F6", "D4", "D2", "D3", "D0", "B7", "D1", "E6", "B4", "B2"]
@@ -34,96 +37,6 @@
{"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [1, 0], "x": 1.25, "y": 1.25},
- {"matrix": [2, 0], "x": 2.25, "y": 1},
- {"matrix": [3, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [5, 0], "x": 5.25, "y": 1},
- {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 2.25},
- {"matrix": [2, 1], "x": 2.25, "y": 2},
- {"matrix": [3, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [5, 1], "x": 5.25, "y": 2},
- {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [1, 2], "x": 1.25, "y": 3.25},
- {"matrix": [2, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [5, 2], "x": 5.25, "y": 3},
- {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [1, 3], "x": 1.25, "y": 4.25},
- {"matrix": [2, 3], "x": 2.25, "y": 4},
- {"matrix": [3, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [5, 3], "x": 5.25, "y": 4},
- {"matrix": [1, 4], "x": 1.25, "y": 5.25},
- {"matrix": [2, 4], "x": 2.25, "y": 5},
- {"matrix": [3, 4], "x": 3.25, "y": 5},
- {"matrix": [5, 4], "x": 4.25, "y": 5},
- {"matrix": [5, 6], "x": 5.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 7},
- {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 8},
- {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [7, 0], "x": 10.25, "y": 1},
- {"matrix": [8, 0], "x": 11.25, "y": 1},
- {"matrix": [9, 0], "x": 12.25, "y": 1},
- {"matrix": [10, 0], "x": 13.25, "y": 1.25},
- {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [6, 1], "x": 9.25, "y": 2},
- {"matrix": [7, 1], "x": 10.25, "y": 2},
- {"matrix": [8, 1], "x": 11.25, "y": 2},
- {"matrix": [9, 1], "x": 12.25, "y": 2},
- {"matrix": [10, 1], "x": 13.25, "y": 2.25},
- {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [6, 2], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [9, 2], "x": 12.25, "y": 3},
- {"matrix": [10, 2], "x": 13.25, "y": 3.25},
- {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [6, 3], "x": 9.25, "y": 4},
- {"matrix": [7, 3], "x": 10.25, "y": 4},
- {"matrix": [8, 3], "x": 11.25, "y": 4},
- {"matrix": [9, 3], "x": 12.25, "y": 4},
- {"matrix": [10, 3], "x": 13.25, "y": 4.25},
- {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [6, 4], "x": 10.25, "y": 5},
- {"matrix": [8, 4], "x": 11.25, "y": 5},
- {"matrix": [9, 4], "x": 12.25, "y": 5},
- {"matrix": [10, 4], "x": 13.25, "y": 5.25},
- {"matrix": [9, 6], "x": 8.25, "y": 6},
- {"matrix": [8, 5], "x": 9.25, "y": 6},
- {"matrix": [8, 6], "x": 8.25, "y": 7},
- {"matrix": [6, 6], "x": 8.25, "y": 8},
- {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kint2pp/rules.mk b/keyboards/kinesis/kint2pp/rules.mk
index 7c48a98bfc..e69de29bb2 100644
--- a/keyboards/kinesis/kint2pp/rules.mk
+++ b/keyboards/kinesis/kint2pp/rules.mk
@@ -1,3 +0,0 @@
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the kinT does not have to deal with noise.
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 815b6cb871..608a18e178 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -7,6 +7,9 @@
"device_version": "0.0.1",
"max_power": 100
},
+ "build": {
+ "debounce_type": "sym_eager_pk"
+ },
"matrix_pins": {
"cols": ["B3", "D1", "C0", "D5", "C1", "B2", "D4"],
"rows": ["D3", "C3", "C4", "C6", "D2", "B0", "D7", "A12", "A13", "B17", "B16", "D0", "B1", "C2", "D6"]
@@ -34,96 +37,6 @@
{"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [1, 0], "x": 1.25, "y": 1.25},
- {"matrix": [2, 0], "x": 2.25, "y": 1},
- {"matrix": [3, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [5, 0], "x": 5.25, "y": 1},
- {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 2.25},
- {"matrix": [2, 1], "x": 2.25, "y": 2},
- {"matrix": [3, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [5, 1], "x": 5.25, "y": 2},
- {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [1, 2], "x": 1.25, "y": 3.25},
- {"matrix": [2, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [5, 2], "x": 5.25, "y": 3},
- {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [1, 3], "x": 1.25, "y": 4.25},
- {"matrix": [2, 3], "x": 2.25, "y": 4},
- {"matrix": [3, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [5, 3], "x": 5.25, "y": 4},
- {"matrix": [1, 4], "x": 1.25, "y": 5.25},
- {"matrix": [2, 4], "x": 2.25, "y": 5},
- {"matrix": [3, 4], "x": 3.25, "y": 5},
- {"matrix": [5, 4], "x": 4.25, "y": 5},
- {"matrix": [5, 6], "x": 5.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 7},
- {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 8},
- {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [7, 0], "x": 10.25, "y": 1},
- {"matrix": [8, 0], "x": 11.25, "y": 1},
- {"matrix": [9, 0], "x": 12.25, "y": 1},
- {"matrix": [10, 0], "x": 13.25, "y": 1.25},
- {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [6, 1], "x": 9.25, "y": 2},
- {"matrix": [7, 1], "x": 10.25, "y": 2},
- {"matrix": [8, 1], "x": 11.25, "y": 2},
- {"matrix": [9, 1], "x": 12.25, "y": 2},
- {"matrix": [10, 1], "x": 13.25, "y": 2.25},
- {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [6, 2], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [9, 2], "x": 12.25, "y": 3},
- {"matrix": [10, 2], "x": 13.25, "y": 3.25},
- {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [6, 3], "x": 9.25, "y": 4},
- {"matrix": [7, 3], "x": 10.25, "y": 4},
- {"matrix": [8, 3], "x": 11.25, "y": 4},
- {"matrix": [9, 3], "x": 12.25, "y": 4},
- {"matrix": [10, 3], "x": 13.25, "y": 4.25},
- {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [6, 4], "x": 10.25, "y": 5},
- {"matrix": [8, 4], "x": 11.25, "y": 5},
- {"matrix": [9, 4], "x": 12.25, "y": 5},
- {"matrix": [10, 4], "x": 13.25, "y": 5.25},
- {"matrix": [9, 6], "x": 8.25, "y": 6},
- {"matrix": [8, 5], "x": 9.25, "y": 6},
- {"matrix": [8, 6], "x": 8.25, "y": 7},
- {"matrix": [6, 6], "x": 8.25, "y": 8},
- {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk
index 7c48a98bfc..e69de29bb2 100644
--- a/keyboards/kinesis/kint36/rules.mk
+++ b/keyboards/kinesis/kint36/rules.mk
@@ -1,3 +0,0 @@
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the kinT does not have to deal with noise.
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 1901ed1d3b..ced47d6213 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -7,6 +7,9 @@
"device_version": "0.0.1",
"max_power": 100
},
+ "build": {
+ "debounce_type": "sym_eager_pk"
+ },
"matrix_pins": {
"cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
"rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
@@ -32,96 +35,6 @@
{"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [1, 0], "x": 1.25, "y": 1.25},
- {"matrix": [2, 0], "x": 2.25, "y": 1},
- {"matrix": [3, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [5, 0], "x": 5.25, "y": 1},
- {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 2.25},
- {"matrix": [2, 1], "x": 2.25, "y": 2},
- {"matrix": [3, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [5, 1], "x": 5.25, "y": 2},
- {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [1, 2], "x": 1.25, "y": 3.25},
- {"matrix": [2, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [5, 2], "x": 5.25, "y": 3},
- {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [1, 3], "x": 1.25, "y": 4.25},
- {"matrix": [2, 3], "x": 2.25, "y": 4},
- {"matrix": [3, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [5, 3], "x": 5.25, "y": 4},
- {"matrix": [1, 4], "x": 1.25, "y": 5.25},
- {"matrix": [2, 4], "x": 2.25, "y": 5},
- {"matrix": [3, 4], "x": 3.25, "y": 5},
- {"matrix": [5, 4], "x": 4.25, "y": 5},
- {"matrix": [5, 6], "x": 5.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 7},
- {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 8},
- {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [7, 0], "x": 10.25, "y": 1},
- {"matrix": [8, 0], "x": 11.25, "y": 1},
- {"matrix": [9, 0], "x": 12.25, "y": 1},
- {"matrix": [10, 0], "x": 13.25, "y": 1.25},
- {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [6, 1], "x": 9.25, "y": 2},
- {"matrix": [7, 1], "x": 10.25, "y": 2},
- {"matrix": [8, 1], "x": 11.25, "y": 2},
- {"matrix": [9, 1], "x": 12.25, "y": 2},
- {"matrix": [10, 1], "x": 13.25, "y": 2.25},
- {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [6, 2], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [9, 2], "x": 12.25, "y": 3},
- {"matrix": [10, 2], "x": 13.25, "y": 3.25},
- {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [6, 3], "x": 9.25, "y": 4},
- {"matrix": [7, 3], "x": 10.25, "y": 4},
- {"matrix": [8, 3], "x": 11.25, "y": 4},
- {"matrix": [9, 3], "x": 12.25, "y": 4},
- {"matrix": [10, 3], "x": 13.25, "y": 4.25},
- {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [6, 4], "x": 10.25, "y": 5},
- {"matrix": [8, 4], "x": 11.25, "y": 5},
- {"matrix": [9, 4], "x": 12.25, "y": 5},
- {"matrix": [10, 4], "x": 13.25, "y": 5.25},
- {"matrix": [9, 6], "x": 8.25, "y": 6},
- {"matrix": [8, 5], "x": 9.25, "y": 6},
- {"matrix": [8, 6], "x": 8.25, "y": 7},
- {"matrix": [6, 6], "x": 8.25, "y": 8},
- {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kint41/rules.mk b/keyboards/kinesis/kint41/rules.mk
index e273e8f282..825c63939f 100644
--- a/keyboards/kinesis/kint41/rules.mk
+++ b/keyboards/kinesis/kint41/rules.mk
@@ -9,9 +9,4 @@ ARMV = 7
# Bootloader selection
BOOTLOADER = halfkay
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the Cherry MX keyswitches on the Kinesis only produce noise while
-# pressed.
-DEBOUNCE_TYPE = sym_eager_pk
-
FIRMWARE_FORMAT = hex
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index da8e8f7e45..4206cacf1e 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -7,6 +7,9 @@
"device_version": "0.0.1",
"max_power": 50
},
+ "build": {
+ "debounce_type": "sym_eager_pk"
+ },
"matrix_pins": {
"cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
"rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
@@ -33,96 +36,6 @@
{"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [1, 0], "x": 1.25, "y": 1.25},
- {"matrix": [2, 0], "x": 2.25, "y": 1},
- {"matrix": [3, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [5, 0], "x": 5.25, "y": 1},
- {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 2.25},
- {"matrix": [2, 1], "x": 2.25, "y": 2},
- {"matrix": [3, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [5, 1], "x": 5.25, "y": 2},
- {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [1, 2], "x": 1.25, "y": 3.25},
- {"matrix": [2, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [5, 2], "x": 5.25, "y": 3},
- {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [1, 3], "x": 1.25, "y": 4.25},
- {"matrix": [2, 3], "x": 2.25, "y": 4},
- {"matrix": [3, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [5, 3], "x": 5.25, "y": 4},
- {"matrix": [1, 4], "x": 1.25, "y": 5.25},
- {"matrix": [2, 4], "x": 2.25, "y": 5},
- {"matrix": [3, 4], "x": 3.25, "y": 5},
- {"matrix": [5, 4], "x": 4.25, "y": 5},
- {"matrix": [5, 6], "x": 5.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 7},
- {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 8},
- {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [7, 0], "x": 10.25, "y": 1},
- {"matrix": [8, 0], "x": 11.25, "y": 1},
- {"matrix": [9, 0], "x": 12.25, "y": 1},
- {"matrix": [10, 0], "x": 13.25, "y": 1.25},
- {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [6, 1], "x": 9.25, "y": 2},
- {"matrix": [7, 1], "x": 10.25, "y": 2},
- {"matrix": [8, 1], "x": 11.25, "y": 2},
- {"matrix": [9, 1], "x": 12.25, "y": 2},
- {"matrix": [10, 1], "x": 13.25, "y": 2.25},
- {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [6, 2], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [9, 2], "x": 12.25, "y": 3},
- {"matrix": [10, 2], "x": 13.25, "y": 3.25},
- {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [6, 3], "x": 9.25, "y": 4},
- {"matrix": [7, 3], "x": 10.25, "y": 4},
- {"matrix": [8, 3], "x": 11.25, "y": 4},
- {"matrix": [9, 3], "x": 12.25, "y": 4},
- {"matrix": [10, 3], "x": 13.25, "y": 4.25},
- {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [6, 4], "x": 10.25, "y": 5},
- {"matrix": [8, 4], "x": 11.25, "y": 5},
- {"matrix": [9, 4], "x": 12.25, "y": 5},
- {"matrix": [10, 4], "x": 13.25, "y": 5.25},
- {"matrix": [9, 6], "x": 8.25, "y": 6},
- {"matrix": [8, 5], "x": 9.25, "y": 6},
- {"matrix": [8, 6], "x": 8.25, "y": 7},
- {"matrix": [6, 6], "x": 8.25, "y": 8},
- {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kintlc/rules.mk b/keyboards/kinesis/kintlc/rules.mk
index a6a1eafbfc..c2a404fd1e 100644
--- a/keyboards/kinesis/kintlc/rules.mk
+++ b/keyboards/kinesis/kintlc/rules.mk
@@ -1,7 +1,2 @@
# This MCU is not in the main CHIBIOS repo but in the CHIBIOS_CONTRIB repo.
USE_CHIBIOS_CONTRIB = yes
-
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the Cherry MX keyswitches on the Kinesis only produce noise while
-# pressed.
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 803f64025f..d9ac257652 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -13,6 +13,7 @@
"compose": "D7",
"on_state": 0
},
+ "debounce": 1,
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
@@ -27,96 +28,6 @@
{"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [7, 0], "x": 1.25, "y": 1.25},
- {"matrix": [6, 0], "x": 2.25, "y": 1},
- {"matrix": [5, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [3, 0], "x": 5.25, "y": 1},
- {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [7, 1], "x": 1.25, "y": 2.25},
- {"matrix": [6, 1], "x": 2.25, "y": 2},
- {"matrix": [5, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [3, 1], "x": 5.25, "y": 2},
- {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [7, 2], "x": 1.25, "y": 3.25},
- {"matrix": [6, 2], "x": 2.25, "y": 3},
- {"matrix": [5, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [3, 2], "x": 5.25, "y": 3},
- {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [7, 3], "x": 1.25, "y": 4.25},
- {"matrix": [6, 3], "x": 2.25, "y": 4},
- {"matrix": [5, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [3, 3], "x": 5.25, "y": 4},
- {"matrix": [7, 4], "x": 1.25, "y": 5.25},
- {"matrix": [6, 4], "x": 2.25, "y": 5},
- {"matrix": [5, 4], "x": 3.25, "y": 5},
- {"matrix": [3, 4], "x": 4.25, "y": 5},
- {"matrix": [3, 6], "x": 5.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 7},
- {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [7, 5], "x": 6.25, "y": 8},
- {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [9, 4], "x": 9.25, "y": 1},
- {"matrix": [10, 4], "x": 10.25, "y": 1},
- {"matrix": [11, 4], "x": 11.25, "y": 1},
- {"matrix": [13, 4], "x": 12.25, "y": 1},
- {"matrix": [14, 4], "x": 13.25, "y": 1.25},
- {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [9, 5], "x": 9.25, "y": 2},
- {"matrix": [10, 5], "x": 10.25, "y": 2},
- {"matrix": [11, 5], "x": 11.25, "y": 2},
- {"matrix": [13, 5], "x": 12.25, "y": 2},
- {"matrix": [14, 5], "x": 13.25, "y": 2.25},
- {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [9, 6], "x": 9.25, "y": 3},
- {"matrix": [10, 6], "x": 10.25, "y": 3},
- {"matrix": [11, 6], "x": 11.25, "y": 3},
- {"matrix": [13, 6], "x": 12.25, "y": 3},
- {"matrix": [14, 6], "x": 13.25, "y": 3.25},
- {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [9, 7], "x": 9.25, "y": 4},
- {"matrix": [10, 7], "x": 10.25, "y": 4},
- {"matrix": [11, 7], "x": 11.25, "y": 4},
- {"matrix": [13, 7], "x": 12.25, "y": 4},
- {"matrix": [14, 7], "x": 13.25, "y": 4.25},
- {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [9, 3], "x": 10.25, "y": 5},
- {"matrix": [11, 3], "x": 11.25, "y": 5},
- {"matrix": [13, 3], "x": 12.25, "y": 5},
- {"matrix": [14, 3], "x": 13.25, "y": 5.25},
- {"matrix": [4, 7], "x": 8.25, "y": 6},
- {"matrix": [6, 6], "x": 9.25, "y": 6},
- {"matrix": [6, 7], "x": 8.25, "y": 7},
- {"matrix": [8, 7], "x": 8.25, "y": 8},
- {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk
index 3e0a265135..6f6277ff6b 100644
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/rules.mk
@@ -9,6 +9,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
SLEEP_LED_ENABLE = yes
CUSTOM_MATRIX = lite
SRC += matrix.c
-
-# experimentally determined to be sufficient :)
-DEBOUNCE=1
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index 4435edf4cc..13713aac52 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -32,96 +32,6 @@
{"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
- {"matrix": [1, 0], "x": 1.25, "y": 1.25},
- {"matrix": [2, 0], "x": 2.25, "y": 1},
- {"matrix": [3, 0], "x": 3.25, "y": 1},
- {"matrix": [4, 0], "x": 4.25, "y": 1},
- {"matrix": [5, 0], "x": 5.25, "y": 1},
- {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 2.25},
- {"matrix": [2, 1], "x": 2.25, "y": 2},
- {"matrix": [3, 1], "x": 3.25, "y": 2},
- {"matrix": [4, 1], "x": 4.25, "y": 2},
- {"matrix": [5, 1], "x": 5.25, "y": 2},
- {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [1, 2], "x": 1.25, "y": 3.25},
- {"matrix": [2, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [4, 2], "x": 4.25, "y": 3},
- {"matrix": [5, 2], "x": 5.25, "y": 3},
- {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [1, 3], "x": 1.25, "y": 4.25},
- {"matrix": [2, 3], "x": 2.25, "y": 4},
- {"matrix": [3, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [5, 3], "x": 5.25, "y": 4},
- {"matrix": [1, 4], "x": 1.25, "y": 5.25},
- {"matrix": [2, 4], "x": 2.25, "y": 5},
- {"matrix": [3, 4], "x": 3.25, "y": 5},
- {"matrix": [5, 4], "x": 4.25, "y": 5},
- {"matrix": [5, 6], "x": 5.25, "y": 6},
- {"matrix": [5, 5], "x": 6.25, "y": 6},
- {"matrix": [3, 5], "x": 6.25, "y": 7},
- {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
- {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 8},
- {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [7, 0], "x": 10.25, "y": 1},
- {"matrix": [8, 0], "x": 11.25, "y": 1},
- {"matrix": [9, 0], "x": 12.25, "y": 1},
- {"matrix": [10, 0], "x": 13.25, "y": 1.25},
- {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
- {"matrix": [6, 1], "x": 9.25, "y": 2},
- {"matrix": [7, 1], "x": 10.25, "y": 2},
- {"matrix": [8, 1], "x": 11.25, "y": 2},
- {"matrix": [9, 1], "x": 12.25, "y": 2},
- {"matrix": [10, 1], "x": 13.25, "y": 2.25},
- {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
- {"matrix": [6, 2], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [9, 2], "x": 12.25, "y": 3},
- {"matrix": [10, 2], "x": 13.25, "y": 3.25},
- {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
- {"matrix": [6, 3], "x": 9.25, "y": 4},
- {"matrix": [7, 3], "x": 10.25, "y": 4},
- {"matrix": [8, 3], "x": 11.25, "y": 4},
- {"matrix": [9, 3], "x": 12.25, "y": 4},
- {"matrix": [10, 3], "x": 13.25, "y": 4.25},
- {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
- {"matrix": [6, 4], "x": 10.25, "y": 5},
- {"matrix": [8, 4], "x": 11.25, "y": 5},
- {"matrix": [9, 4], "x": 12.25, "y": 5},
- {"matrix": [10, 4], "x": 13.25, "y": 5.25},
- {"matrix": [9, 6], "x": 8.25, "y": 6},
- {"matrix": [8, 5], "x": 9.25, "y": 6},
- {"matrix": [8, 6], "x": 8.25, "y": 7},
- {"matrix": [6, 6], "x": 8.25, "y": 8},
- {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
- {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
- ]
- },
- "LAYOUT_pretty": {
- "layout": [
- {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
- {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},