From d3a8fda57282f3c6339f367d33c6a476357e5fe7 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 18:50:23 +0100 Subject: [PATCH 01/32] add `dactyl_manuform_carbonfet` --- .../dactyl_manuform_carbonfet/4x5/info.json | 91 +++++++++++ .../4x5/keymaps/default/keymap.c | 72 +++++++++ .../4x5/keymaps/via/keymap.c | 72 +++++++++ .../4x5/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/4x5/rules.mk | 1 + .../4x5_eic/info.json | 95 ++++++++++++ .../4x5_eic/keymaps/default/keymap.c | 76 +++++++++ .../4x5_eic/keymaps/via/keymap.c | 76 +++++++++ .../4x5_eic/keymaps/via/rules.mk | 1 + .../4x5_eic/rules.mk | 1 + .../dactyl_manuform_carbonfet/4x6/info.json | 97 ++++++++++++ .../4x6/keymaps/default/keymap.c | 53 +++++++ .../4x6/keymaps/via/keymap.c | 53 +++++++ .../4x6/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/4x6/rules.mk | 1 + .../4x6_eic/info.json | 101 ++++++++++++ .../4x6_eic/keymaps/default/keymap.c | 40 +++++ .../4x6_eic/keymaps/via/keymap.c | 40 +++++ .../4x6_eic/keymaps/via/rules.mk | 1 + .../4x6_eic/rules.mk | 1 + .../4x6_ex/info.json | 101 ++++++++++++ .../4x6_ex/keymaps/default/keymap.c | 58 +++++++ .../4x6_ex/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/4x6_ex/rules.mk | 1 + .../4x6_exic/info.json | 105 +++++++++++++ .../4x6_exic/keymaps/default/keymap.c | 40 +++++ .../4x6_exic/keymaps/via/keymap.c | 40 +++++ .../4x6_exic/keymaps/via/rules.mk | 1 + .../4x6_exic/rules.mk | 1 + .../dactyl_manuform_carbonfet/5x6/info.json | 111 ++++++++++++++ .../5x6/keymaps/default/keymap.c | 60 ++++++++ .../5x6/keymaps/via/fules.mk | 1 + .../5x6/keymaps/via/keymap.c | 60 ++++++++ .../dactyl_manuform_carbonfet/5x6/rules.mk | 1 + .../5x6_eic/info.json | 117 ++++++++++++++ .../5x6_eic/keymaps/default/keymap.c | 58 +++++++ .../5x6_eic/keymaps/via/keymap.c | 58 +++++++ .../5x6_eic/keymaps/via/rules.mk | 1 + .../5x6_eic/rules.mk | 1 + .../5x6_ex/info.json | 115 ++++++++++++++ .../5x6_ex/keymaps/default/keymap.c | 46 ++++++ .../5x6_ex/keymaps/via/keymap.c | 46 ++++++ .../5x6_ex/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/5x6_ex/rules.mk | 1 + .../5x6_exic/info.json | 121 +++++++++++++++ .../5x6_exic/keymaps/default/keymap.c | 46 ++++++ .../5x6_exic/keymaps/via/keymap.c | 46 ++++++ .../5x6_exic/keymaps/via/rules.mk | 1 + .../5x6_exic/rules.mk | 1 + .../dactyl_manuform_carbonfet/6x6/info.json | 128 ++++++++++++++++ .../6x6/keymaps/default/keymap.c | 49 ++++++ .../6x6/keymaps/via/keymap.c | 49 ++++++ .../6x6/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/6x6/rules.mk | 1 + .../6x6_eic/info.json | 136 +++++++++++++++++ .../6x6_eic/keymaps/default/keymap.c | 54 +++++++ .../6x6_eic/keymaps/via/keymap.c | 54 +++++++ .../6x6_eic/keymaps/via/rules.mk | 1 + .../6x6_eic/rules.mk | 1 + .../6x6_ex/info.json | 132 ++++++++++++++++ .../6x6_ex/keymaps/default/keymap.c | 51 +++++++ .../6x6_ex/keymaps/via/keymap.c | 51 +++++++ .../6x6_ex/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/6x6_ex/rules.mk | 1 + .../6x6_exic/info.json | 140 +++++++++++++++++ .../6x6_exic/keymaps/default/keymap.c | 53 +++++++ .../6x6_exic/keymaps/via/keymap.c | 53 +++++++ .../6x6_exic/keymaps/via/rules.mk | 1 + .../6x6_exic/rules.mk | 1 + .../dactyl_manuform_carbonfet/6x7/info.json | 138 +++++++++++++++++ .../6x7/keymaps/default/keymap.c | 47 ++++++ .../6x7/keymaps/via/keymap.c | 47 ++++++ .../6x7/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/6x7/rules.mk | 1 + .../6x7_ex/info.json | 144 ++++++++++++++++++ .../6x7_ex/keymaps/default/keymap.c | 48 ++++++ .../6x7_ex/keymaps/via/keymap.c | 48 ++++++ .../6x7_ex/keymaps/via/rules.mk | 1 + .../dactyl_manuform_carbonfet/6x7_ex/rules.mk | 1 + .../dactyl_manuform_carbonfet/info.json | 9 ++ .../dactyl_manuform_carbonfet/readme.md | 70 +++++++++ 81 files changed, 3627 insertions(+) create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/info.json create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/readme.md diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json new file mode 100644 index 00000000000..a034c551ea7 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -0,0 +1,91 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [6, 0], "x": 8, "y": 1}, + {"matrix": [6, 1], "x": 9, "y": 1}, + {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [7, 0], "x": 8, "y": 2}, + {"matrix": [7, 1], "x": 9, "y": 2}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + + {"matrix": [8, 0], "x": 7, "y": 4}, + {"matrix": [8, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + + {"matrix": [4, 1], "x": 3, "y": 5}, + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + + {"matrix": [9, 0], "x": 7, "y": 5}, + {"matrix": [9, 1], "x": 8, "y": 5}, + {"matrix": [9, 3], "x": 9, "y": 5} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c new file mode 100644 index 00000000000..bce5c3d3302 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c @@ -0,0 +1,72 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _RAISE, + _LOWER +}; + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN2 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + 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_QUOT, + KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, + SFT_ESC, CTL_BSPC, KC_HOME, KC_END, ALT_SPC, SFT_ENT, + KC_TAB, RAISE, KC_GRV, KC_LGUI, LOWER, KC_DEL + + ), + + [_RAISE] = LAYOUT( + _______, _______, KC_MU, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, + _______, KC_ML, KC_MD, KC_MR, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, + _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, + _______, _______, KC_MB1, KC_MB2, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_LOWER] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c new file mode 100644 index 00000000000..bce5c3d3302 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c @@ -0,0 +1,72 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _RAISE, + _LOWER +}; + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN2 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + 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_QUOT, + KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, + SFT_ESC, CTL_BSPC, KC_HOME, KC_END, ALT_SPC, SFT_ENT, + KC_TAB, RAISE, KC_GRV, KC_LGUI, LOWER, KC_DEL + + ), + + [_RAISE] = LAYOUT( + _______, _______, KC_MU, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, + _______, KC_ML, KC_MD, KC_MR, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, + _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, + _______, _______, KC_MB1, KC_MB2, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_LOWER] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json new file mode 100644 index 00000000000..979890a415e --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -0,0 +1,95 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + + {"matrix": [8, 1], "x": 7, "y": 4}, + {"matrix": [8, 2], "x": 8, "y": 4}, + {"matrix": [9, 3], "x": 9, "y": 4}, + + {"matrix": [4, 1], "x": 3, "y": 5}, + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + + {"matrix": [9, 1], "x": 7, "y": 5}, + {"matrix": [9, 2], "x": 8, "y": 5}, + {"matrix": [9, 4], "x": 9, "y": 5} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/default/keymap.c new file mode 100644 index 00000000000..bf0bc226fc5 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/default/keymap.c @@ -0,0 +1,76 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _RAISE, + _LOWER +}; + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN2 + +#define APP_X A(KC_F4) +#define DKMGR G(KC_TAB) +#define APP_P LSA(KC_TAB) +#define APP_N A(KC_TAB) + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, APP_X, DKMGR, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, APP_P, APP_N, 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_QUOT, + KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, + SFT_ESC, CTL_BSPC, KC_HOME, KC_END, ALT_SPC, SFT_ENT, + KC_GRV, RAISE, KC_TAB, KC_DEL, LOWER, KC_LGUI + ), + + [_RAISE] = LAYOUT( + _______, _______, KC_MU, _______, _______, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, + _______, KC_ML, KC_MD, KC_MR, _______, _______, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, + _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, + _______, _______, KC_MB1, KC_MB2, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_LOWER] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c new file mode 100644 index 00000000000..bf0bc226fc5 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c @@ -0,0 +1,76 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _RAISE, + _LOWER +}; + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN2 + +#define APP_X A(KC_F4) +#define DKMGR G(KC_TAB) +#define APP_P LSA(KC_TAB) +#define APP_N A(KC_TAB) + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, APP_X, DKMGR, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, APP_P, APP_N, 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_QUOT, + KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, + SFT_ESC, CTL_BSPC, KC_HOME, KC_END, ALT_SPC, SFT_ENT, + KC_GRV, RAISE, KC_TAB, KC_DEL, LOWER, KC_LGUI + ), + + [_RAISE] = LAYOUT( + _______, _______, KC_MU, _______, _______, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, + _______, KC_ML, KC_MD, KC_MR, _______, _______, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, + _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, + _______, _______, KC_MB1, KC_MB2, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_LOWER] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json new file mode 100644 index 00000000000..487822387e0 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -0,0 +1,97 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 9, "y": 1}, + {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 4], "x": 13, "y": 1}, + {"matrix": [6, 5], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [8, 0], "x": 8, "y": 4}, + {"matrix": [8, 1], "x": 9, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + + {"matrix": [4, 2], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [9, 0], "x": 8, "y": 5}, + {"matrix": [9, 1], "x": 9, "y": 5}, + {"matrix": [9, 3], "x": 10, "y": 5} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c new file mode 100644 index 00000000000..ed93acd20cf --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c @@ -0,0 +1,53 @@ +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _RAISE, + _LOWER +}; + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN1 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_TAB, 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_BSLS, + KC_LBRC, KC_RBRC, KC_PLUS, KC_EQL, + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, + KC_TAB, KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, KC_DEL + + ), + + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, + _______, KC_PSCR, _______, KC_P0, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_RAISE] = LAYOUT( + _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, KC_EQL, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c new file mode 100644 index 00000000000..ed93acd20cf --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + _RAISE, + _LOWER +}; + +#define SFT_ESC SFT_T(KC_ESC) +#define CTL_BSPC CTL_T(KC_BSPC) +#define ALT_SPC ALT_T(KC_SPC) +#define SFT_ENT SFT_T(KC_ENT) + +#define KC_ML KC_MS_LEFT +#define KC_MR KC_MS_RIGHT +#define KC_MU KC_MS_UP +#define KC_MD KC_MS_DOWN +#define KC_MB1 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN1 + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_TAB, 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_BSLS, + KC_LBRC, KC_RBRC, KC_PLUS, KC_EQL, + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, + KC_TAB, KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, KC_DEL + + ), + + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, + _______, KC_PSCR, _______, KC_P0, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_RAISE] = LAYOUT( + _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, KC_EQL, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json new file mode 100644 index 00000000000..20f99494cb2 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -0,0 +1,101 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [6, 0], "x": 8, "y": 1}, + {"matrix": [6, 1], "x": 9, "y": 1}, + {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 5], "x": 13, "y": 1}, + {"matrix": [6, 6], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 1], "x": 9, "y": 2}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 5], "x": 13, "y": 2}, + {"matrix": [7, 6], "x": 14, "y": 2}, + + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [8, 1], "x": 8, "y": 4}, + {"matrix": [8, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, + {"matrix": [4, 6], "x": 6, "y": 5}, + + {"matrix": [9, 1], "x": 8, "y": 5}, + {"matrix": [9, 2], "x": 9, "y": 5}, + {"matrix": [9, 4], "x": 10, "y": 5} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c new file mode 100644 index 00000000000..ccd6c07a777 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c @@ -0,0 +1,40 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +#define C_HOME LCTL_T(KC_HOME) +#define C_PGUP RCTL_T(KC_PGUP) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, G(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, + TT(_FN), KC_SPC, C_HOME, C_PGUP, KC_BSPC, KC_ENT, + KC_LGUI, KC_LALT, KC_END, KC_PGDN, KC_RALT, KC_RGUI + ), + + [_FN] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, + KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, + _______, _______, _______, _______, KC_DEL, KC_INS, + _______, _______, _______, _______, KC_PAUS, KC_PSCR + ), + + [_NUMPAD] = LAYOUT( + + _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, _______, _______, _______, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______, + _______, _______, KC_P0, KC_PDOT, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c new file mode 100644 index 00000000000..ccd6c07a777 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c @@ -0,0 +1,40 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +#define C_HOME LCTL_T(KC_HOME) +#define C_PGUP RCTL_T(KC_PGUP) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, G(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, + TT(_FN), KC_SPC, C_HOME, C_PGUP, KC_BSPC, KC_ENT, + KC_LGUI, KC_LALT, KC_END, KC_PGDN, KC_RALT, KC_RGUI + ), + + [_FN] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, + KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, + _______, _______, _______, _______, KC_DEL, KC_INS, + _______, _______, _______, _______, KC_PAUS, KC_PSCR + ), + + [_NUMPAD] = LAYOUT( + + _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, _______, _______, _______, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______, + _______, _______, KC_P0, KC_PDOT, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json new file mode 100644 index 00000000000..48149be7143 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -0,0 +1,101 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 ex", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 9, "y": 1}, + {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 4], "x": 13, "y": 1}, + {"matrix": [6, 5], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3}, + + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [8, 0], "x": 8, "y": 4}, + {"matrix": [8, 1], "x": 9, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + + {"matrix": [4, 2], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [9, 0], "x": 8, "y": 5}, + {"matrix": [9, 1], "x": 9, "y": 5}, + {"matrix": [9, 3], "x": 10, "y": 5} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c new file mode 100644 index 00000000000..7962c502490 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c @@ -0,0 +1,58 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layer_number { + _BASE, + _LOWER, + _RAISE +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, 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_LCTL, KC_LALT, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, + KC_BSPC, KC_CAPS, KC_GRV, KC_LGUI, KC_APP, KC_DEL + + ), + + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, + _______, _______, _______, KC_PSCR, _______, KC_P0, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_RAISE] = LAYOUT( + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, KC_EQL, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json new file mode 100644 index 00000000000..01400285c6a --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -0,0 +1,105 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [6, 0], "x": 8, "y": 1}, + {"matrix": [6, 1], "x": 9, "y": 1}, + {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 5], "x": 13, "y": 1}, + {"matrix": [6, 6], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 1], "x": 9, "y": 2}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 5], "x": 13, "y": 2}, + {"matrix": [7, 6], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 5], "x": 13, "y": 3}, + {"matrix": [8, 6], "x": 14, "y": 3}, + + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [8, 1], "x": 8, "y": 4}, + {"matrix": [8, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, + {"matrix": [4, 6], "x": 6, "y": 5}, + + {"matrix": [9, 1], "x": 8, "y": 5}, + {"matrix": [9, 2], "x": 9, "y": 5}, + {"matrix": [9, 4], "x": 10, "y": 5} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c new file mode 100644 index 00000000000..ed148c0afbc --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c @@ -0,0 +1,40 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +#define LT1_BSPC LT(_FN, KC_BSPC) +#define OSM_CS OSM(MOD_LSFT | MOD_LCTL) +#define OSM_CA OSM(MOD_LCTL | MOD_LALT) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, G(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, + LT1_BSPC, KC_SPC, KC_HOME, KC_PGUP, KC_ENT, KC_DEL, + OSM_CS, KC_LGUI, KC_END, KC_PGDN, KC_RGUI, OSM_CA + ), + + [_FN] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, + _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, + _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, KC_PAUS, KC_PSCR + ), + + [_NUMPAD] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, _______, _______, _______, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______, + _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c new file mode 100644 index 00000000000..ed148c0afbc --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c @@ -0,0 +1,40 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +#define LT1_BSPC LT(_FN, KC_BSPC) +#define OSM_CS OSM(MOD_LSFT | MOD_LCTL) +#define OSM_CA OSM(MOD_LCTL | MOD_LALT) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, G(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, + LT1_BSPC, KC_SPC, KC_HOME, KC_PGUP, KC_ENT, KC_DEL, + OSM_CS, KC_LGUI, KC_END, KC_PGDN, KC_RGUI, OSM_CA + ), + + [_FN] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, + _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, + _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, KC_PAUS, KC_PSCR + ), + + [_NUMPAD] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, _______, _______, _______, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______, + _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json new file mode 100644 index 00000000000..dbbbef04760 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -0,0 +1,111 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [6, 0], "x": 9, "y": 0}, + {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [6, 2], "x": 11, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + {"matrix": [6, 5], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [7, 0], "x": 9, "y": 1}, + {"matrix": [7, 1], "x": 10, "y": 1}, + {"matrix": [7, 2], "x": 11, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1}, + {"matrix": [7, 4], "x": 13, "y": 1}, + {"matrix": [7, 5], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [8, 0], "x": 9, "y": 2}, + {"matrix": [8, 1], "x": 10, "y": 2}, + {"matrix": [8, 2], "x": 11, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2}, + {"matrix": [8, 4], "x": 13, "y": 2}, + {"matrix": [8, 5], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [9, 0], "x": 9, "y": 3}, + {"matrix": [9, 1], "x": 10, "y": 3}, + {"matrix": [9, 2], "x": 11, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3}, + {"matrix": [9, 4], "x": 13, "y": 3}, + {"matrix": [9, 5], "x": 14, "y": 3}, + + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + + {"matrix": [10, 2], "x": 11, "y": 4}, + {"matrix": [10, 3], "x": 12, "y": 4}, + + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [10, 0], "x": 8, "y": 5}, + {"matrix": [10, 1], "x": 9, "y": 5}, + {"matrix": [11, 2], "x": 10, "y": 5}, + + {"matrix": [5, 2], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [11, 0], "x": 8, "y": 6}, + {"matrix": [11, 1], "x": 9, "y": 6}, + {"matrix": [11, 3], "x": 10, "y": 6} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/default/keymap.c new file mode 100644 index 00000000000..8b8e09188ef --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/default/keymap.c @@ -0,0 +1,60 @@ +/* +Copyright 2019 Tom Short + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers { + _QWERTY, + _LOWER, + _RAISE +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, + KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER , + KC_TAB, KC_BSPC, KC_GRV, KC_LGUI, KC_LALT,KC_DEL + + ), + + [_LOWER] = LAYOUT( + KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, + _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, + _______,KC_PSCR, _______, KC_P0, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______, KC_EQL ,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c new file mode 100644 index 00000000000..8b8e09188ef --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c @@ -0,0 +1,60 @@ +/* +Copyright 2019 Tom Short + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers { + _QWERTY, + _LOWER, + _RAISE +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, + KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER , + KC_TAB, KC_BSPC, KC_GRV, KC_LGUI, KC_LALT,KC_DEL + + ), + + [_LOWER] = LAYOUT( + KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, + _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, + _______,KC_PSCR, _______, KC_P0, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______, KC_EQL ,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json new file mode 100644 index 00000000000..b3c09c6a66f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -0,0 +1,117 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 eic", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [6, 0], "x": 8, "y": 0}, + {"matrix": [6, 1], "x": 9, "y": 0}, + {"matrix": [6, 2], "x": 10, "y": 0}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 4], "x": 12, "y": 0}, + {"matrix": [6, 5], "x": 13, "y": 0}, + {"matrix": [6, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [7, 0], "x": 8, "y": 1}, + {"matrix": [7, 1], "x": 9, "y": 1}, + {"matrix": [7, 2], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 4], "x": 12, "y": 1}, + {"matrix": [7, 5], "x": 13, "y": 1}, + {"matrix": [7, 6], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [8, 0], "x": 8, "y": 2}, + {"matrix": [8, 1], "x": 9, "y": 2}, + {"matrix": [8, 2], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 4], "x": 12, "y": 2}, + {"matrix": [8, 5], "x": 13, "y": 2}, + {"matrix": [8, 6], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [9, 1], "x": 9, "y": 3}, + {"matrix": [9, 2], "x": 10, "y": 3}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 4], "x": 12, "y": 3}, + {"matrix": [9, 5], "x": 13, "y": 3}, + {"matrix": [9, 6], "x": 14, "y": 3}, + + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 4], "x": 12, "y": 4}, + + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [10, 1], "x": 8, "y": 5}, + {"matrix": [10, 2], "x": 9, "y": 5}, + {"matrix": [11, 3], "x": 10, "y": 5}, + + {"matrix": [5, 2], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [11, 1], "x": 8, "y": 6}, + {"matrix": [11, 2], "x": 9, "y": 6}, + {"matrix": [11, 4], "x": 10, "y": 6} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/default/keymap.c new file mode 100644 index 00000000000..f636266685f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/default/keymap.c @@ -0,0 +1,58 @@ +/* +Copyright 2019 Tom Short +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, A(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, + TT(_FN), KC_SPC, KC_HOME, KC_PGUP, KC_BSPC, KC_ENT, + KC_LALT, KC_LGUI, KC_END, KC_PGDN, KC_RCTL, KC_RALT + ), + + [_FN] = LAYOUT( + _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, + _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, KC_PSCR, KC_PAUS + ), + + [_NUMPAD] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + _______, _______, KC_P0, KC_PDOT, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c new file mode 100644 index 00000000000..f636266685f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c @@ -0,0 +1,58 @@ +/* +Copyright 2019 Tom Short +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, A(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, + TT(_FN), KC_SPC, KC_HOME, KC_PGUP, KC_BSPC, KC_ENT, + KC_LALT, KC_LGUI, KC_END, KC_PGDN, KC_RCTL, KC_RALT + ), + + [_FN] = LAYOUT( + _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, + _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, KC_PSCR, KC_PAUS + ), + + [_NUMPAD] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + _______, _______, KC_P0, KC_PDOT, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json new file mode 100644 index 00000000000..14e8ded6e0c --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -0,0 +1,115 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 ex", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [6, 0], "x": 9, "y": 0}, + {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [6, 2], "x": 11, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + {"matrix": [6, 5], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [7, 0], "x": 9, "y": 1}, + {"matrix": [7, 1], "x": 10, "y": 1}, + {"matrix": [7, 2], "x": 11, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1}, + {"matrix": [7, 4], "x": 13, "y": 1}, + {"matrix": [7, 5], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [8, 0], "x": 9, "y": 2}, + {"matrix": [8, 1], "x": 10, "y": 2}, + {"matrix": [8, 2], "x": 11, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2}, + {"matrix": [8, 4], "x": 13, "y": 2}, + {"matrix": [8, 5], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [9, 0], "x": 9, "y": 3}, + {"matrix": [9, 1], "x": 10, "y": 3}, + {"matrix": [9, 2], "x": 11, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3}, + {"matrix": [9, 4], "x": 13, "y": 3}, + {"matrix": [9, 5], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + + {"matrix": [10, 2], "x": 11, "y": 4}, + {"matrix": [10, 3], "x": 12, "y": 4}, + {"matrix": [10, 4], "x": 13, "y": 4}, + {"matrix": [10, 5], "x": 14, "y": 4}, + + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [10, 0], "x": 8, "y": 5}, + {"matrix": [10, 1], "x": 9, "y": 5}, + {"matrix": [11, 2], "x": 10, "y": 5}, + + {"matrix": [5, 2], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [11, 0], "x": 8, "y": 6}, + {"matrix": [11, 1], "x": 9, "y": 6}, + {"matrix": [11, 3], "x": 10, "y": 6} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/default/keymap.c new file mode 100644 index 00000000000..b7fad440155 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/default/keymap.c @@ -0,0 +1,46 @@ +// Copyright 2023 Kostas Pagratis (@kpagratis) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_LCTL, KC_LALT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_RALT, KC_RCTL, + RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, + KC_HOME, KC_PGUP, KC_LGUI, KC_RGUI, KC_PGDN, KC_END + ), + + [_LOWER] = LAYOUT( + KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,_______, + _______,_______, KC_INS,KC_PAUS,KC_PSCR,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,_______,_______, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,_______,_______, + _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + + ), + + [_RAISE] = 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_TRNS, KC_TRNS,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_TRNS, KC_TRNS,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______,_______,_______, _______,_______,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c new file mode 100644 index 00000000000..b7fad440155 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c @@ -0,0 +1,46 @@ +// Copyright 2023 Kostas Pagratis (@kpagratis) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_LCTL, KC_LALT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_RALT, KC_RCTL, + RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, + KC_HOME, KC_PGUP, KC_LGUI, KC_RGUI, KC_PGDN, KC_END + ), + + [_LOWER] = LAYOUT( + KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,_______, + _______,_______, KC_INS,KC_PAUS,KC_PSCR,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,_______,_______, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,_______,_______, + _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + + ), + + [_RAISE] = 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_TRNS, KC_TRNS,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_TRNS, KC_TRNS,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______,_______,_______, _______,_______,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json new file mode 100644 index 00000000000..309a628f605 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -0,0 +1,121 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 exic", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [6, 0], "x": 8, "y": 0}, + {"matrix": [6, 1], "x": 9, "y": 0}, + {"matrix": [6, 2], "x": 10, "y": 0}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 4], "x": 12, "y": 0}, + {"matrix": [6, 5], "x": 13, "y": 0}, + {"matrix": [6, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [7, 0], "x": 8, "y": 1}, + {"matrix": [7, 1], "x": 9, "y": 1}, + {"matrix": [7, 2], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 4], "x": 12, "y": 1}, + {"matrix": [7, 5], "x": 13, "y": 1}, + {"matrix": [7, 6], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [8, 0], "x": 8, "y": 2}, + {"matrix": [8, 1], "x": 9, "y": 2}, + {"matrix": [8, 2], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 4], "x": 12, "y": 2}, + {"matrix": [8, 5], "x": 13, "y": 2}, + {"matrix": [8, 6], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [9, 1], "x": 9, "y": 3}, + {"matrix": [9, 2], "x": 10, "y": 3}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 4], "x": 12, "y": 3}, + {"matrix": [9, 5], "x": 13, "y": 3}, + {"matrix": [9, 6], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 4], "x": 12, "y": 4}, + {"matrix": [10, 5], "x": 13, "y": 4}, + {"matrix": [10, 6], "x": 14, "y": 4}, + + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [10, 1], "x": 8, "y": 5}, + {"matrix": [10, 2], "x": 9, "y": 5}, + {"matrix": [11, 3], "x": 10, "y": 5}, + + {"matrix": [5, 2], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [11, 1], "x": 8, "y": 6}, + {"matrix": [11, 2], "x": 9, "y": 6}, + {"matrix": [11, 4], "x": 10, "y": 6} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c new file mode 100644 index 00000000000..d90872ca05f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +// Some basic macros +#define TASK LCTL(LSFT(KC_ESC)) +#define TAB_R LCTL(KC_TAB) +#define TAB_L LCTL(LSFT(KC_TAB)) +#define TAB_RO LCTL(LSFT(KC_T)) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, TAB_RO, TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_CAPS, KC_LGUI, TAB_L, TAB_R, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, + TT(_FN), KC_SPC, KC_HOME, KC_PGUP, KC_BSPC, KC_ENT, + KC_PSCR, TASK, KC_END, KC_PGDN, KC_LCTL, KC_LALT + + ), + + [_FN] = LAYOUT( + _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, + _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_NUMPAD] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c new file mode 100644 index 00000000000..d90872ca05f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _QWERTY, + _FN, + _NUMPAD +}; + +// Some basic macros +#define TASK LCTL(LSFT(KC_ESC)) +#define TAB_R LCTL(KC_TAB) +#define TAB_L LCTL(LSFT(KC_TAB)) +#define TAB_RO LCTL(LSFT(KC_T)) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, TAB_RO, TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_CAPS, KC_LGUI, TAB_L, TAB_R, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, + TT(_FN), KC_SPC, KC_HOME, KC_PGUP, KC_BSPC, KC_ENT, + KC_PSCR, TASK, KC_END, KC_PGDN, KC_LCTL, KC_LALT + + ), + + [_FN] = LAYOUT( + _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, + _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_NUMPAD] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, + _______, _______, _______, _______, _______, KC_PENT, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json new file mode 100644 index 00000000000..7e1f8fbfedc --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -0,0 +1,128 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "rgblight": { + "led_count": 12 + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [7, 0], "x": 9, "y": 0}, + {"matrix": [7, 1], "x": 10, "y": 0}, + {"matrix": [7, 2], "x": 11, "y": 0}, + {"matrix": [7, 3], "x": 12, "y": 0}, + {"matrix": [7, 4], "x": 13, "y": 0}, + {"matrix": [7, 5], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [8, 0], "x": 9, "y": 1}, + {"matrix": [8, 1], "x": 10, "y": 1}, + {"matrix": [8, 2], "x": 11, "y": 1}, + {"matrix": [8, 3], "x": 12, "y": 1}, + {"matrix": [8, 4], "x": 13, "y": 1}, + {"matrix": [8, 5], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [9, 0], "x": 9, "y": 2}, + {"matrix": [9, 1], "x": 10, "y": 2}, + {"matrix": [9, 2], "x": 11, "y": 2}, + {"matrix": [9, 3], "x": 12, "y": 2}, + {"matrix": [9, 4], "x": 13, "y": 2}, + {"matrix": [9, 5], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [10, 0], "x": 9, "y": 3}, + {"matrix": [10, 1], "x": 10, "y": 3}, + {"matrix": [10, 2], "x": 11, "y": 3}, + {"matrix": [10, 3], "x": 12, "y": 3}, + {"matrix": [10, 4], "x": 13, "y": 3}, + {"matrix": [10, 5], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + + {"matrix": [11, 0], "x": 9, "y": 4}, + {"matrix": [11, 1], "x": 10, "y": 4}, + {"matrix": [11, 2], "x": 11, "y": 4}, + {"matrix": [11, 3], "x": 12, "y": 4}, + {"matrix": [11, 4], "x": 13, "y": 4}, + {"matrix": [11, 5], "x": 14, "y": 4}, + + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + + {"matrix": [12, 2], "x": 11, "y": 5}, + {"matrix": [12, 3], "x": 12, "y": 5}, + + {"matrix": [6, 3], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [12, 0], "x": 8, "y": 6}, + {"matrix": [12, 1], "x": 9, "y": 6}, + {"matrix": [13, 2], "x": 10, "y": 6}, + + {"matrix": [6, 2], "x": 4, "y": 7}, + {"matrix": [6, 4], "x": 5, "y": 7}, + {"matrix": [6, 5], "x": 6, "y": 7}, + + {"matrix": [13, 0], "x": 8, "y": 7}, + {"matrix": [13, 1], "x": 9, "y": 7}, + {"matrix": [13, 3], "x": 10, "y": 7} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/default/keymap.c new file mode 100644 index 00000000000..5d04491d0ff --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +// Copyright 2021 david@impstyle.com (@zwnk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + 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_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, + KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE ,KC_SPC , KC_HOME, KC_END, KC_ENT, LOWER, + KC_TAB,KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, KC_DEL + + ), + + [_LOWER] = LAYOUT( + 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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, + _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, + _______,KC_PSCR, _______, KC_P0, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + _______,_______, KC_EQL ,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c new file mode 100644 index 00000000000..5d04491d0ff --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +// Copyright 2021 david@impstyle.com (@zwnk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + 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_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, + KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE ,KC_SPC , KC_HOME, KC_END, KC_ENT, LOWER, + KC_TAB,KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, KC_DEL + + ), + + [_LOWER] = LAYOUT( + 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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, + _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, + _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, + _______,KC_PSCR, _______, KC_P0, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, + _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + _______,_______, KC_EQL ,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json new file mode 100644 index 00000000000..16c116240ab --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -0,0 +1,136 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 eic", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "rgblight": { + "led_count": 12 + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [7, 0], "x": 8, "y": 0}, + {"matrix": [7, 1], "x": 9, "y": 0}, + {"matrix": [7, 2], "x": 10, "y": 0}, + {"matrix": [7, 3], "x": 11, "y": 0}, + {"matrix": [7, 4], "x": 12, "y": 0}, + {"matrix": [7, 5], "x": 13, "y": 0}, + {"matrix": [7, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 0], "x": 8, "y": 1}, + {"matrix": [8, 1], "x": 9, "y": 1}, + {"matrix": [8, 2], "x": 10, "y": 1}, + {"matrix": [8, 3], "x": 11, "y": 1}, + {"matrix": [8, 4], "x": 12, "y": 1}, + {"matrix": [8, 5], "x": 13, "y": 1}, + {"matrix": [8, 6], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 0], "x": 8, "y": 2}, + {"matrix": [9, 1], "x": 9, "y": 2}, + {"matrix": [9, 2], "x": 10, "y": 2}, + {"matrix": [9, 3], "x": 11, "y": 2}, + {"matrix": [9, 4], "x": 12, "y": 2}, + {"matrix": [9, 5], "x": 13, "y": 2}, + {"matrix": [9, 6], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + + {"matrix": [10, 0], "x": 8, "y": 3}, + {"matrix": [10, 1], "x": 9, "y": 3}, + {"matrix": [10, 2], "x": 10, "y": 3}, + {"matrix": [10, 3], "x": 11, "y": 3}, + {"matrix": [10, 4], "x": 12, "y": 3}, + {"matrix": [10, 5], "x": 13, "y": 3}, + {"matrix": [10, 6], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + + {"matrix": [11, 1], "x": 9, "y": 4}, + {"matrix": [11, 2], "x": 10, "y": 4}, + {"matrix": [11, 3], "x": 11, "y": 4}, + {"matrix": [11, 4], "x": 12, "y": 4}, + {"matrix": [11, 5], "x": 13, "y": 4}, + {"matrix": [11, 6], "x": 14, "y": 4}, + + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + + {"matrix": [12, 3], "x": 11, "y": 5}, + {"matrix": [12, 4], "x": 12, "y": 5}, + + {"matrix": [6, 3], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [12, 1], "x": 8, "y": 6}, + {"matrix": [12, 2], "x": 9, "y": 6}, + {"matrix": [13, 3], "x": 10, "y": 6}, + + {"matrix": [6, 2], "x": 4, "y": 7}, + {"matrix": [6, 4], "x": 5, "y": 7}, + {"matrix": [6, 5], "x": 6, "y": 7}, + + {"matrix": [13, 1], "x": 8, "y": 7}, + {"matrix": [13, 2], "x": 9, "y": 7}, + {"matrix": [13, 4], "x": 10, "y": 7} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/default/keymap.c new file mode 100644 index 00000000000..3619d047ef6 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/default/keymap.c @@ -0,0 +1,54 @@ +// Copyright 2012 Jun Wako +// Copyright 2021 Dmitriy Kuminov (@dmik) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) +#define LS_CAPS LSFT_T(KC_CAPS) +#define RS_QUOT RSFT_T(KC_QUOT) +#define APP_N A(KC_TAB) +#define APP_P LSA(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, APP_P, APP_N, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + LS_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RS_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, + RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, + KC_LALT, KC_LGUI, KC_HOME, KC_END, KC_RGUI, KC_RALT + + ), + + [_LOWER] = LAYOUT( + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,KC_EXLM,KC_AT, KC_HASH, KC_DLR,_______, _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______, + _______,_______,_______,_______,KC_PGUP,_______,_______, _______,KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, + _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______, _______,KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, + _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, + _______,_______, KC_P0, KC_PDOT, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = LAYOUT( + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,KC_F18,_______, _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_VOLU,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_MUTE,_______,_______, _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______, + _______,_______,_______,_______,KC_VOLD,_______, _______,_______,_______,_______,_______,_______, + _______,_______, _______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c new file mode 100644 index 00000000000..3619d047ef6 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c @@ -0,0 +1,54 @@ +// Copyright 2012 Jun Wako +// Copyright 2021 Dmitriy Kuminov (@dmik) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) +#define LS_CAPS LSFT_T(KC_CAPS) +#define RS_QUOT RSFT_T(KC_QUOT) +#define APP_N A(KC_TAB) +#define APP_P LSA(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, APP_P, APP_N, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + LS_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RS_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, + RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, + KC_LALT, KC_LGUI, KC_HOME, KC_END, KC_RGUI, KC_RALT + + ), + + [_LOWER] = LAYOUT( + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,KC_EXLM,KC_AT, KC_HASH, KC_DLR,_______, _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______, + _______,_______,_______,_______,KC_PGUP,_______,_______, _______,KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, + _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______, _______,KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, + _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, + _______,_______, KC_P0, KC_PDOT, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = LAYOUT( + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,KC_F18,_______, _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_VOLU,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_MUTE,_______,_______, _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______, + _______,_______,_______,_______,KC_VOLD,_______, _______,_______,_______,_______,_______,_______, + _______,_______, _______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json new file mode 100644 index 00000000000..d35ff729f56 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -0,0 +1,132 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 ex", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "rgblight": { + "led_count": 12 + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [7, 0], "x": 9, "y": 0}, + {"matrix": [7, 1], "x": 10, "y": 0}, + {"matrix": [7, 2], "x": 11, "y": 0}, + {"matrix": [7, 3], "x": 12, "y": 0}, + {"matrix": [7, 4], "x": 13, "y": 0}, + {"matrix": [7, 5], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [8, 0], "x": 9, "y": 1}, + {"matrix": [8, 1], "x": 10, "y": 1}, + {"matrix": [8, 2], "x": 11, "y": 1}, + {"matrix": [8, 3], "x": 12, "y": 1}, + {"matrix": [8, 4], "x": 13, "y": 1}, + {"matrix": [8, 5], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [9, 0], "x": 9, "y": 2}, + {"matrix": [9, 1], "x": 10, "y": 2}, + {"matrix": [9, 2], "x": 11, "y": 2}, + {"matrix": [9, 3], "x": 12, "y": 2}, + {"matrix": [9, 4], "x": 13, "y": 2}, + {"matrix": [9, 5], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [10, 0], "x": 9, "y": 3}, + {"matrix": [10, 1], "x": 10, "y": 3}, + {"matrix": [10, 2], "x": 11, "y": 3}, + {"matrix": [10, 3], "x": 12, "y": 3}, + {"matrix": [10, 4], "x": 13, "y": 3}, + {"matrix": [10, 5], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + + {"matrix": [11, 0], "x": 9, "y": 4}, + {"matrix": [11, 1], "x": 10, "y": 4}, + {"matrix": [11, 2], "x": 11, "y": 4}, + {"matrix": [11, 3], "x": 12, "y": 4}, + {"matrix": [11, 4], "x": 13, "y": 4}, + {"matrix": [11, 5], "x": 14, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + + {"matrix": [12, 2], "x": 11, "y": 5}, + {"matrix": [12, 3], "x": 12, "y": 5}, + {"matrix": [12, 4], "x": 13, "y": 5}, + {"matrix": [12, 5], "x": 14, "y": 5}, + + {"matrix": [6, 3], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [12, 0], "x": 8, "y": 6}, + {"matrix": [12, 1], "x": 9, "y": 6}, + {"matrix": [13, 2], "x": 10, "y": 6}, + + {"matrix": [6, 2], "x": 4, "y": 7}, + {"matrix": [6, 4], "x": 5, "y": 7}, + {"matrix": [6, 5], "x": 6, "y": 7}, + + {"matrix": [13, 0], "x": 8, "y": 7}, + {"matrix": [13, 1], "x": 9, "y": 7}, + {"matrix": [13, 3], "x": 10, "y": 7} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/default/keymap.c new file mode 100644 index 00000000000..c3ffe60f663 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/default/keymap.c @@ -0,0 +1,51 @@ +// Copyright 2012 Jun Wako +// Copyright 2021 Dmitriy Kuminov (@dmik) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) +#define APP_P A(KC_TAB) +#define APP_N LSA(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + 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_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_LALT, APP_P, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, APP_N, KC_RALT, + RAISE, KC_SPC, KC_LSFT, KC_RSFT, KC_ENT, LOWER, + KC_HOME, KC_BSPC,KC_LGUI, KC_RGUI, KC_DEL, KC_END + ), + + [_LOWER] = LAYOUT( + 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_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, + _______,_______,_______,_______,KC_PGUP,_______, KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, + _______,KC_SCRL,KC_INS, KC_PAUS,KC_PSCR,_______, KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, + _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, + _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_VOLU,KC_LBRC, KC_RBRC,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_MUTE,KC_LPRN, KC_RPRN,KC_MNXT,KC_MPRV,KC_MPLY,_______,_______, + _______,_______,_______,_______,KC_VOLD,KC_LCBR, KC_RCBR,_______,_______,_______,_______,_______, + _______,_______,_______,_______, _______,_______,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c new file mode 100644 index 00000000000..c3ffe60f663 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c @@ -0,0 +1,51 @@ +// Copyright 2012 Jun Wako +// Copyright 2021 Dmitriy Kuminov (@dmik) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) +#define APP_P A(KC_TAB) +#define APP_N LSA(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + 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_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_LALT, APP_P, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, APP_N, KC_RALT, + RAISE, KC_SPC, KC_LSFT, KC_RSFT, KC_ENT, LOWER, + KC_HOME, KC_BSPC,KC_LGUI, KC_RGUI, KC_DEL, KC_END + ), + + [_LOWER] = LAYOUT( + 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_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, + _______,_______,_______,_______,KC_PGUP,_______, KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, + _______,KC_SCRL,KC_INS, KC_PAUS,KC_PSCR,_______, KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, + _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, + _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_VOLU,KC_LBRC, KC_RBRC,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_MUTE,KC_LPRN, KC_RPRN,KC_MNXT,KC_MPRV,KC_MPLY,_______,_______, + _______,_______,_______,_______,KC_VOLD,KC_LCBR, KC_RCBR,_______,_______,_______,_______,_______, + _______,_______,_______,_______, _______,_______,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json new file mode 100644 index 00000000000..556cbe7c347 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -0,0 +1,140 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 exic", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "rgblight": { + "led_count": 12 + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [7, 0], "x": 8, "y": 0}, + {"matrix": [7, 1], "x": 9, "y": 0}, + {"matrix": [7, 2], "x": 10, "y": 0}, + {"matrix": [7, 3], "x": 11, "y": 0}, + {"matrix": [7, 4], "x": 12, "y": 0}, + {"matrix": [7, 5], "x": 13, "y": 0}, + {"matrix": [7, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 0], "x": 8, "y": 1}, + {"matrix": [8, 1], "x": 9, "y": 1}, + {"matrix": [8, 2], "x": 10, "y": 1}, + {"matrix": [8, 3], "x": 11, "y": 1}, + {"matrix": [8, 4], "x": 12, "y": 1}, + {"matrix": [8, 5], "x": 13, "y": 1}, + {"matrix": [8, 6], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 0], "x": 8, "y": 2}, + {"matrix": [9, 1], "x": 9, "y": 2}, + {"matrix": [9, 2], "x": 10, "y": 2}, + {"matrix": [9, 3], "x": 11, "y": 2}, + {"matrix": [9, 4], "x": 12, "y": 2}, + {"matrix": [9, 5], "x": 13, "y": 2}, + {"matrix": [9, 6], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + + {"matrix": [10, 0], "x": 8, "y": 3}, + {"matrix": [10, 1], "x": 9, "y": 3}, + {"matrix": [10, 2], "x": 10, "y": 3}, + {"matrix": [10, 3], "x": 11, "y": 3}, + {"matrix": [10, 4], "x": 12, "y": 3}, + {"matrix": [10, 5], "x": 13, "y": 3}, + {"matrix": [10, 6], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + + {"matrix": [11, 1], "x": 9, "y": 4}, + {"matrix": [11, 2], "x": 10, "y": 4}, + {"matrix": [11, 3], "x": 11, "y": 4}, + {"matrix": [11, 4], "x": 12, "y": 4}, + {"matrix": [11, 5], "x": 13, "y": 4}, + {"matrix": [11, 6], "x": 14, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + + {"matrix": [12, 3], "x": 11, "y": 5}, + {"matrix": [12, 4], "x": 12, "y": 5}, + {"matrix": [12, 5], "x": 13, "y": 5}, + {"matrix": [12, 6], "x": 14, "y": 5}, + + {"matrix": [6, 3], "x": 4, "y": 6}, + {"matrix": [5, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + + {"matrix": [12, 1], "x": 8, "y": 6}, + {"matrix": [12, 2], "x": 9, "y": 6}, + {"matrix": [13, 3], "x": 10, "y": 6}, + + {"matrix": [6, 2], "x": 4, "y": 7}, + {"matrix": [6, 4], "x": 5, "y": 7}, + {"matrix": [6, 5], "x": 6, "y": 7}, + + {"matrix": [13, 1], "x": 8, "y": 7}, + {"matrix": [13, 2], "x": 9, "y": 7}, + {"matrix": [13, 4], "x": 10, "y": 7} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/default/keymap.c new file mode 100644 index 00000000000..bfd63b0e737 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/default/keymap.c @@ -0,0 +1,53 @@ +// Copyright 2012 Jun Wako +// Copyright 2021 Dmitriy Kuminov (@dmik) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) +#define APP_P A(KC_TAB) +#define APP_N LSA(KC_TAB) +#define DKMGR G(KC_TAB) +#define TKMGR RCS(KC_ESC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, DKMGR, TKMGR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, 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_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_LALT, APP_P, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, APP_N, KC_RALT, + RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, + KC_LGUI, KC_LSFT, KC_HOME, KC_END, KC_RSFT, KC_RGUI + ), + + [_LOWER] = LAYOUT( + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,KC_EXLM,KC_AT, KC_HASH, KC_DLR,_______, _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______, + _______,_______,_______,_______,KC_PGUP,_______,_______, _______,KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, + _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______, _______,KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, + _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, + _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = LAYOUT( + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,KC_F18,_______, _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_VOLU,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_MUTE,_______,_______, _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______, + _______,_______,_______,_______,KC_VOLD,_______, _______,_______,_______,_______,_______,_______, + _______,_______,_______,_______, _______,_______,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c new file mode 100644 index 00000000000..bfd63b0e737 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +// Copyright 2012 Jun Wako +// Copyright 2021 Dmitriy Kuminov (@dmik) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) +#define APP_P A(KC_TAB) +#define APP_N LSA(KC_TAB) +#define DKMGR G(KC_TAB) +#define TKMGR RCS(KC_ESC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, DKMGR, TKMGR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, 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_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_LALT, APP_P, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, APP_N, KC_RALT, + RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, + KC_LGUI, KC_LSFT, KC_HOME, KC_END, KC_RSFT, KC_RGUI + ), + + [_LOWER] = LAYOUT( + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,KC_EXLM,KC_AT, KC_HASH, KC_DLR,_______, _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______, + _______,_______,_______,_______,KC_PGUP,_______,_______, _______,KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, + _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______, _______,KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, + _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, + _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = LAYOUT( + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,KC_F18,_______, _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_VOLU,_______,_______, _______,_______,_______,_______,_______,_______,_______, + _______,_______,_______,_______,KC_MUTE,_______,_______, _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______, + _______,_______,_______,_______,KC_VOLD,_______, _______,_______,_______,_______,_______,_______, + _______,_______,_______,_______, _______,_______,_______,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json new file mode 100644 index 00000000000..77d5c58ffd7 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -0,0 +1,138 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 6x7", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "rgblight": { + "led_count": 12 + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [7, 0], "x": 10, "y": 0}, + {"matrix": [7, 1], "x": 11, "y": 0}, + {"matrix": [7, 2], "x": 12, "y": 0}, + {"matrix": [7, 3], "x": 13, "y": 0}, + {"matrix": [7, 4], "x": 14, "y": 0}, + {"matrix": [7, 5], "x": 15, "y": 0}, + {"matrix": [7, 6], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 0], "x": 10, "y": 1}, + {"matrix": [8, 1], "x": 11, "y": 1}, + {"matrix": [8, 2], "x": 12, "y": 1}, + {"matrix": [8, 3], "x": 13, "y": 1}, + {"matrix": [8, 4], "x": 14, "y": 1}, + {"matrix": [8, 5], "x": 15, "y": 1}, + {"matrix": [8, 6], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 0], "x": 10, "y": 2}, + {"matrix": [9, 1], "x": 11, "y": 2}, + {"matrix": [9, 2], "x": 12, "y": 2}, + {"matrix": [9, 3], "x": 13, "y": 2}, + {"matrix": [9, 4], "x": 14, "y": 2}, + {"matrix": [9, 5], "x": 15, "y": 2}, + {"matrix": [9, 6], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + + {"matrix": [10, 0], "x": 10, "y": 3}, + {"matrix": [10, 1], "x": 11, "y": 3}, + {"matrix": [10, 2], "x": 12, "y": 3}, + {"matrix": [10, 3], "x": 13, "y": 3}, + {"matrix": [10, 4], "x": 14, "y": 3}, + {"matrix": [10, 5], "x": 15, "y": 3}, + {"matrix": [10, 6], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + + {"matrix": [11, 0], "x": 10, "y": 4}, + {"matrix": [11, 1], "x": 11, "y": 4}, + {"matrix": [11, 2], "x": 12, "y": 4}, + {"matrix": [11, 3], "x": 13, "y": 4}, + {"matrix": [11, 4], "x": 14, "y": 4}, + {"matrix": [11, 5], "x": 15, "y": 4}, + {"matrix": [11, 6], "x": 16, "y": 4}, + + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + + {"matrix": [12, 2], "x": 12, "y": 5}, + {"matrix": [12, 3], "x": 13, "y": 5}, + + {"matrix": [6, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [5, 6], "x": 7, "y": 6}, + + {"matrix": [12, 0], "x": 9, "y": 6}, + {"matrix": [12, 1], "x": 10, "y": 6}, + {"matrix": [13, 2], "x": 11, "y": 6}, + + {"matrix": [6, 3], "x": 5, "y": 7}, + {"matrix": [6, 5], "x": 6, "y": 7}, + {"matrix": [6, 6], "x": 7, "y": 7}, + + {"matrix": [13, 0], "x": 9, "y": 7}, + {"matrix": [13, 1], "x": 10, "y": 7}, + {"matrix": [13, 3], "x": 11, "y": 7} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/default/keymap.c new file mode 100644 index 00000000000..0ca0a22ae5e --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum custom_layer { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +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_F9 , KC_F10, KC_F11, KC_F12 , _______, + _______, KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_LBRC , KC_RBRC, + _______, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , KC_BSLS, + _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______, + _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE ,KC_SPC , KC_HOME, KC_END, KC_ENT, LOWER , + KC_TAB,KC_BSPC, KC_GRV, KC_LGUI,KC_LALT, KC_DEL + ), + + [_LOWER] = LAYOUT( + KC_TRNS, 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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL , _______, + _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______, + _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, _______, + _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, _______, + _______,KC_PSCR, _______, KC_P0, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______, + _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, + _______,_______, KC_EQL ,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c new file mode 100644 index 00000000000..0ca0a22ae5e --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum custom_layer { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +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_F9 , KC_F10, KC_F11, KC_F12 , _______, + _______, KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_LBRC , KC_RBRC, + _______, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , KC_BSLS, + _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______, + _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______, + KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, + RAISE ,KC_SPC , KC_HOME, KC_END, KC_ENT, LOWER , + KC_TAB,KC_BSPC, KC_GRV, KC_LGUI,KC_LALT, KC_DEL + ), + + [_LOWER] = LAYOUT( + KC_TRNS, 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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL , _______, + _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______, + _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, _______, + _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, _______, + _______,KC_PSCR, _______, KC_P0, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______, + _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, + _______,_______, KC_EQL ,_______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json new file mode 100644 index 00000000000..f1440121aa0 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -0,0 +1,144 @@ +{ + "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 ex", + "usb": { + "vid": "0x444D", + "pid": "0x3435", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "rgblight": { + "led_count": 12 + }, + "ws2812": { + "pin": "D3" + }, + "development_board": "promicro", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [7, 0], "x": 10, "y": 0}, + {"matrix": [7, 1], "x": 11, "y": 0}, + {"matrix": [7, 2], "x": 12, "y": 0}, + {"matrix": [7, 3], "x": 13, "y": 0}, + {"matrix": [7, 4], "x": 14, "y": 0}, + {"matrix": [7, 5], "x": 15, "y": 0}, + {"matrix": [7, 6], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 0], "x": 10, "y": 1}, + {"matrix": [8, 1], "x": 11, "y": 1}, + {"matrix": [8, 2], "x": 12, "y": 1}, + {"matrix": [8, 3], "x": 13, "y": 1}, + {"matrix": [8, 4], "x": 14, "y": 1}, + {"matrix": [8, 5], "x": 15, "y": 1}, + {"matrix": [8, 6], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 0], "x": 10, "y": 2}, + {"matrix": [9, 1], "x": 11, "y": 2}, + {"matrix": [9, 2], "x": 12, "y": 2}, + {"matrix": [9, 3], "x": 13, "y": 2}, + {"matrix": [9, 4], "x": 14, "y": 2}, + {"matrix": [9, 5], "x": 15, "y": 2}, + {"matrix": [9, 6], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + + {"matrix": [10, 0], "x": 10, "y": 3}, + {"matrix": [10, 1], "x": 11, "y": 3}, + {"matrix": [10, 2], "x": 12, "y": 3}, + {"matrix": [10, 3], "x": 13, "y": 3}, + {"matrix": [10, 4], "x": 14, "y": 3}, + {"matrix": [10, 5], "x": 15, "y": 3}, + {"matrix": [10, 6], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + + {"matrix": [11, 0], "x": 10, "y": 4}, + {"matrix": [11, 1], "x": 11, "y": 4}, + {"matrix": [11, 2], "x": 12, "y": 4}, + {"matrix": [11, 3], "x": 13, "y": 4}, + {"matrix": [11, 4], "x": 14, "y": 4}, + {"matrix": [11, 5], "x": 15, "y": 4}, + {"matrix": [11, 6], "x": 16, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + + {"matrix": [12, 2], "x": 12, "y": 5}, + {"matrix": [12, 3], "x": 13, "y": 5}, + {"matrix": [12, 4], "x": 14, "y": 5}, + {"matrix": [12, 5], "x": 15, "y": 5}, + {"matrix": [12, 6], "x": 16, "y": 5}, + + {"matrix": [6, 4], "x": 5, "y": 6}, + {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [5, 6], "x": 7, "y": 6}, + + {"matrix": [12, 0], "x": 9, "y": 6}, + {"matrix": [12, 1], "x": 10, "y": 6}, + {"matrix": [13, 2], "x": 11, "y": 6}, + + {"matrix": [6, 3], "x": 5, "y": 7}, + {"matrix": [6, 5], "x": 6, "y": 7}, + {"matrix": [6, 6], "x": 7, "y": 7}, + + {"matrix": [13, 0], "x": 9, "y": 7}, + {"matrix": [13, 1], "x": 10, "y": 7}, + {"matrix": [13, 3], "x": 11, "y": 7} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/default/keymap.c new file mode 100644 index 00000000000..c9b1d58276f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum custom_layer { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12 , KC_GRV, + _______, KC_ESC , 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_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , _______, + _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______, + _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______, + _______, KC_LBRC , KC_RBRC,KC_LEFT,KC_RGHT, KC_UP, KC_DOWN,KC_MINS, KC_EQL , _______, + RAISE ,KC_SPC ,KC_HOME, KC_END, KC_ENT, LOWER , + KC_LGUI,KC_LALT,KC_BSPC, KC_DEL, KC_RGUI, KC_RALT + + ), + + [_LOWER] = LAYOUT( + _______, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, + _______, KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, _______, + _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______, + _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,_______,KC_PIPE, _______, + _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,_______,KC_UNDS, _______, + _______, _______,_______,KC_PAUS,KC_PSCR, KC_P0 ,KC_PDOT,_______,_______, _______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = LAYOUT( + _______,KC_F13 , KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19 , KC_F20, KC_F21, KC_F22,KC_F23 ,KC_F24 , _______, + _______,_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______, + _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, + _______,_______,_______,_______,_______, KC_EQL ,_______,_______,_______, _______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c new file mode 100644 index 00000000000..c9b1d58276f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum custom_layer { + _QWERTY, + _LOWER, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12 , KC_GRV, + _______, KC_ESC , 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_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , _______, + _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______, + _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______, + _______, KC_LBRC , KC_RBRC,KC_LEFT,KC_RGHT, KC_UP, KC_DOWN,KC_MINS, KC_EQL , _______, + RAISE ,KC_SPC ,KC_HOME, KC_END, KC_ENT, LOWER , + KC_LGUI,KC_LALT,KC_BSPC, KC_DEL, KC_RGUI, KC_RALT + + ), + + [_LOWER] = LAYOUT( + _______, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, + _______, KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, _______, + _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______, + _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,_______,KC_PIPE, _______, + _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,_______,KC_UNDS, _______, + _______, _______,_______,KC_PAUS,KC_PSCR, KC_P0 ,KC_PDOT,_______,_______, _______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ), + + [_RAISE] = LAYOUT( + _______,KC_F13 , KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19 , KC_F20, KC_F21, KC_F22,KC_F23 ,KC_F24 , _______, + _______,_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______, + _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______, + _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, + _______,_______,_______,_______,_______, KC_EQL ,_______,_______,_______, _______, + _______,_______,_______, _______,_______,_______, + _______,_______,_______, _______,_______,_______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk new file mode 100644 index 00000000000..98861888b8f --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk @@ -0,0 +1 @@ +# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json new file mode 100644 index 00000000000..44117f9cd31 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -0,0 +1,9 @@ +{ + "split": { + "enabled" : true + }, + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", + "tags": ["split"] +} \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md new file mode 100644 index 00000000000..085709ab88b --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -0,0 +1,70 @@ +# Dactyl ManuForm Carbonfet + +![GlamShot](https://i.imgur.com/0ugz1C9h.jpg) +*Dactyl Manuform Carbonfet 5x6* + +Forked from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform), the *Dactyl ManuForm Carbonfet* reshapes the former's thumb key cluster from a 3 row, 2 column arrangement to a 2 row, 3 column arrangement. + +* Keyboard Maintainer: [Carbonfet](https://github.com/carbonfet) +* Hardware Supported: Pro Micro, or clone of +* Hardware Availability: [Github](https://github.com/carbonfet/dactyl-manuform) + +## Variants + +*Dactyl ManuForm Carbonfet's* are built in variations that cater for different row and column counts. + +As standard: +- The finger keywell bottom row has 2 keys, 1 each in ring and middle columns +- The thumb cluster has 6 keys, arranged in a 2 row by 3 column arrangement. + +Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* + +### Row +| Count | Description | +| :---: | :---: | +| 4 | Three rows, typically for alphabet and some puncuation characters, with 2 key (finger keywell) bottom row | +| 5 | As *4 row* with number row above | +| 6 | As *5 row* with function row above | + +| Count | Description | +| :---: | :---: | +| 5 | A column for each finger with additional column for first finger | +| 6 | As *5 column* with additional pinky finger column | +| 7 | As *6 column* with additional pinky column | + +### Alteration +| Code | Description | +| :---: | :---: | +| ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | +| eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | +| exic | *ex* and *eic* combined | + +### Legacy 5x7 variant + +Is the [5x6_exic](./5x6_exic/) variant. + +## Compile + +Make examples for this keyboard (after setting up your build environment): + + make handwired/dactyl_manuform_carbonfet/4x6:default + make handwired/dactyl_manuform_carbonfet/4x6_ex:default + make handwired/dactyl_manuform_carbonfet/5x6_eic:default + make handwired/dactyl_manuform_carbonfet/5x6_exic:default + +Flashing examples for this keyboard: + + make handwired/dactyl_manuform_carbonfet/4x6:default:flash + make handwired/dactyl_manuform_carbonfet/4x6_ex:default:flash + make handwired/dactyl_manuform_carbonfet/5x6_eic:default:flash + make handwired/dactyl_manuform_carbonfet/5x6_exic:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: If enabled, hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB or controller - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 86c15e89f1afb6940fbdba16e1d9dc13597fa02a Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 18:56:47 +0100 Subject: [PATCH 02/32] add missing lisence header --- .../4x6_exic/keymaps/default/keymap.c | 3 +++ .../dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c | 3 +++ .../5x6_exic/keymaps/default/keymap.c | 3 +++ .../dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c index ed148c0afbc..e743e322fee 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers{ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c index ed148c0afbc..e743e322fee 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers{ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c index d90872ca05f..0cbf55d5828 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers{ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c index d90872ca05f..0cbf55d5828 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers{ From b60c765df55f1621b03347aaa9be38888be9cd95 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 19:01:38 +0100 Subject: [PATCH 03/32] more linting check corrections --- .../dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c | 3 +++ .../dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c | 3 +++ .../dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c | 3 +++ .../dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c index ed93acd20cf..cc372e62f69 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c index ed93acd20cf..cc372e62f69 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c index ccd6c07a777..9f588ea2a2e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers{ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c index ccd6c07a777..9f588ea2a2e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Duncan Sutherland (@dunk2k) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H enum layers{ From 6fedfdf7c421725e50da9c880352fd8ea3943b01 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 20:04:26 +0100 Subject: [PATCH 04/32] build corrections applied --- keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 1 + keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json | 1 + keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 1 + 3 files changed, 3 insertions(+) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index 20f99494cb2..7a3b9be5d77 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -22,6 +22,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index 48149be7143..6b321d77088 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -22,6 +22,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 01400285c6a..8911330f859 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -22,6 +22,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", From 7e9cf38ba0f676bb066a1000ce5485ae2c55ab03 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 20:25:00 +0100 Subject: [PATCH 05/32] build corrections --- .../4x6_eic/info.json | 2 +- .../4x6_eic/keymaps/default/keymap.c | 2 +- .../4x6_eic/keymaps/via/keymap.c | 2 +- .../4x6_ex/info.json | 4 +- .../4x6_ex/keymaps/default/keymap.c | 10 ++-- .../4x6_ex/keymaps/via/keymap.c | 58 +++++++++++++++++++ .../4x6_exic/info.json | 2 +- 7 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index 7a3b9be5d77..c193c96377c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -89,7 +89,7 @@ {"matrix": [8, 2], "x": 9, "y": 4}, {"matrix": [9, 3], "x": 10, "y": 4}, - {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 2], "x": 4, "y": 5}, {"matrix": [4, 5], "x": 5, "y": 5}, {"matrix": [4, 6], "x": 6, "y": 5}, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c index 9f588ea2a2e..e2f35a5d202 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c @@ -3,7 +3,7 @@ #include QMK_KEYBOARD_H -enum layers{ +enum layers { _QWERTY, _FN, _NUMPAD diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c index 9f588ea2a2e..e2f35a5d202 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c @@ -3,7 +3,7 @@ #include QMK_KEYBOARD_H -enum layers{ +enum layers { _QWERTY, _FN, _NUMPAD diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index 6b321d77088..b4f18f3842b 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -78,8 +78,8 @@ {"matrix": [8, 2], "x": 11, "y": 3}, {"matrix": [8, 3], "x": 12, "y": 3}, - {"matrix": [8, 2], "x": 13, "y": 3}, - {"matrix": [8, 3], "x": 14, "y": 3}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 5], "x": 14, "y": 3}, {"matrix": [4, 3], "x": 4, "y": 4}, {"matrix": [3, 4], "x": 5, "y": 4}, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c index 7962c502490..df118bffd97 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/default/keymap.c @@ -29,12 +29,12 @@ enum layer_number { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_TAB, 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_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, 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_LCTL, KC_LALT, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, - RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, - KC_BSPC, KC_CAPS, KC_GRV, KC_LGUI, KC_APP, KC_DEL + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, + KC_BSPC, KC_CAPS, KC_GRV, KC_LGUI, KC_APP, KC_DEL ), diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c new file mode 100644 index 00000000000..df118bffd97 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c @@ -0,0 +1,58 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +enum layer_number { + _BASE, + _LOWER, + _RAISE +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_TAB, 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_LCTL, KC_LALT, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, + RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, + KC_BSPC, KC_CAPS, KC_GRV, KC_LGUI, KC_APP, KC_DEL + + ), + + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, + _______, _______, _______, KC_PSCR, _______, KC_P0, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + + [_RAISE] = LAYOUT( + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, KC_EQL, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 8911330f859..da113f45f5d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -93,7 +93,7 @@ {"matrix": [8, 2], "x": 9, "y": 4}, {"matrix": [9, 3], "x": 10, "y": 4}, - {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 2], "x": 4, "y": 5}, {"matrix": [4, 5], "x": 5, "y": 5}, {"matrix": [4, 6], "x": 6, "y": 5}, From 70ab39332d495cebb21f22594cf37557df42d56c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 20:29:46 +0100 Subject: [PATCH 06/32] matrix layout fixes --- .../handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 4 ++-- .../handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index c193c96377c..b12a2d2965f 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -90,8 +90,8 @@ {"matrix": [9, 3], "x": 10, "y": 4}, {"matrix": [4, 2], "x": 4, "y": 5}, - {"matrix": [4, 5], "x": 5, "y": 5}, - {"matrix": [4, 6], "x": 6, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, {"matrix": [9, 1], "x": 8, "y": 5}, {"matrix": [9, 2], "x": 9, "y": 5}, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index da113f45f5d..cb54d1c8638 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -94,8 +94,8 @@ {"matrix": [9, 3], "x": 10, "y": 4}, {"matrix": [4, 2], "x": 4, "y": 5}, - {"matrix": [4, 5], "x": 5, "y": 5}, - {"matrix": [4, 6], "x": 6, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, {"matrix": [9, 1], "x": 8, "y": 5}, {"matrix": [9, 2], "x": 9, "y": 5}, From d406e094082d818f0eb2f21373008389f9952f13 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 20:33:23 +0100 Subject: [PATCH 07/32] update info.json --- keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index 979890a415e..449b9fcd959 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 eic", "usb": { "vid": "0x444D", "pid": "0x3435", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index b12a2d2965f..ca673b1cc2b 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", "usb": { "vid": "0x444D", "pid": "0x3435", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index cb54d1c8638..45c6d8a65a4 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", "usb": { "vid": "0x444D", "pid": "0x3435", From 94f3f36a29ebeda547ae9a7b5d7d647882779026 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 20:38:58 +0100 Subject: [PATCH 08/32] additional build fixes --- .../dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c | 2 +- .../dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c | 2 +- .../dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c | 2 +- .../dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c index e2f35a5d202..4d6caeac6e1 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, _______, _______, KC_DEL, KC_INS, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c index e2f35a5d202..4d6caeac6e1 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, _______, _______, KC_DEL, KC_INS, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c index e743e322fee..34bc47cf97c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, KC_INS, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c index e743e322fee..34bc47cf97c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_10, KC_MINS, KC_EQL, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, KC_INS, From 7938ec20155c1354695562428227511f30c232cd Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 9 Jul 2023 21:11:44 +0100 Subject: [PATCH 09/32] update readme.md alteration diagrams added --- .../handwired/dactyl_manuform_carbonfet/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 085709ab88b..84be4abd172 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -33,11 +33,11 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* | 7 | As *6 column* with additional pinky column | ### Alteration -| Code | Description | -| :---: | :---: | -| ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | -| eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | -| exic | *ex* and *eic* combined | +| Code | Description | Diagram
*4x6 example* | +| :---: | :---: | :---: | +| ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | ![ex](https://i.imgur.com/pnW1LPwh.png) | +| eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | ![eic](https://i.imgur.com/myKWapoh.png) | +| exic | *ex* and *eic* combined | ![exic](https://i.imgur.com/iAIRVikh.png) | ### Legacy 5x7 variant From 74b564ef95a618660f0e47e3189ba7f7f56f59f4 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 10 Jul 2023 11:33:03 +0100 Subject: [PATCH 10/32] remove needless split.enabled --- keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 1 - keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json | 1 - .../handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 1 - keyboards/handwired/dactyl_manuform_carbonfet/info.json | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index ca673b1cc2b..547e3bd2945 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -22,7 +22,6 @@ }, "diode_direction": "COL2ROW", "split": { - "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index b4f18f3842b..cc54af3b690 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -22,7 +22,6 @@ }, "diode_direction": "COL2ROW", "split": { - "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 45c6d8a65a4..492062daddb 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -22,7 +22,6 @@ }, "diode_direction": "COL2ROW", "split": { - "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json index 44117f9cd31..e09ae25140c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -6,4 +6,4 @@ "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", "tags": ["split"] -} \ No newline at end of file +} From f27b283dfeed0fffdf7d57f7bcfc226c942c1cb7 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 11 Jul 2023 07:29:49 +0100 Subject: [PATCH 11/32] Update keymap.c Co-authored-by: Drashna Jaelre --- .../dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c index bce5c3d3302..e89d64bb3e8 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/default/keymap.c @@ -23,7 +23,7 @@ along with this program. If not, see . enum layers { _BASE, _RAISE, - _LOWER + _LOWER, }; #define SFT_ESC SFT_T(KC_ESC) From 33e5e07d51597a19b9022ea6c99edbd687b503c0 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 14 Jul 2023 23:57:57 +0100 Subject: [PATCH 12/32] prettied layouts -removed rgblight.led_count --- .../dactyl_manuform_carbonfet/4x5/info.json | 76 ++++---- .../4x5_eic/info.json | 84 ++++----- .../dactyl_manuform_carbonfet/4x6/info.json | 88 +++++----- .../4x6_eic/info.json | 96 +++++------ .../4x6_ex/info.json | 96 +++++------ .../4x6_exic/info.json | 104 +++++------ .../dactyl_manuform_carbonfet/5x6/info.json | 108 ++++++------ .../5x6_eic/info.json | 120 ++++++------- .../5x6_ex/info.json | 116 ++++++------- .../5x6_exic/info.json | 128 +++++++------- .../dactyl_manuform_carbonfet/6x6/info.json | 131 +++++++------- .../6x6_eic/info.json | 147 ++++++++-------- .../6x6_ex/info.json | 139 ++++++++------- .../6x6_exic/info.json | 155 ++++++++--------- .../dactyl_manuform_carbonfet/6x7/info.json | 151 ++++++++-------- .../6x7_ex/info.json | 163 +++++++++--------- 16 files changed, 942 insertions(+), 960 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index a034c551ea7..496208d8b26 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -28,63 +28,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.1}, {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, - {"matrix": [5, 0], "x": 8, "y": 0}, - {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 8, "y": 0.1}, + {"matrix": [5, 1], "x": 9, "y": 0.1}, {"matrix": [5, 2], "x": 10, "y": 0}, - {"matrix": [5, 3], "x": 11, "y": 0}, - {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0.1}, + {"matrix": [5, 4], "x": 12, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.1}, {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, - {"matrix": [6, 0], "x": 8, "y": 1}, - {"matrix": [6, 1], "x": 9, "y": 1}, + {"matrix": [6, 0], "x": 8, "y": 1.1}, + {"matrix": [6, 1], "x": 9, "y": 1.1}, {"matrix": [6, 2], "x": 10, "y": 1}, - {"matrix": [6, 3], "x": 11, "y": 1}, - {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1.1}, + {"matrix": [6, 4], "x": 12, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.1}, {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, - {"matrix": [7, 0], "x": 8, "y": 2}, - {"matrix": [7, 1], "x": 9, "y": 2}, + {"matrix": [7, 0], "x": 8, "y": 2.1}, + {"matrix": [7, 1], "x": 9, "y": 2.1}, {"matrix": [7, 2], "x": 10, "y": 2}, - {"matrix": [7, 3], "x": 11, "y": 2}, - {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2.1}, + {"matrix": [7, 4], "x": 12, "y": 2.6}, - {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3.1}, {"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [8, 2], "x": 10, "y": 3}, - {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3.1}, - {"matrix": [4, 2], "x": 3, "y": 4}, - {"matrix": [3, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4.1}, + {"matrix": [3, 3], "x": 4, "y": 4.35}, + {"matrix": [3, 4], "x": 5, "y": 4.6}, - {"matrix": [8, 0], "x": 7, "y": 4}, - {"matrix": [8, 1], "x": 8, "y": 4}, - {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [8, 0], "x": 7, "y": 4.6}, + {"matrix": [8, 1], "x": 8, "y": 4.35}, + {"matrix": [9, 2], "x": 9, "y": 4.1}, - {"matrix": [4, 1], "x": 3, "y": 5}, - {"matrix": [4, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 1], "x": 3, "y": 5.1}, + {"matrix": [4, 3], "x": 4, "y": 5.6}, + {"matrix": [4, 4], "x": 5, "y": 5.85}, - {"matrix": [9, 0], "x": 7, "y": 5}, - {"matrix": [9, 1], "x": 8, "y": 5}, - {"matrix": [9, 3], "x": 9, "y": 5} + {"matrix": [9, 0], "x": 7, "y": 5.85}, + {"matrix": [9, 1], "x": 8, "y": 5.6}, + {"matrix": [9, 3], "x": 9, "y": 5.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index 449b9fcd959..de409252930 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -28,67 +28,67 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.1}, {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [5, 0], "x": 7, "y": 0}, - {"matrix": [5, 1], "x": 8, "y": 0}, - {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0.1}, + {"matrix": [5, 1], "x": 8, "y": 0.1}, + {"matrix": [5, 2], "x": 9, "y": 0.1}, {"matrix": [5, 3], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0.1}, + {"matrix": [5, 5], "x": 12, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.1}, {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [6, 0], "x": 7, "y": 1}, - {"matrix": [6, 1], "x": 8, "y": 1}, - {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1.1}, + {"matrix": [6, 1], "x": 8, "y": 1.1}, + {"matrix": [6, 2], "x": 9, "y": 1.1}, {"matrix": [6, 3], "x": 10, "y": 1}, - {"matrix": [6, 4], "x": 11, "y": 1}, - {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1.1}, + {"matrix": [6, 5], "x": 12, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.1}, {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, - {"matrix": [7, 1], "x": 8, "y": 2}, - {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2.1}, + {"matrix": [7, 2], "x": 9, "y": 2.1}, {"matrix": [7, 3], "x": 10, "y": 2}, - {"matrix": [7, 4], "x": 11, "y": 2}, - {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2.1}, + {"matrix": [7, 5], "x": 12, "y": 2.6}, - {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3.1}, {"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [8, 3], "x": 10, "y": 3}, - {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3.1}, - {"matrix": [4, 2], "x": 3, "y": 4}, - {"matrix": [3, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4.1}, + {"matrix": [3, 3], "x": 4, "y": 4.35}, + {"matrix": [3, 4], "x": 5, "y": 4.6}, - {"matrix": [8, 1], "x": 7, "y": 4}, - {"matrix": [8, 2], "x": 8, "y": 4}, - {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [8, 1], "x": 7, "y": 4.6}, + {"matrix": [8, 2], "x": 8, "y": 4.35}, + {"matrix": [9, 3], "x": 9, "y": 4.1}, - {"matrix": [4, 1], "x": 3, "y": 5}, - {"matrix": [4, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 1], "x": 3, "y": 5.1}, + {"matrix": [4, 3], "x": 4, "y": 5.6}, + {"matrix": [4, 4], "x": 5, "y": 5.85}, - {"matrix": [9, 1], "x": 7, "y": 5}, - {"matrix": [9, 2], "x": 8, "y": 5}, - {"matrix": [9, 4], "x": 9, "y": 5} + {"matrix": [9, 1], "x": 7, "y": 5.85}, + {"matrix": [9, 2], "x": 8, "y": 5.6}, + {"matrix": [9, 4], "x": 9, "y": 5.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index 487822387e0..8057d357dd4 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -28,69 +28,69 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [5, 0], "x": 9, "y": 0}, - {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 0], "x": 9, "y": 0.1}, + {"matrix": [5, 1], "x": 10, "y": 0.1}, {"matrix": [5, 2], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 4], "x": 13, "y": 0}, - {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0.1}, + {"matrix": [5, 4], "x": 13, "y": 0.6}, + {"matrix": [5, 5], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [6, 0], "x": 9, "y": 1}, - {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 0], "x": 9, "y": 1.1}, + {"matrix": [6, 1], "x": 10, "y": 1.1}, {"matrix": [6, 2], "x": 11, "y": 1}, - {"matrix": [6, 3], "x": 12, "y": 1}, - {"matrix": [6, 4], "x": 13, "y": 1}, - {"matrix": [6, 5], "x": 14, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1.1}, + {"matrix": [6, 4], "x": 13, "y": 1.6}, + {"matrix": [6, 5], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [7, 0], "x": 9, "y": 2}, - {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 0], "x": 9, "y": 2.1}, + {"matrix": [7, 1], "x": 10, "y": 2.1}, {"matrix": [7, 2], "x": 11, "y": 2}, - {"matrix": [7, 3], "x": 12, "y": 2}, - {"matrix": [7, 4], "x": 13, "y": 2}, - {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2.1}, + {"matrix": [7, 4], "x": 13, "y": 2.6}, + {"matrix": [7, 5], "x": 14, "y": 2.6}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [8, 2], "x": 11, "y": 3}, - {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3.1}, - {"matrix": [4, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, - {"matrix": [3, 5], "x": 6, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4.1}, + {"matrix": [3, 4], "x": 5, "y": 4.35}, + {"matrix": [3, 5], "x": 6, "y": 4.6}, - {"matrix": [8, 0], "x": 8, "y": 4}, - {"matrix": [8, 1], "x": 9, "y": 4}, - {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [8, 0], "x": 8, "y": 4.6}, + {"matrix": [8, 1], "x": 9, "y": 4.35}, + {"matrix": [9, 2], "x": 10, "y": 4.1}, - {"matrix": [4, 2], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.85}, - {"matrix": [9, 0], "x": 8, "y": 5}, - {"matrix": [9, 1], "x": 9, "y": 5}, - {"matrix": [9, 3], "x": 10, "y": 5} + {"matrix": [9, 0], "x": 8, "y": 5.85}, + {"matrix": [9, 1], "x": 9, "y": 5.6}, + {"matrix": [9, 3], "x": 10, "y": 5.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index 547e3bd2945..e5f815f0a36 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -28,73 +28,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [5, 0], "x": 8, "y": 0}, - {"matrix": [5, 1], "x": 9, "y": 0}, - {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 0], "x": 8, "y": 0.1}, + {"matrix": [5, 1], "x": 9, "y": 0.1}, + {"matrix": [5, 2], "x": 10, "y": 0.1}, {"matrix": [5, 3], "x": 11, "y": 0}, - {"matrix": [5, 4], "x": 12, "y": 0}, - {"matrix": [5, 5], "x": 13, "y": 0}, - {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.1}, + {"matrix": [5, 5], "x": 13, "y": 0.6}, + {"matrix": [5, 6], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [6, 0], "x": 8, "y": 1}, - {"matrix": [6, 1], "x": 9, "y": 1}, - {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 0], "x": 8, "y": 1.1}, + {"matrix": [6, 1], "x": 9, "y": 1.1}, + {"matrix": [6, 2], "x": 10, "y": 1.1}, {"matrix": [6, 3], "x": 11, "y": 1}, - {"matrix": [6, 4], "x": 12, "y": 1}, - {"matrix": [6, 5], "x": 13, "y": 1}, - {"matrix": [6, 6], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.1}, + {"matrix": [6, 5], "x": 13, "y": 1.6}, + {"matrix": [6, 6], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [7, 1], "x": 9, "y": 2}, - {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 9, "y": 2.1}, + {"matrix": [7, 2], "x": 10, "y": 2.1}, {"matrix": [7, 3], "x": 11, "y": 2}, - {"matrix": [7, 4], "x": 12, "y": 2}, - {"matrix": [7, 5], "x": 13, "y": 2}, - {"matrix": [7, 6], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.1}, + {"matrix": [7, 5], "x": 13, "y": 2.6}, + {"matrix": [7, 6], "x": 14, "y": 2.6}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [8, 3], "x": 11, "y": 3}, - {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.1}, - {"matrix": [4, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, - {"matrix": [3, 5], "x": 6, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4.1}, + {"matrix": [3, 4], "x": 5, "y": 4.35}, + {"matrix": [3, 5], "x": 6, "y": 4.6}, - {"matrix": [8, 1], "x": 8, "y": 4}, - {"matrix": [8, 2], "x": 9, "y": 4}, - {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [8, 1], "x": 8, "y": 4.6}, + {"matrix": [8, 2], "x": 9, "y": 4.35}, + {"matrix": [9, 3], "x": 10, "y": 4.1}, - {"matrix": [4, 2], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.85}, - {"matrix": [9, 1], "x": 8, "y": 5}, - {"matrix": [9, 2], "x": 9, "y": 5}, - {"matrix": [9, 4], "x": 10, "y": 5} + {"matrix": [9, 1], "x": 8, "y": 5.85}, + {"matrix": [9, 2], "x": 9, "y": 5.6}, + {"matrix": [9, 4], "x": 10, "y": 5.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index cc54af3b690..6219b8a8a8d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -28,73 +28,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [5, 0], "x": 9, "y": 0}, - {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 0], "x": 9, "y": 0.1}, + {"matrix": [5, 1], "x": 10, "y": 0.1}, {"matrix": [5, 2], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 4], "x": 13, "y": 0}, - {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0.1}, + {"matrix": [5, 4], "x": 13, "y": 0.6}, + {"matrix": [5, 5], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [6, 0], "x": 9, "y": 1}, - {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 0], "x": 9, "y": 1.1}, + {"matrix": [6, 1], "x": 10, "y": 1.1}, {"matrix": [6, 2], "x": 11, "y": 1}, - {"matrix": [6, 3], "x": 12, "y": 1}, - {"matrix": [6, 4], "x": 13, "y": 1}, - {"matrix": [6, 5], "x": 14, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1.1}, + {"matrix": [6, 4], "x": 13, "y": 1.6}, + {"matrix": [6, 5], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [7, 0], "x": 9, "y": 2}, - {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 0], "x": 9, "y": 2.1}, + {"matrix": [7, 1], "x": 10, "y": 2.1}, {"matrix": [7, 2], "x": 11, "y": 2}, - {"matrix": [7, 3], "x": 12, "y": 2}, - {"matrix": [7, 4], "x": 13, "y": 2}, - {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2.1}, + {"matrix": [7, 4], "x": 13, "y": 2.6}, + {"matrix": [7, 5], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [8, 2], "x": 11, "y": 3}, - {"matrix": [8, 3], "x": 12, "y": 3}, - {"matrix": [8, 4], "x": 13, "y": 3}, - {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3.1}, + {"matrix": [8, 4], "x": 13, "y": 3.6}, + {"matrix": [8, 5], "x": 14, "y": 3.6}, - {"matrix": [4, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, - {"matrix": [3, 5], "x": 6, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4.1}, + {"matrix": [3, 4], "x": 5, "y": 4.35}, + {"matrix": [3, 5], "x": 6, "y": 4.6}, - {"matrix": [8, 0], "x": 8, "y": 4}, - {"matrix": [8, 1], "x": 9, "y": 4}, - {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [8, 0], "x": 8, "y": 4.6}, + {"matrix": [8, 1], "x": 9, "y": 4.35}, + {"matrix": [9, 2], "x": 10, "y": 4.1}, - {"matrix": [4, 2], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.85}, - {"matrix": [9, 0], "x": 8, "y": 5}, - {"matrix": [9, 1], "x": 9, "y": 5}, - {"matrix": [9, 3], "x": 10, "y": 5} + {"matrix": [9, 0], "x": 8, "y": 5.85}, + {"matrix": [9, 1], "x": 9, "y": 5.6}, + {"matrix": [9, 3], "x": 10, "y": 5.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 492062daddb..b887f47fa87 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -28,77 +28,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [5, 0], "x": 8, "y": 0}, - {"matrix": [5, 1], "x": 9, "y": 0}, - {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 0], "x": 8, "y": 0.1}, + {"matrix": [5, 1], "x": 9, "y": 0.1}, + {"matrix": [5, 2], "x": 10, "y": 0.1}, {"matrix": [5, 3], "x": 11, "y": 0}, - {"matrix": [5, 4], "x": 12, "y": 0}, - {"matrix": [5, 5], "x": 13, "y": 0}, - {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.1}, + {"matrix": [5, 5], "x": 13, "y": 0.6}, + {"matrix": [5, 6], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [6, 0], "x": 8, "y": 1}, - {"matrix": [6, 1], "x": 9, "y": 1}, - {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 0], "x": 8, "y": 1.1}, + {"matrix": [6, 1], "x": 9, "y": 1.1}, + {"matrix": [6, 2], "x": 10, "y": 1.1}, {"matrix": [6, 3], "x": 11, "y": 1}, - {"matrix": [6, 4], "x": 12, "y": 1}, - {"matrix": [6, 5], "x": 13, "y": 1}, - {"matrix": [6, 6], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.1}, + {"matrix": [6, 5], "x": 13, "y": 1.6}, + {"matrix": [6, 6], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [7, 1], "x": 9, "y": 2}, - {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 9, "y": 2.1}, + {"matrix": [7, 2], "x": 10, "y": 2.1}, {"matrix": [7, 3], "x": 11, "y": 2}, - {"matrix": [7, 4], "x": 12, "y": 2}, - {"matrix": [7, 5], "x": 13, "y": 2}, - {"matrix": [7, 6], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.1}, + {"matrix": [7, 5], "x": 13, "y": 2.6}, + {"matrix": [7, 6], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [8, 3], "x": 11, "y": 3}, - {"matrix": [8, 4], "x": 12, "y": 3}, - {"matrix": [8, 5], "x": 13, "y": 3}, - {"matrix": [8, 6], "x": 14, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.1}, + {"matrix": [8, 5], "x": 13, "y": 3.6}, + {"matrix": [8, 6], "x": 14, "y": 3.6}, - {"matrix": [4, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, - {"matrix": [3, 5], "x": 6, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4.1}, + {"matrix": [3, 4], "x": 5, "y": 4.35}, + {"matrix": [3, 5], "x": 6, "y": 4.6}, - {"matrix": [8, 1], "x": 8, "y": 4}, - {"matrix": [8, 2], "x": 9, "y": 4}, - {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [8, 1], "x": 8, "y": 4.6}, + {"matrix": [8, 2], "x": 9, "y": 4.35}, + {"matrix": [9, 3], "x": 10, "y": 4.1}, - {"matrix": [4, 2], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.85}, - {"matrix": [9, 1], "x": 8, "y": 5}, - {"matrix": [9, 2], "x": 9, "y": 5}, - {"matrix": [9, 4], "x": 10, "y": 5} + {"matrix": [9, 1], "x": 8, "y": 5.85}, + {"matrix": [9, 2], "x": 9, "y": 5.6}, + {"matrix": [9, 4], "x": 10, "y": 5.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index dbbbef04760..10fc57faa85 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -28,83 +28,83 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [6, 0], "x": 9, "y": 0}, - {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [6, 0], "x": 9, "y": 0.1}, + {"matrix": [6, 1], "x": 10, "y": 0.1}, {"matrix": [6, 2], "x": 11, "y": 0}, - {"matrix": [6, 3], "x": 12, "y": 0}, - {"matrix": [6, 4], "x": 13, "y": 0}, - {"matrix": [6, 5], "x": 14, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0.1}, + {"matrix": [6, 4], "x": 13, "y": 0.6}, + {"matrix": [6, 5], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [7, 0], "x": 9, "y": 1}, - {"matrix": [7, 1], "x": 10, "y": 1}, + {"matrix": [7, 0], "x": 9, "y": 1.1}, + {"matrix": [7, 1], "x": 10, "y": 1.1}, {"matrix": [7, 2], "x": 11, "y": 1}, - {"matrix": [7, 3], "x": 12, "y": 1}, - {"matrix": [7, 4], "x": 13, "y": 1}, - {"matrix": [7, 5], "x": 14, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1.1}, + {"matrix": [7, 4], "x": 13, "y": 1.6}, + {"matrix": [7, 5], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [8, 0], "x": 9, "y": 2}, - {"matrix": [8, 1], "x": 10, "y": 2}, + {"matrix": [8, 0], "x": 9, "y": 2.1}, + {"matrix": [8, 1], "x": 10, "y": 2.1}, {"matrix": [8, 2], "x": 11, "y": 2}, - {"matrix": [8, 3], "x": 12, "y": 2}, - {"matrix": [8, 4], "x": 13, "y": 2}, - {"matrix": [8, 5], "x": 14, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2.1}, + {"matrix": [8, 4], "x": 13, "y": 2.6}, + {"matrix": [8, 5], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [9, 0], "x": 9, "y": 3}, - {"matrix": [9, 1], "x": 10, "y": 3}, + {"matrix": [9, 0], "x": 9, "y": 3.1}, + {"matrix": [9, 1], "x": 10, "y": 3.1}, {"matrix": [9, 2], "x": 11, "y": 3}, - {"matrix": [9, 3], "x": 12, "y": 3}, - {"matrix": [9, 4], "x": 13, "y": 3}, - {"matrix": [9, 5], "x": 14, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3.1}, + {"matrix": [9, 4], "x": 13, "y": 3.6}, + {"matrix": [9, 5], "x": 14, "y": 3.6}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, {"matrix": [10, 2], "x": 11, "y": 4}, - {"matrix": [10, 3], "x": 12, "y": 4}, + {"matrix": [10, 3], "x": 12, "y": 4.1}, - {"matrix": [5, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.35}, + {"matrix": [4, 5], "x": 6, "y": 5.6}, - {"matrix": [10, 0], "x": 8, "y": 5}, - {"matrix": [10, 1], "x": 9, "y": 5}, - {"matrix": [11, 2], "x": 10, "y": 5}, + {"matrix": [10, 0], "x": 8, "y": 5.6}, + {"matrix": [10, 1], "x": 9, "y": 5.35}, + {"matrix": [11, 2], "x": 10, "y": 5.1}, - {"matrix": [5, 2], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [5, 2], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.85}, - {"matrix": [11, 0], "x": 8, "y": 6}, - {"matrix": [11, 1], "x": 9, "y": 6}, - {"matrix": [11, 3], "x": 10, "y": 6} + {"matrix": [11, 0], "x": 8, "y": 6.85}, + {"matrix": [11, 1], "x": 9, "y": 6.6}, + {"matrix": [11, 3], "x": 10, "y": 6.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index b3c09c6a66f..aaafadb3a6c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -28,89 +28,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [6, 0], "x": 8, "y": 0}, - {"matrix": [6, 1], "x": 9, "y": 0}, - {"matrix": [6, 2], "x": 10, "y": 0}, + {"matrix": [6, 0], "x": 8, "y": 0.1}, + {"matrix": [6, 1], "x": 9, "y": 0.1}, + {"matrix": [6, 2], "x": 10, "y": 0.1}, {"matrix": [6, 3], "x": 11, "y": 0}, - {"matrix": [6, 4], "x": 12, "y": 0}, - {"matrix": [6, 5], "x": 13, "y": 0}, - {"matrix": [6, 6], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 12, "y": 0.1}, + {"matrix": [6, 5], "x": 13, "y": 0.6}, + {"matrix": [6, 6], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [7, 0], "x": 8, "y": 1}, - {"matrix": [7, 1], "x": 9, "y": 1}, - {"matrix": [7, 2], "x": 10, "y": 1}, + {"matrix": [7, 0], "x": 8, "y": 1.1}, + {"matrix": [7, 1], "x": 9, "y": 1.1}, + {"matrix": [7, 2], "x": 10, "y": 1.1}, {"matrix": [7, 3], "x": 11, "y": 1}, - {"matrix": [7, 4], "x": 12, "y": 1}, - {"matrix": [7, 5], "x": 13, "y": 1}, - {"matrix": [7, 6], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 12, "y": 1.1}, + {"matrix": [7, 5], "x": 13, "y": 1.6}, + {"matrix": [7, 6], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.1}, - {"matrix": [8, 0], "x": 8, "y": 2}, - {"matrix": [8, 1], "x": 9, "y": 2}, - {"matrix": [8, 2], "x": 10, "y": 2}, + {"matrix": [8, 0], "x": 8, "y": 2.1}, + {"matrix": [8, 1], "x": 9, "y": 2.1}, + {"matrix": [8, 2], "x": 10, "y": 2.1}, {"matrix": [8, 3], "x": 11, "y": 2}, - {"matrix": [8, 4], "x": 12, "y": 2}, - {"matrix": [8, 5], "x": 13, "y": 2}, - {"matrix": [8, 6], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 12, "y": 2.1}, + {"matrix": [8, 5], "x": 13, "y": 2.6}, + {"matrix": [8, 6], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [9, 1], "x": 9, "y": 3}, - {"matrix": [9, 2], "x": 10, "y": 3}, + {"matrix": [9, 1], "x": 9, "y": 3.1}, + {"matrix": [9, 2], "x": 10, "y": 3.1}, {"matrix": [9, 3], "x": 11, "y": 3}, - {"matrix": [9, 4], "x": 12, "y": 3}, - {"matrix": [9, 5], "x": 13, "y": 3}, - {"matrix": [9, 6], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 12, "y": 3.1}, + {"matrix": [9, 5], "x": 13, "y": 3.6}, + {"matrix": [9, 6], "x": 14, "y": 3.6}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, {"matrix": [10, 3], "x": 11, "y": 4}, - {"matrix": [10, 4], "x": 12, "y": 4}, + {"matrix": [10, 4], "x": 12, "y": 4.1}, - {"matrix": [5, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.35}, + {"matrix": [4, 5], "x": 6, "y": 5.6}, - {"matrix": [10, 1], "x": 8, "y": 5}, - {"matrix": [10, 2], "x": 9, "y": 5}, - {"matrix": [11, 3], "x": 10, "y": 5}, + {"matrix": [10, 1], "x": 8, "y": 5.6}, + {"matrix": [10, 2], "x": 9, "y": 5.35}, + {"matrix": [11, 3], "x": 10, "y": 5.1}, - {"matrix": [5, 2], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [5, 2], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.85}, - {"matrix": [11, 1], "x": 8, "y": 6}, - {"matrix": [11, 2], "x": 9, "y": 6}, - {"matrix": [11, 4], "x": 10, "y": 6} + {"matrix": [11, 1], "x": 8, "y": 6.85}, + {"matrix": [11, 2], "x": 9, "y": 6.6}, + {"matrix": [11, 4], "x": 10, "y": 6.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index 14e8ded6e0c..fda353a36b0 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -28,87 +28,87 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [6, 0], "x": 9, "y": 0}, - {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [6, 0], "x": 9, "y": 0.1}, + {"matrix": [6, 1], "x": 10, "y": 0.1}, {"matrix": [6, 2], "x": 11, "y": 0}, - {"matrix": [6, 3], "x": 12, "y": 0}, - {"matrix": [6, 4], "x": 13, "y": 0}, - {"matrix": [6, 5], "x": 14, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0.1}, + {"matrix": [6, 4], "x": 13, "y": 0.6}, + {"matrix": [6, 5], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [7, 0], "x": 9, "y": 1}, - {"matrix": [7, 1], "x": 10, "y": 1}, + {"matrix": [7, 0], "x": 9, "y": 1.1}, + {"matrix": [7, 1], "x": 10, "y": 1.1}, {"matrix": [7, 2], "x": 11, "y": 1}, - {"matrix": [7, 3], "x": 12, "y": 1}, - {"matrix": [7, 4], "x": 13, "y": 1}, - {"matrix": [7, 5], "x": 14, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1.1}, + {"matrix": [7, 4], "x": 13, "y": 1.6}, + {"matrix": [7, 5], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [8, 0], "x": 9, "y": 2}, - {"matrix": [8, 1], "x": 10, "y": 2}, + {"matrix": [8, 0], "x": 9, "y": 2.1}, + {"matrix": [8, 1], "x": 10, "y": 2.1}, {"matrix": [8, 2], "x": 11, "y": 2}, - {"matrix": [8, 3], "x": 12, "y": 2}, - {"matrix": [8, 4], "x": 13, "y": 2}, - {"matrix": [8, 5], "x": 14, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2.1}, + {"matrix": [8, 4], "x": 13, "y": 2.6}, + {"matrix": [8, 5], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [9, 0], "x": 9, "y": 3}, - {"matrix": [9, 1], "x": 10, "y": 3}, + {"matrix": [9, 0], "x": 9, "y": 3.1}, + {"matrix": [9, 1], "x": 10, "y": 3.1}, {"matrix": [9, 2], "x": 11, "y": 3}, - {"matrix": [9, 3], "x": 12, "y": 3}, - {"matrix": [9, 4], "x": 13, "y": 3}, - {"matrix": [9, 5], "x": 14, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3.1}, + {"matrix": [9, 4], "x": 13, "y": 3.6}, + {"matrix": [9, 5], "x": 14, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, {"matrix": [10, 2], "x": 11, "y": 4}, - {"matrix": [10, 3], "x": 12, "y": 4}, - {"matrix": [10, 4], "x": 13, "y": 4}, - {"matrix": [10, 5], "x": 14, "y": 4}, + {"matrix": [10, 3], "x": 12, "y": 4.1}, + {"matrix": [10, 4], "x": 13, "y": 4.6}, + {"matrix": [10, 5], "x": 14, "y": 4.6}, - {"matrix": [5, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.35}, + {"matrix": [4, 5], "x": 6, "y": 5.6}, - {"matrix": [10, 0], "x": 8, "y": 5}, - {"matrix": [10, 1], "x": 9, "y": 5}, - {"matrix": [11, 2], "x": 10, "y": 5}, + {"matrix": [10, 0], "x": 8, "y": 5.6}, + {"matrix": [10, 1], "x": 9, "y": 5.35}, + {"matrix": [11, 2], "x": 10, "y": 5.1}, - {"matrix": [5, 2], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [5, 2], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.85}, - {"matrix": [11, 0], "x": 8, "y": 6}, - {"matrix": [11, 1], "x": 9, "y": 6}, - {"matrix": [11, 3], "x": 10, "y": 6} + {"matrix": [11, 0], "x": 8, "y": 6.85}, + {"matrix": [11, 1], "x": 9, "y": 6.6}, + {"matrix": [11, 3], "x": 10, "y": 6.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index 309a628f605..d7758cee89d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -28,93 +28,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [6, 0], "x": 8, "y": 0}, - {"matrix": [6, 1], "x": 9, "y": 0}, - {"matrix": [6, 2], "x": 10, "y": 0}, + {"matrix": [6, 0], "x": 8, "y": 0.1}, + {"matrix": [6, 1], "x": 9, "y": 0.1}, + {"matrix": [6, 2], "x": 10, "y": 0.1}, {"matrix": [6, 3], "x": 11, "y": 0}, - {"matrix": [6, 4], "x": 12, "y": 0}, - {"matrix": [6, 5], "x": 13, "y": 0}, - {"matrix": [6, 6], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 12, "y": 0.1}, + {"matrix": [6, 5], "x": 13, "y": 0.6}, + {"matrix": [6, 6], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [7, 0], "x": 8, "y": 1}, - {"matrix": [7, 1], "x": 9, "y": 1}, - {"matrix": [7, 2], "x": 10, "y": 1}, + {"matrix": [7, 0], "x": 8, "y": 1.1}, + {"matrix": [7, 1], "x": 9, "y": 1.1}, + {"matrix": [7, 2], "x": 10, "y": 1.1}, {"matrix": [7, 3], "x": 11, "y": 1}, - {"matrix": [7, 4], "x": 12, "y": 1}, - {"matrix": [7, 5], "x": 13, "y": 1}, - {"matrix": [7, 6], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 12, "y": 1.1}, + {"matrix": [7, 5], "x": 13, "y": 1.6}, + {"matrix": [7, 6], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.1}, - {"matrix": [8, 0], "x": 8, "y": 2}, - {"matrix": [8, 1], "x": 9, "y": 2}, - {"matrix": [8, 2], "x": 10, "y": 2}, + {"matrix": [8, 0], "x": 8, "y": 2.1}, + {"matrix": [8, 1], "x": 9, "y": 2.1}, + {"matrix": [8, 2], "x": 10, "y": 2.1}, {"matrix": [8, 3], "x": 11, "y": 2}, - {"matrix": [8, 4], "x": 12, "y": 2}, - {"matrix": [8, 5], "x": 13, "y": 2}, - {"matrix": [8, 6], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 12, "y": 2.1}, + {"matrix": [8, 5], "x": 13, "y": 2.6}, + {"matrix": [8, 6], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [9, 1], "x": 9, "y": 3}, - {"matrix": [9, 2], "x": 10, "y": 3}, + {"matrix": [9, 1], "x": 9, "y": 3.1}, + {"matrix": [9, 2], "x": 10, "y": 3.1}, {"matrix": [9, 3], "x": 11, "y": 3}, - {"matrix": [9, 4], "x": 12, "y": 3}, - {"matrix": [9, 5], "x": 13, "y": 3}, - {"matrix": [9, 6], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 12, "y": 3.1}, + {"matrix": [9, 5], "x": 13, "y": 3.6}, + {"matrix": [9, 6], "x": 14, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, {"matrix": [10, 3], "x": 11, "y": 4}, - {"matrix": [10, 4], "x": 12, "y": 4}, - {"matrix": [10, 5], "x": 13, "y": 4}, - {"matrix": [10, 6], "x": 14, "y": 4}, + {"matrix": [10, 4], "x": 12, "y": 4.1}, + {"matrix": [10, 5], "x": 13, "y": 4.6}, + {"matrix": [10, 6], "x": 14, "y": 4.6}, - {"matrix": [5, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5.1}, + {"matrix": [4, 4], "x": 5, "y": 5.35}, + {"matrix": [4, 5], "x": 6, "y": 5.6}, - {"matrix": [10, 1], "x": 8, "y": 5}, - {"matrix": [10, 2], "x": 9, "y": 5}, - {"matrix": [11, 3], "x": 10, "y": 5}, + {"matrix": [10, 1], "x": 8, "y": 5.6}, + {"matrix": [10, 2], "x": 9, "y": 5.35}, + {"matrix": [11, 3], "x": 10, "y": 5.1}, - {"matrix": [5, 2], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [5, 2], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.85}, - {"matrix": [11, 1], "x": 8, "y": 6}, - {"matrix": [11, 2], "x": 9, "y": 6}, - {"matrix": [11, 4], "x": 10, "y": 6} + {"matrix": [11, 1], "x": 8, "y": 6.85}, + {"matrix": [11, 2], "x": 9, "y": 6.6}, + {"matrix": [11, 4], "x": 10, "y": 6.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index 7e1f8fbfedc..4a69beca94e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -21,9 +21,6 @@ "split": { "soft_serial_pin": "D0" }, - "rgblight": { - "led_count": 12 - }, "ws2812": { "pin": "D3" }, @@ -31,97 +28,97 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [7, 0], "x": 9, "y": 0}, - {"matrix": [7, 1], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 9, "y": 0.1}, + {"matrix": [7, 1], "x": 10, "y": 0.1}, {"matrix": [7, 2], "x": 11, "y": 0}, - {"matrix": [7, 3], "x": 12, "y": 0}, - {"matrix": [7, 4], "x": 13, "y": 0}, - {"matrix": [7, 5], "x": 14, "y": 0}, + {"matrix": [7, 3], "x": 12, "y": 0.1}, + {"matrix": [7, 4], "x": 13, "y": 0.6}, + {"matrix": [7, 5], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [8, 0], "x": 9, "y": 1}, - {"matrix": [8, 1], "x": 10, "y": 1}, + {"matrix": [8, 0], "x": 9, "y": 1.1}, + {"matrix": [8, 1], "x": 10, "y": 1.1}, {"matrix": [8, 2], "x": 11, "y": 1}, - {"matrix": [8, 3], "x": 12, "y": 1}, - {"matrix": [8, 4], "x": 13, "y": 1}, - {"matrix": [8, 5], "x": 14, "y": 1}, + {"matrix": [8, 3], "x": 12, "y": 1.1}, + {"matrix": [8, 4], "x": 13, "y": 1.6}, + {"matrix": [8, 5], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [9, 0], "x": 9, "y": 2}, - {"matrix": [9, 1], "x": 10, "y": 2}, + {"matrix": [9, 0], "x": 9, "y": 2.1}, + {"matrix": [9, 1], "x": 10, "y": 2.1}, {"matrix": [9, 2], "x": 11, "y": 2}, - {"matrix": [9, 3], "x": 12, "y": 2}, - {"matrix": [9, 4], "x": 13, "y": 2}, - {"matrix": [9, 5], "x": 14, "y": 2}, + {"matrix": [9, 3], "x": 12, "y": 2.1}, + {"matrix": [9, 4], "x": 13, "y": 2.6}, + {"matrix": [9, 5], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [10, 0], "x": 9, "y": 3}, - {"matrix": [10, 1], "x": 10, "y": 3}, + {"matrix": [10, 0], "x": 9, "y": 3.1}, + {"matrix": [10, 1], "x": 10, "y": 3.1}, {"matrix": [10, 2], "x": 11, "y": 3}, - {"matrix": [10, 3], "x": 12, "y": 3}, - {"matrix": [10, 4], "x": 13, "y": 3}, - {"matrix": [10, 5], "x": 14, "y": 3}, + {"matrix": [10, 3], "x": 12, "y": 3.1}, + {"matrix": [10, 4], "x": 13, "y": 3.6}, + {"matrix": [10, 5], "x": 14, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.1}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, - {"matrix": [11, 0], "x": 9, "y": 4}, - {"matrix": [11, 1], "x": 10, "y": 4}, + {"matrix": [11, 0], "x": 9, "y": 4.1}, + {"matrix": [11, 1], "x": 10, "y": 4.1}, {"matrix": [11, 2], "x": 11, "y": 4}, - {"matrix": [11, 3], "x": 12, "y": 4}, - {"matrix": [11, 4], "x": 13, "y": 4}, - {"matrix": [11, 5], "x": 14, "y": 4}, + {"matrix": [11, 3], "x": 12, "y": 4.1}, + {"matrix": [11, 4], "x": 13, "y": 4.6}, + {"matrix": [11, 5], "x": 14, "y": 4.6}, - {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5.1}, {"matrix": [5, 3], "x": 3, "y": 5}, {"matrix": [12, 2], "x": 11, "y": 5}, - {"matrix": [12, 3], "x": 12, "y": 5}, + {"matrix": [12, 3], "x": 12, "y": 5.1}, - {"matrix": [6, 3], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [6, 3], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.35}, + {"matrix": [5, 5], "x": 6, "y": 6.6}, - {"matrix": [12, 0], "x": 8, "y": 6}, - {"matrix": [12, 1], "x": 9, "y": 6}, - {"matrix": [13, 2], "x": 10, "y": 6}, + {"matrix": [12, 0], "x": 8, "y": 6.6}, + {"matrix": [12, 1], "x": 9, "y": 6.35}, + {"matrix": [13, 2], "x": 10, "y": 6.1}, - {"matrix": [6, 2], "x": 4, "y": 7}, - {"matrix": [6, 4], "x": 5, "y": 7}, - {"matrix": [6, 5], "x": 6, "y": 7}, + {"matrix": [6, 2], "x": 4, "y": 7.1}, + {"matrix": [6, 4], "x": 5, "y": 7.6}, + {"matrix": [6, 5], "x": 6, "y": 7.85}, - {"matrix": [13, 0], "x": 8, "y": 7}, - {"matrix": [13, 1], "x": 9, "y": 7}, - {"matrix": [13, 3], "x": 10, "y": 7} + {"matrix": [13, 0], "x": 8, "y": 7.85}, + {"matrix": [13, 1], "x": 9, "y": 7.6}, + {"matrix": [13, 3], "x": 10, "y": 7.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index 16c116240ab..d0d86dc6e92 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -21,9 +21,6 @@ "split": { "soft_serial_pin": "D0" }, - "rgblight": { - "led_count": 12 - }, "ws2812": { "pin": "D3" }, @@ -31,105 +28,105 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [7, 0], "x": 8, "y": 0}, - {"matrix": [7, 1], "x": 9, "y": 0}, - {"matrix": [7, 2], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 8, "y": 0.1}, + {"matrix": [7, 1], "x": 9, "y": 0.1}, + {"matrix": [7, 2], "x": 10, "y": 0.1}, {"matrix": [7, 3], "x": 11, "y": 0}, - {"matrix": [7, 4], "x": 12, "y": 0}, - {"matrix": [7, 5], "x": 13, "y": 0}, - {"matrix": [7, 6], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 12, "y": 0.1}, + {"matrix": [7, 5], "x": 13, "y": 0.6}, + {"matrix": [7, 6], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [8, 0], "x": 8, "y": 1}, - {"matrix": [8, 1], "x": 9, "y": 1}, - {"matrix": [8, 2], "x": 10, "y": 1}, + {"matrix": [8, 0], "x": 8, "y": 1.1}, + {"matrix": [8, 1], "x": 9, "y": 1.1}, + {"matrix": [8, 2], "x": 10, "y": 1.1}, {"matrix": [8, 3], "x": 11, "y": 1}, - {"matrix": [8, 4], "x": 12, "y": 1}, - {"matrix": [8, 5], "x": 13, "y": 1}, - {"matrix": [8, 6], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 12, "y": 1.1}, + {"matrix": [8, 5], "x": 13, "y": 1.6}, + {"matrix": [8, 6], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.1}, - {"matrix": [9, 0], "x": 8, "y": 2}, - {"matrix": [9, 1], "x": 9, "y": 2}, - {"matrix": [9, 2], "x": 10, "y": 2}, + {"matrix": [9, 0], "x": 8, "y": 2.1}, + {"matrix": [9, 1], "x": 9, "y": 2.1}, + {"matrix": [9, 2], "x": 10, "y": 2.1}, {"matrix": [9, 3], "x": 11, "y": 2}, - {"matrix": [9, 4], "x": 12, "y": 2}, - {"matrix": [9, 5], "x": 13, "y": 2}, - {"matrix": [9, 6], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 12, "y": 2.1}, + {"matrix": [9, 5], "x": 13, "y": 2.6}, + {"matrix": [9, 6], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.1}, - {"matrix": [10, 0], "x": 8, "y": 3}, - {"matrix": [10, 1], "x": 9, "y": 3}, - {"matrix": [10, 2], "x": 10, "y": 3}, + {"matrix": [10, 0], "x": 8, "y": 3.1}, + {"matrix": [10, 1], "x": 9, "y": 3.1}, + {"matrix": [10, 2], "x": 10, "y": 3.1}, {"matrix": [10, 3], "x": 11, "y": 3}, - {"matrix": [10, 4], "x": 12, "y": 3}, - {"matrix": [10, 5], "x": 13, "y": 3}, - {"matrix": [10, 6], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 12, "y": 3.1}, + {"matrix": [10, 5], "x": 13, "y": 3.6}, + {"matrix": [10, 6], "x": 14, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.1}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, - {"matrix": [11, 1], "x": 9, "y": 4}, - {"matrix": [11, 2], "x": 10, "y": 4}, + {"matrix": [11, 1], "x": 9, "y": 4.1}, + {"matrix": [11, 2], "x": 10, "y": 4.1}, {"matrix": [11, 3], "x": 11, "y": 4}, - {"matrix": [11, 4], "x": 12, "y": 4}, - {"matrix": [11, 5], "x": 13, "y": 4}, - {"matrix": [11, 6], "x": 14, "y": 4}, + {"matrix": [11, 4], "x": 12, "y": 4.1}, + {"matrix": [11, 5], "x": 13, "y": 4.6}, + {"matrix": [11, 6], "x": 14, "y": 4.6}, - {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5.1}, {"matrix": [5, 3], "x": 3, "y": 5}, {"matrix": [12, 3], "x": 11, "y": 5}, - {"matrix": [12, 4], "x": 12, "y": 5}, + {"matrix": [12, 4], "x": 12, "y": 5.1}, - {"matrix": [6, 3], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [6, 3], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.35}, + {"matrix": [5, 5], "x": 6, "y": 6.6}, - {"matrix": [12, 1], "x": 8, "y": 6}, - {"matrix": [12, 2], "x": 9, "y": 6}, - {"matrix": [13, 3], "x": 10, "y": 6}, + {"matrix": [12, 1], "x": 8, "y": 6.6}, + {"matrix": [12, 2], "x": 9, "y": 6.35}, + {"matrix": [13, 3], "x": 10, "y": 6.1}, - {"matrix": [6, 2], "x": 4, "y": 7}, - {"matrix": [6, 4], "x": 5, "y": 7}, - {"matrix": [6, 5], "x": 6, "y": 7}, + {"matrix": [6, 2], "x": 4, "y": 7.1}, + {"matrix": [6, 4], "x": 5, "y": 7.6}, + {"matrix": [6, 5], "x": 6, "y": 7.85}, - {"matrix": [13, 1], "x": 8, "y": 7}, - {"matrix": [13, 2], "x": 9, "y": 7}, - {"matrix": [13, 4], "x": 10, "y": 7} + {"matrix": [13, 1], "x": 8, "y": 7.85}, + {"matrix": [13, 2], "x": 9, "y": 7.6}, + {"matrix": [13, 4], "x": 10, "y": 7.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index d35ff729f56..1caecbeeabe 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -21,9 +21,6 @@ "split": { "soft_serial_pin": "D0" }, - "rgblight": { - "led_count": 12 - }, "ws2812": { "pin": "D3" }, @@ -31,101 +28,101 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [7, 0], "x": 9, "y": 0}, - {"matrix": [7, 1], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 9, "y": 0.1}, + {"matrix": [7, 1], "x": 10, "y": 0.1}, {"matrix": [7, 2], "x": 11, "y": 0}, - {"matrix": [7, 3], "x": 12, "y": 0}, - {"matrix": [7, 4], "x": 13, "y": 0}, - {"matrix": [7, 5], "x": 14, "y": 0}, + {"matrix": [7, 3], "x": 12, "y": 0.1}, + {"matrix": [7, 4], "x": 13, "y": 0.6}, + {"matrix": [7, 5], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [8, 0], "x": 9, "y": 1}, - {"matrix": [8, 1], "x": 10, "y": 1}, + {"matrix": [8, 0], "x": 9, "y": 1.1}, + {"matrix": [8, 1], "x": 10, "y": 1.1}, {"matrix": [8, 2], "x": 11, "y": 1}, - {"matrix": [8, 3], "x": 12, "y": 1}, - {"matrix": [8, 4], "x": 13, "y": 1}, - {"matrix": [8, 5], "x": 14, "y": 1}, + {"matrix": [8, 3], "x": 12, "y": 1.1}, + {"matrix": [8, 4], "x": 13, "y": 1.6}, + {"matrix": [8, 5], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [9, 0], "x": 9, "y": 2}, - {"matrix": [9, 1], "x": 10, "y": 2}, + {"matrix": [9, 0], "x": 9, "y": 2.1}, + {"matrix": [9, 1], "x": 10, "y": 2.1}, {"matrix": [9, 2], "x": 11, "y": 2}, - {"matrix": [9, 3], "x": 12, "y": 2}, - {"matrix": [9, 4], "x": 13, "y": 2}, - {"matrix": [9, 5], "x": 14, "y": 2}, + {"matrix": [9, 3], "x": 12, "y": 2.1}, + {"matrix": [9, 4], "x": 13, "y": 2.6}, + {"matrix": [9, 5], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [10, 0], "x": 9, "y": 3}, - {"matrix": [10, 1], "x": 10, "y": 3}, + {"matrix": [10, 0], "x": 9, "y": 3.1}, + {"matrix": [10, 1], "x": 10, "y": 3.1}, {"matrix": [10, 2], "x": 11, "y": 3}, - {"matrix": [10, 3], "x": 12, "y": 3}, - {"matrix": [10, 4], "x": 13, "y": 3}, - {"matrix": [10, 5], "x": 14, "y": 3}, + {"matrix": [10, 3], "x": 12, "y": 3.1}, + {"matrix": [10, 4], "x": 13, "y": 3.6}, + {"matrix": [10, 5], "x": 14, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.1}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, - {"matrix": [11, 0], "x": 9, "y": 4}, - {"matrix": [11, 1], "x": 10, "y": 4}, + {"matrix": [11, 0], "x": 9, "y": 4.1}, + {"matrix": [11, 1], "x": 10, "y": 4.1}, {"matrix": [11, 2], "x": 11, "y": 4}, - {"matrix": [11, 3], "x": 12, "y": 4}, - {"matrix": [11, 4], "x": 13, "y": 4}, - {"matrix": [11, 5], "x": 14, "y": 4}, + {"matrix": [11, 3], "x": 12, "y": 4.1}, + {"matrix": [11, 4], "x": 13, "y": 4.6}, + {"matrix": [11, 5], "x": 14, "y": 4.6}, - {"matrix": [5, 0], "x": 0, "y": 5}, - {"matrix": [5, 1], "x": 1, "y": 5}, - {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 0], "x": 0, "y": 5.6}, + {"matrix": [5, 1], "x": 1, "y": 5.6}, + {"matrix": [5, 2], "x": 2, "y": 5.1}, {"matrix": [5, 3], "x": 3, "y": 5}, {"matrix": [12, 2], "x": 11, "y": 5}, - {"matrix": [12, 3], "x": 12, "y": 5}, - {"matrix": [12, 4], "x": 13, "y": 5}, - {"matrix": [12, 5], "x": 14, "y": 5}, + {"matrix": [12, 3], "x": 12, "y": 5.1}, + {"matrix": [12, 4], "x": 13, "y": 5.6}, + {"matrix": [12, 5], "x": 14, "y": 5.6}, - {"matrix": [6, 3], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [6, 3], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.35}, + {"matrix": [5, 5], "x": 6, "y": 6.6}, - {"matrix": [12, 0], "x": 8, "y": 6}, - {"matrix": [12, 1], "x": 9, "y": 6}, - {"matrix": [13, 2], "x": 10, "y": 6}, + {"matrix": [12, 0], "x": 8, "y": 6.6}, + {"matrix": [12, 1], "x": 9, "y": 6.35}, + {"matrix": [13, 2], "x": 10, "y": 6.1}, - {"matrix": [6, 2], "x": 4, "y": 7}, - {"matrix": [6, 4], "x": 5, "y": 7}, - {"matrix": [6, 5], "x": 6, "y": 7}, + {"matrix": [6, 2], "x": 4, "y": 7.1}, + {"matrix": [6, 4], "x": 5, "y": 7.6}, + {"matrix": [6, 5], "x": 6, "y": 7.85}, - {"matrix": [13, 0], "x": 8, "y": 7}, - {"matrix": [13, 1], "x": 9, "y": 7}, - {"matrix": [13, 3], "x": 10, "y": 7} + {"matrix": [13, 0], "x": 8, "y": 7.85}, + {"matrix": [13, 1], "x": 9, "y": 7.5}, + {"matrix": [13, 3], "x": 10, "y": 7.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 556cbe7c347..1b88c2808af 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -21,9 +21,6 @@ "split": { "soft_serial_pin": "D0" }, - "rgblight": { - "led_count": 12 - }, "ws2812": { "pin": "D3" }, @@ -31,109 +28,109 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [7, 0], "x": 8, "y": 0}, - {"matrix": [7, 1], "x": 9, "y": 0}, - {"matrix": [7, 2], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 8, "y": 0.1}, + {"matrix": [7, 1], "x": 9, "y": 0.1}, + {"matrix": [7, 2], "x": 10, "y": 0.1}, {"matrix": [7, 3], "x": 11, "y": 0}, - {"matrix": [7, 4], "x": 12, "y": 0}, - {"matrix": [7, 5], "x": 13, "y": 0}, - {"matrix": [7, 6], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 12, "y": 0.1}, + {"matrix": [7, 5], "x": 13, "y": 0.6}, + {"matrix": [7, 6], "x": 14, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [8, 0], "x": 8, "y": 1}, - {"matrix": [8, 1], "x": 9, "y": 1}, - {"matrix": [8, 2], "x": 10, "y": 1}, + {"matrix": [8, 0], "x": 8, "y": 1.1}, + {"matrix": [8, 1], "x": 9, "y": 1.1}, + {"matrix": [8, 2], "x": 10, "y": 1.1}, {"matrix": [8, 3], "x": 11, "y": 1}, - {"matrix": [8, 4], "x": 12, "y": 1}, - {"matrix": [8, 5], "x": 13, "y": 1}, - {"matrix": [8, 6], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 12, "y": 1.1}, + {"matrix": [8, 5], "x": 13, "y": 1.6}, + {"matrix": [8, 6], "x": 14, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.1}, - {"matrix": [9, 0], "x": 8, "y": 2}, - {"matrix": [9, 1], "x": 9, "y": 2}, - {"matrix": [9, 2], "x": 10, "y": 2}, + {"matrix": [9, 0], "x": 8, "y": 2.1}, + {"matrix": [9, 1], "x": 9, "y": 2.1}, + {"matrix": [9, 2], "x": 10, "y": 2.1}, {"matrix": [9, 3], "x": 11, "y": 2}, - {"matrix": [9, 4], "x": 12, "y": 2}, - {"matrix": [9, 5], "x": 13, "y": 2}, - {"matrix": [9, 6], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 12, "y": 2.1}, + {"matrix": [9, 5], "x": 13, "y": 2.6}, + {"matrix": [9, 6], "x": 14, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.1}, {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.1}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.1}, - {"matrix": [10, 0], "x": 8, "y": 3}, - {"matrix": [10, 1], "x": 9, "y": 3}, - {"matrix": [10, 2], "x": 10, "y": 3}, + {"matrix": [10, 0], "x": 8, "y": 3.1}, + {"matrix": [10, 1], "x": 9, "y": 3.1}, + {"matrix": [10, 2], "x": 10, "y": 3.1}, {"matrix": [10, 3], "x": 11, "y": 3}, - {"matrix": [10, 4], "x": 12, "y": 3}, - {"matrix": [10, 5], "x": 13, "y": 3}, - {"matrix": [10, 6], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 12, "y": 3.1}, + {"matrix": [10, 5], "x": 13, "y": 3.6}, + {"matrix": [10, 6], "x": 14, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.1}, {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.1}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, - {"matrix": [11, 1], "x": 9, "y": 4}, - {"matrix": [11, 2], "x": 10, "y": 4}, + {"matrix": [11, 1], "x": 9, "y": 4.1}, + {"matrix": [11, 2], "x": 10, "y": 4.1}, {"matrix": [11, 3], "x": 11, "y": 4}, - {"matrix": [11, 4], "x": 12, "y": 4}, - {"matrix": [11, 5], "x": 13, "y": 4}, - {"matrix": [11, 6], "x": 14, "y": 4}, + {"matrix": [11, 4], "x": 12, "y": 4.1}, + {"matrix": [11, 5], "x": 13, "y": 4.6}, + {"matrix": [11, 6], "x": 14, "y": 4.6}, - {"matrix": [5, 0], "x": 0, "y": 5}, - {"matrix": [5, 1], "x": 1, "y": 5}, - {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 0], "x": 0, "y": 5.6}, + {"matrix": [5, 1], "x": 1, "y": 5.6}, + {"matrix": [5, 2], "x": 2, "y": 5.1}, {"matrix": [5, 3], "x": 3, "y": 5}, {"matrix": [12, 3], "x": 11, "y": 5}, - {"matrix": [12, 4], "x": 12, "y": 5}, - {"matrix": [12, 5], "x": 13, "y": 5}, - {"matrix": [12, 6], "x": 14, "y": 5}, + {"matrix": [12, 4], "x": 12, "y": 5.1}, + {"matrix": [12, 5], "x": 13, "y": 5.6}, + {"matrix": [12, 6], "x": 14, "y": 5.6}, - {"matrix": [6, 3], "x": 4, "y": 6}, - {"matrix": [5, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, + {"matrix": [6, 3], "x": 4, "y": 6.1}, + {"matrix": [5, 4], "x": 5, "y": 6.35}, + {"matrix": [5, 5], "x": 6, "y": 6.6}, - {"matrix": [12, 1], "x": 8, "y": 6}, - {"matrix": [12, 2], "x": 9, "y": 6}, - {"matrix": [13, 3], "x": 10, "y": 6}, + {"matrix": [12, 1], "x": 8, "y": 6.6}, + {"matrix": [12, 2], "x": 9, "y": 6.35}, + {"matrix": [13, 3], "x": 10, "y": 6.1}, - {"matrix": [6, 2], "x": 4, "y": 7}, - {"matrix": [6, 4], "x": 5, "y": 7}, - {"matrix": [6, 5], "x": 6, "y": 7}, + {"matrix": [6, 2], "x": 4, "y": 7.1}, + {"matrix": [6, 4], "x": 5, "y": 7.6}, + {"matrix": [6, 5], "x": 6, "y": 7.85}, - {"matrix": [13, 1], "x": 8, "y": 7}, - {"matrix": [13, 2], "x": 9, "y": 7}, - {"matrix": [13, 4], "x": 10, "y": 7} + {"matrix": [13, 1], "x": 8, "y": 7.85}, + {"matrix": [13, 2], "x": 9, "y": 7.6}, + {"matrix": [13, 4], "x": 10, "y": 7.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index 77d5c58ffd7..cc78e21f119 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -21,9 +21,6 @@ "split": { "soft_serial_pin": "D0" }, - "rgblight": { - "led_count": 12 - }, "ws2812": { "pin": "D3" }, @@ -31,107 +28,107 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.6}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [7, 0], "x": 10, "y": 0}, - {"matrix": [7, 1], "x": 11, "y": 0}, + {"matrix": [7, 0], "x": 10, "y": 0.1}, + {"matrix": [7, 1], "x": 11, "y": 0.1}, {"matrix": [7, 2], "x": 12, "y": 0}, - {"matrix": [7, 3], "x": 13, "y": 0}, - {"matrix": [7, 4], "x": 14, "y": 0}, - {"matrix": [7, 5], "x": 15, "y": 0}, - {"matrix": [7, 6], "x": 16, "y": 0}, + {"matrix": [7, 3], "x": 13, "y": 0.1}, + {"matrix": [7, 4], "x": 14, "y": 0.6}, + {"matrix": [7, 5], "x": 15, "y": 0.6}, + {"matrix": [7, 6], "x": 16, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.6}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [8, 0], "x": 10, "y": 1}, - {"matrix": [8, 1], "x": 11, "y": 1}, + {"matrix": [8, 0], "x": 10, "y": 1.1}, + {"matrix": [8, 1], "x": 11, "y": 1.1}, {"matrix": [8, 2], "x": 12, "y": 1}, - {"matrix": [8, 3], "x": 13, "y": 1}, - {"matrix": [8, 4], "x": 14, "y": 1}, - {"matrix": [8, 5], "x": 15, "y": 1}, - {"matrix": [8, 6], "x": 16, "y": 1}, + {"matrix": [8, 3], "x": 13, "y": 1.1}, + {"matrix": [8, 4], "x": 14, "y": 1.6}, + {"matrix": [8, 5], "x": 15, "y": 1.6}, + {"matrix": [8, 6], "x": 16, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.6}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.1}, - {"matrix": [9, 0], "x": 10, "y": 2}, - {"matrix": [9, 1], "x": 11, "y": 2}, + {"matrix": [9, 0], "x": 10, "y": 2.1}, + {"matrix": [9, 1], "x": 11, "y": 2.1}, {"matrix": [9, 2], "x": 12, "y": 2}, - {"matrix": [9, 3], "x": 13, "y": 2}, - {"matrix": [9, 4], "x": 14, "y": 2}, - {"matrix": [9, 5], "x": 15, "y": 2}, - {"matrix": [9, 6], "x": 16, "y": 2}, + {"matrix": [9, 3], "x": 13, "y": 2.1}, + {"matrix": [9, 4], "x": 14, "y": 2.6}, + {"matrix": [9, 5], "x": 15, "y": 2.6}, + {"matrix": [9, 6], "x": 16, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.6}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.1}, - {"matrix": [10, 0], "x": 10, "y": 3}, - {"matrix": [10, 1], "x": 11, "y": 3}, + {"matrix": [10, 0], "x": 10, "y": 3.1}, + {"matrix": [10, 1], "x": 11, "y": 3.1}, {"matrix": [10, 2], "x": 12, "y": 3}, - {"matrix": [10, 3], "x": 13, "y": 3}, - {"matrix": [10, 4], "x": 14, "y": 3}, - {"matrix": [10, 5], "x": 15, "y": 3}, - {"matrix": [10, 6], "x": 16, "y": 3}, + {"matrix": [10, 3], "x": 13, "y": 3.1}, + {"matrix": [10, 4], "x": 14, "y": 3.6}, + {"matrix": [10, 5], "x": 15, "y": 3.6}, + {"matrix": [10, 6], "x": 16, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.6}, + {"matrix": [4, 3], "x": 3, "y": 4.1}, {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, + {"matrix": [4, 6], "x": 6, "y": 4.1}, - {"matrix": [11, 0], "x": 10, "y": 4}, - {"matrix": [11, 1], "x": 11, "y": 4}, + {"matrix": [11, 0], "x": 10, "y": 4.1}, + {"matrix": [11, 1], "x": 11, "y": 4.1}, {"matrix": [11, 2], "x": 12, "y": 4}, - {"matrix": [11, 3], "x": 13, "y": 4}, - {"matrix": [11, 4], "x": 14, "y": 4}, - {"matrix": [11, 5], "x": 15, "y": 4}, - {"matrix": [11, 6], "x": 16, "y": 4}, + {"matrix": [11, 3], "x": 13, "y": 4.1}, + {"matrix": [11, 4], "x": 14, "y": 4.6}, + {"matrix": [11, 5], "x": 15, "y": 4.6}, + {"matrix": [11, 6], "x": 16, "y": 4.6}, - {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5.1}, {"matrix": [5, 4], "x": 4, "y": 5}, {"matrix": [12, 2], "x": 12, "y": 5}, - {"matrix": [12, 3], "x": 13, "y": 5}, + {"matrix": [12, 3], "x": 13, "y": 5.1}, - {"matrix": [6, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, - {"matrix": [5, 6], "x": 7, "y": 6}, + {"matrix": [6, 4], "x": 5, "y": 6.1}, + {"matrix": [5, 5], "x": 6, "y": 6.35}, + {"matrix": [5, 6], "x": 7, "y": 6.6}, - {"matrix": [12, 0], "x": 9, "y": 6}, - {"matrix": [12, 1], "x": 10, "y": 6}, - {"matrix": [13, 2], "x": 11, "y": 6}, + {"matrix": [12, 0], "x": 9, "y": 6.6}, + {"matrix": [12, 1], "x": 10, "y": 6.35}, + {"matrix": [13, 2], "x": 11, "y": 6.1}, - {"matrix": [6, 3], "x": 5, "y": 7}, - {"matrix": [6, 5], "x": 6, "y": 7}, - {"matrix": [6, 6], "x": 7, "y": 7}, + {"matrix": [6, 3], "x": 5, "y": 7.1}, + {"matrix": [6, 5], "x": 6, "y": 7.6}, + {"matrix": [6, 6], "x": 7, "y": 7.85}, - {"matrix": [13, 0], "x": 9, "y": 7}, - {"matrix": [13, 1], "x": 10, "y": 7}, - {"matrix": [13, 3], "x": 11, "y": 7} + {"matrix": [13, 0], "x": 9, "y": 7.85}, + {"matrix": [13, 1], "x": 10, "y": 7.6}, + {"matrix": [13, 3], "x": 11, "y": 7.1} ] } } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index f1440121aa0..53ed8e752da 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -21,9 +21,6 @@ "split": { "soft_serial_pin": "D0" }, - "rgblight": { - "led_count": 12 - }, "ws2812": { "pin": "D3" }, @@ -31,113 +28,113 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.6}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.1}, - {"matrix": [7, 0], "x": 10, "y": 0}, - {"matrix": [7, 1], "x": 11, "y": 0}, + {"matrix": [7, 0], "x": 10, "y": 0.1}, + {"matrix": [7, 1], "x": 11, "y": 0.1}, {"matrix": [7, 2], "x": 12, "y": 0}, - {"matrix": [7, 3], "x": 13, "y": 0}, - {"matrix": [7, 4], "x": 14, "y": 0}, - {"matrix": [7, 5], "x": 15, "y": 0}, - {"matrix": [7, 6], "x": 16, "y": 0}, + {"matrix": [7, 3], "x": 13, "y": 0.1}, + {"matrix": [7, 4], "x": 14, "y": 0.6}, + {"matrix": [7, 5], "x": 15, "y": 0.6}, + {"matrix": [7, 6], "x": 16, "y": 0.6}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.6}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.1}, - {"matrix": [8, 0], "x": 10, "y": 1}, - {"matrix": [8, 1], "x": 11, "y": 1}, + {"matrix": [8, 0], "x": 10, "y": 1.1}, + {"matrix": [8, 1], "x": 11, "y": 1.1}, {"matrix": [8, 2], "x": 12, "y": 1}, - {"matrix": [8, 3], "x": 13, "y": 1}, - {"matrix": [8, 4], "x": 14, "y": 1}, - {"matrix": [8, 5], "x": 15, "y": 1}, - {"matrix": [8, 6], "x": 16, "y": 1}, + {"matrix": [8, 3], "x": 13, "y": 1.1}, + {"matrix": [8, 4], "x": 14, "y": 1.6}, + {"matrix": [8, 5], "x": 15, "y": 1.6}, + {"matrix": [8, 6], "x": 16, "y": 1.6}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.6}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.1}, - {"matrix": [9, 0], "x": 10, "y": 2}, - {"matrix": [9, 1], "x": 11, "y": 2}, + {"matrix": [9, 0], "x": 10, "y": 2.1}, + {"matrix": [9, 1], "x": 11, "y": 2.1}, {"matrix": [9, 2], "x": 12, "y": 2}, - {"matrix": [9, 3], "x": 13, "y": 2}, - {"matrix": [9, 4], "x": 14, "y": 2}, - {"matrix": [9, 5], "x": 15, "y": 2}, - {"matrix": [9, 6], "x": 16, "y": 2}, + {"matrix": [9, 3], "x": 13, "y": 2.1}, + {"matrix": [9, 4], "x": 14, "y": 2.6}, + {"matrix": [9, 5], "x": 15, "y": 2.6}, + {"matrix": [9, 6], "x": 16, "y": 2.6}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.6}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.1}, - {"matrix": [10, 0], "x": 10, "y": 3}, - {"matrix": [10, 1], "x": 11, "y": 3}, + {"matrix": [10, 0], "x": 10, "y": 3.1}, + {"matrix": [10, 1], "x": 11, "y": 3.1}, {"matrix": [10, 2], "x": 12, "y": 3}, - {"matrix": [10, 3], "x": 13, "y": 3}, - {"matrix": [10, 4], "x": 14, "y": 3}, - {"matrix": [10, 5], "x": 15, "y": 3}, - {"matrix": [10, 6], "x": 16, "y": 3}, + {"matrix": [10, 3], "x": 13, "y": 3.1}, + {"matrix": [10, 4], "x": 14, "y": 3.6}, + {"matrix": [10, 5], "x": 15, "y": 3.6}, + {"matrix": [10, 6], "x": 16, "y": 3.6}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.6}, + {"matrix": [4, 3], "x": 3, "y": 4.1}, {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, + {"matrix": [4, 6], "x": 6, "y": 4.1}, - {"matrix": [11, 0], "x": 10, "y": 4}, - {"matrix": [11, 1], "x": 11, "y": 4}, + {"matrix": [11, 0], "x": 10, "y": 4.1}, + {"matrix": [11, 1], "x": 11, "y": 4.1}, {"matrix": [11, 2], "x": 12, "y": 4}, - {"matrix": [11, 3], "x": 13, "y": 4}, - {"matrix": [11, 4], "x": 14, "y": 4}, - {"matrix": [11, 5], "x": 15, "y": 4}, - {"matrix": [11, 6], "x": 16, "y": 4}, + {"matrix": [11, 3], "x": 13, "y": 4.1}, + {"matrix": [11, 4], "x": 14, "y": 4.6}, + {"matrix": [11, 5], "x": 15, "y": 4.6}, + {"matrix": [11, 6], "x": 16, "y": 4.6}, - {"matrix": [5, 0], "x": 0, "y": 5}, - {"matrix": [5, 1], "x": 1, "y": 5}, - {"matrix": [5, 2], "x": 2, "y": 5}, - {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 0], "x": 0, "y": 5.6}, + {"matrix": [5, 1], "x": 1, "y": 5.6}, + {"matrix": [5, 2], "x": 2, "y": 5.6}, + {"matrix": [5, 3], "x": 3, "y": 5.1}, {"matrix": [5, 4], "x": 4, "y": 5}, {"matrix": [12, 2], "x": 12, "y": 5}, - {"matrix": [12, 3], "x": 13, "y": 5}, - {"matrix": [12, 4], "x": 14, "y": 5}, - {"matrix": [12, 5], "x": 15, "y": 5}, - {"matrix": [12, 6], "x": 16, "y": 5}, + {"matrix": [12, 3], "x": 13, "y": 5.1}, + {"matrix": [12, 4], "x": 14, "y": 5.6}, + {"matrix": [12, 5], "x": 15, "y": 5.6}, + {"matrix": [12, 6], "x": 16, "y": 5.6}, - {"matrix": [6, 4], "x": 5, "y": 6}, - {"matrix": [5, 5], "x": 6, "y": 6}, - {"matrix": [5, 6], "x": 7, "y": 6}, + {"matrix": [6, 4], "x": 5, "y": 6.1}, + {"matrix": [5, 5], "x": 6, "y": 6.35}, + {"matrix": [5, 6], "x": 7, "y": 6.6}, - {"matrix": [12, 0], "x": 9, "y": 6}, - {"matrix": [12, 1], "x": 10, "y": 6}, - {"matrix": [13, 2], "x": 11, "y": 6}, + {"matrix": [12, 0], "x": 9, "y": 6.6}, + {"matrix": [12, 1], "x": 10, "y": 6.35}, + {"matrix": [13, 2], "x": 11, "y": 6.1}, - {"matrix": [6, 3], "x": 5, "y": 7}, - {"matrix": [6, 5], "x": 6, "y": 7}, - {"matrix": [6, 6], "x": 7, "y": 7}, + {"matrix": [6, 3], "x": 5, "y": 7.1}, + {"matrix": [6, 5], "x": 6, "y": 7.6}, + {"matrix": [6, 6], "x": 7, "y": 7.85}, - {"matrix": [13, 0], "x": 9, "y": 7}, - {"matrix": [13, 1], "x": 10, "y": 7}, - {"matrix": [13, 3], "x": 11, "y": 7} + {"matrix": [13, 0], "x": 9, "y": 7.85}, + {"matrix": [13, 1], "x": 10, "y": 7.6}, + {"matrix": [13, 3], "x": 11, "y": 7.1} ] } } From b5c4122dd0aa05dc1b0bc9666828362b4434625c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 15 Jul 2023 00:14:13 +0100 Subject: [PATCH 13/32] thumb cluster layout adjustment --- .../handwired/dactyl_manuform_carbonfet/4x5/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/4x5_eic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/4x6/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/4x6_ex/info.json | 8 ++++---- .../dactyl_manuform_carbonfet/4x6_exic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/5x6/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/5x6_eic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/5x6_ex/info.json | 8 ++++---- .../dactyl_manuform_carbonfet/5x6_exic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/6x6/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/6x6_eic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/6x6_ex/info.json | 8 ++++---- .../dactyl_manuform_carbonfet/6x6_exic/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/6x7/info.json | 8 ++++---- .../handwired/dactyl_manuform_carbonfet/6x7_ex/info.json | 8 ++++---- 16 files changed, 64 insertions(+), 64 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index 496208d8b26..2dcfc34e279 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -72,17 +72,17 @@ {"matrix": [4, 2], "x": 3, "y": 4.1}, {"matrix": [3, 3], "x": 4, "y": 4.35}, - {"matrix": [3, 4], "x": 5, "y": 4.6}, + {"matrix": [3, 4], "x": 5, "y": 4.45}, - {"matrix": [8, 0], "x": 7, "y": 4.6}, + {"matrix": [8, 0], "x": 7, "y": 4.45}, {"matrix": [8, 1], "x": 8, "y": 4.35}, {"matrix": [9, 2], "x": 9, "y": 4.1}, {"matrix": [4, 1], "x": 3, "y": 5.1}, {"matrix": [4, 3], "x": 4, "y": 5.6}, - {"matrix": [4, 4], "x": 5, "y": 5.85}, + {"matrix": [4, 4], "x": 5, "y": 5.7}, - {"matrix": [9, 0], "x": 7, "y": 5.85}, + {"matrix": [9, 0], "x": 7, "y": 5.7}, {"matrix": [9, 1], "x": 8, "y": 5.6}, {"matrix": [9, 3], "x": 9, "y": 5.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index de409252930..58ca831e7d1 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -76,17 +76,17 @@ {"matrix": [4, 2], "x": 3, "y": 4.1}, {"matrix": [3, 3], "x": 4, "y": 4.35}, - {"matrix": [3, 4], "x": 5, "y": 4.6}, + {"matrix": [3, 4], "x": 5, "y": 4.45}, - {"matrix": [8, 1], "x": 7, "y": 4.6}, + {"matrix": [8, 1], "x": 7, "y": 4.45}, {"matrix": [8, 2], "x": 8, "y": 4.35}, {"matrix": [9, 3], "x": 9, "y": 4.1}, {"matrix": [4, 1], "x": 3, "y": 5.1}, {"matrix": [4, 3], "x": 4, "y": 5.6}, - {"matrix": [4, 4], "x": 5, "y": 5.85}, + {"matrix": [4, 4], "x": 5, "y": 5.7}, - {"matrix": [9, 1], "x": 7, "y": 5.85}, + {"matrix": [9, 1], "x": 7, "y": 5.7}, {"matrix": [9, 2], "x": 8, "y": 5.6}, {"matrix": [9, 4], "x": 9, "y": 5.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index 8057d357dd4..582fbfbbcb4 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -78,17 +78,17 @@ {"matrix": [4, 3], "x": 4, "y": 4.1}, {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.6}, + {"matrix": [3, 5], "x": 6, "y": 4.45}, - {"matrix": [8, 0], "x": 8, "y": 4.6}, + {"matrix": [8, 0], "x": 8, "y": 4.45}, {"matrix": [8, 1], "x": 9, "y": 4.35}, {"matrix": [9, 2], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.85}, + {"matrix": [4, 5], "x": 6, "y": 5.7}, - {"matrix": [9, 0], "x": 8, "y": 5.85}, + {"matrix": [9, 0], "x": 8, "y": 5.7}, {"matrix": [9, 1], "x": 9, "y": 5.6}, {"matrix": [9, 3], "x": 10, "y": 5.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index e5f815f0a36..a8242815943 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -82,17 +82,17 @@ {"matrix": [4, 3], "x": 4, "y": 4.1}, {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.6}, + {"matrix": [3, 5], "x": 6, "y": 4.45}, - {"matrix": [8, 1], "x": 8, "y": 4.6}, + {"matrix": [8, 1], "x": 8, "y": 4.45}, {"matrix": [8, 2], "x": 9, "y": 4.35}, {"matrix": [9, 3], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.85}, + {"matrix": [4, 5], "x": 6, "y": 5.7}, - {"matrix": [9, 1], "x": 8, "y": 5.85}, + {"matrix": [9, 1], "x": 8, "y": 5.7}, {"matrix": [9, 2], "x": 9, "y": 5.6}, {"matrix": [9, 4], "x": 10, "y": 5.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index 6219b8a8a8d..3eb75c5c12d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -82,17 +82,17 @@ {"matrix": [4, 3], "x": 4, "y": 4.1}, {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.6}, + {"matrix": [3, 5], "x": 6, "y": 4.45}, - {"matrix": [8, 0], "x": 8, "y": 4.6}, + {"matrix": [8, 0], "x": 8, "y": 4.45}, {"matrix": [8, 1], "x": 9, "y": 4.35}, {"matrix": [9, 2], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.85}, + {"matrix": [4, 5], "x": 6, "y": 5.7}, - {"matrix": [9, 0], "x": 8, "y": 5.85}, + {"matrix": [9, 0], "x": 8, "y": 5.7}, {"matrix": [9, 1], "x": 9, "y": 5.6}, {"matrix": [9, 3], "x": 10, "y": 5.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index b887f47fa87..dcf3ed460cc 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -86,17 +86,17 @@ {"matrix": [4, 3], "x": 4, "y": 4.1}, {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.6}, + {"matrix": [3, 5], "x": 6, "y": 4.45}, - {"matrix": [8, 1], "x": 8, "y": 4.6}, + {"matrix": [8, 1], "x": 8, "y": 4.45}, {"matrix": [8, 2], "x": 9, "y": 4.35}, {"matrix": [9, 3], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.85}, + {"matrix": [4, 5], "x": 6, "y": 5.7}, - {"matrix": [9, 1], "x": 8, "y": 5.85}, + {"matrix": [9, 1], "x": 8, "y": 5.7}, {"matrix": [9, 2], "x": 9, "y": 5.6}, {"matrix": [9, 4], "x": 10, "y": 5.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index 10fc57faa85..9a61292fc09 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -92,17 +92,17 @@ {"matrix": [5, 3], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.45}, - {"matrix": [10, 0], "x": 8, "y": 5.6}, + {"matrix": [10, 0], "x": 8, "y": 5.45}, {"matrix": [10, 1], "x": 9, "y": 5.35}, {"matrix": [11, 2], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.85}, + {"matrix": [5, 5], "x": 6, "y": 6.7}, - {"matrix": [11, 0], "x": 8, "y": 6.85}, + {"matrix": [11, 0], "x": 8, "y": 6.7}, {"matrix": [11, 1], "x": 9, "y": 6.6}, {"matrix": [11, 3], "x": 10, "y": 6.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index aaafadb3a6c..fa7ceea49fc 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -98,17 +98,17 @@ {"matrix": [5, 3], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.45}, - {"matrix": [10, 1], "x": 8, "y": 5.6}, + {"matrix": [10, 1], "x": 8, "y": 5.45}, {"matrix": [10, 2], "x": 9, "y": 5.35}, {"matrix": [11, 3], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.85}, + {"matrix": [5, 5], "x": 6, "y": 6.7}, - {"matrix": [11, 1], "x": 8, "y": 6.85}, + {"matrix": [11, 1], "x": 8, "y": 6.7}, {"matrix": [11, 2], "x": 9, "y": 6.6}, {"matrix": [11, 4], "x": 10, "y": 6.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index fda353a36b0..bd265afa17d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -96,17 +96,17 @@ {"matrix": [5, 3], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.45}, - {"matrix": [10, 0], "x": 8, "y": 5.6}, + {"matrix": [10, 0], "x": 8, "y": 5.45}, {"matrix": [10, 1], "x": 9, "y": 5.35}, {"matrix": [11, 2], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.85}, + {"matrix": [5, 5], "x": 6, "y": 6.7}, - {"matrix": [11, 0], "x": 8, "y": 6.85}, + {"matrix": [11, 0], "x": 8, "y": 6.7}, {"matrix": [11, 1], "x": 9, "y": 6.6}, {"matrix": [11, 3], "x": 10, "y": 6.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index d7758cee89d..844a3d3a8e0 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -102,17 +102,17 @@ {"matrix": [5, 3], "x": 4, "y": 5.1}, {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.6}, + {"matrix": [4, 5], "x": 6, "y": 5.45}, - {"matrix": [10, 1], "x": 8, "y": 5.6}, + {"matrix": [10, 1], "x": 8, "y": 5.45}, {"matrix": [10, 2], "x": 9, "y": 5.35}, {"matrix": [11, 3], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.85}, + {"matrix": [5, 5], "x": 6, "y": 6.7}, - {"matrix": [11, 1], "x": 8, "y": 6.85}, + {"matrix": [11, 1], "x": 8, "y": 6.7}, {"matrix": [11, 2], "x": 9, "y": 6.6}, {"matrix": [11, 4], "x": 10, "y": 6.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index 4a69beca94e..227ecd76310 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -106,17 +106,17 @@ {"matrix": [6, 3], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.45}, - {"matrix": [12, 0], "x": 8, "y": 6.6}, + {"matrix": [12, 0], "x": 8, "y": 6.45}, {"matrix": [12, 1], "x": 9, "y": 6.35}, {"matrix": [13, 2], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.85}, + {"matrix": [6, 5], "x": 6, "y": 7.7}, - {"matrix": [13, 0], "x": 8, "y": 7.85}, + {"matrix": [13, 0], "x": 8, "y": 7.7}, {"matrix": [13, 1], "x": 9, "y": 7.6}, {"matrix": [13, 3], "x": 10, "y": 7.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index d0d86dc6e92..086dc163cc1 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -114,17 +114,17 @@ {"matrix": [6, 3], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.45}, - {"matrix": [12, 1], "x": 8, "y": 6.6}, + {"matrix": [12, 1], "x": 8, "y": 6.45}, {"matrix": [12, 2], "x": 9, "y": 6.35}, {"matrix": [13, 3], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.85}, + {"matrix": [6, 5], "x": 6, "y": 7.7}, - {"matrix": [13, 1], "x": 8, "y": 7.85}, + {"matrix": [13, 1], "x": 8, "y": 7.7}, {"matrix": [13, 2], "x": 9, "y": 7.6}, {"matrix": [13, 4], "x": 10, "y": 7.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index 1caecbeeabe..b1c7df19f42 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -110,17 +110,17 @@ {"matrix": [6, 3], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.45}, - {"matrix": [12, 0], "x": 8, "y": 6.6}, + {"matrix": [12, 0], "x": 8, "y": 6.45}, {"matrix": [12, 1], "x": 9, "y": 6.35}, {"matrix": [13, 2], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.85}, + {"matrix": [6, 5], "x": 6, "y": 7.7}, - {"matrix": [13, 0], "x": 8, "y": 7.85}, + {"matrix": [13, 0], "x": 8, "y": 7.7}, {"matrix": [13, 1], "x": 9, "y": 7.5}, {"matrix": [13, 3], "x": 10, "y": 7.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 1b88c2808af..1defdb956be 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -118,17 +118,17 @@ {"matrix": [6, 3], "x": 4, "y": 6.1}, {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.6}, + {"matrix": [5, 5], "x": 6, "y": 6.45}, - {"matrix": [12, 1], "x": 8, "y": 6.6}, + {"matrix": [12, 1], "x": 8, "y": 6.45}, {"matrix": [12, 2], "x": 9, "y": 6.35}, {"matrix": [13, 3], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.85}, + {"matrix": [6, 5], "x": 6, "y": 7.7}, - {"matrix": [13, 1], "x": 8, "y": 7.85}, + {"matrix": [13, 1], "x": 8, "y": 7.7}, {"matrix": [13, 2], "x": 9, "y": 7.6}, {"matrix": [13, 4], "x": 10, "y": 7.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index cc78e21f119..cd85f9d4677 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -116,17 +116,17 @@ {"matrix": [6, 4], "x": 5, "y": 6.1}, {"matrix": [5, 5], "x": 6, "y": 6.35}, - {"matrix": [5, 6], "x": 7, "y": 6.6}, + {"matrix": [5, 6], "x": 7, "y": 6.45}, - {"matrix": [12, 0], "x": 9, "y": 6.6}, + {"matrix": [12, 0], "x": 9, "y": 6.45}, {"matrix": [12, 1], "x": 10, "y": 6.35}, {"matrix": [13, 2], "x": 11, "y": 6.1}, {"matrix": [6, 3], "x": 5, "y": 7.1}, {"matrix": [6, 5], "x": 6, "y": 7.6}, - {"matrix": [6, 6], "x": 7, "y": 7.85}, + {"matrix": [6, 6], "x": 7, "y": 7.7}, - {"matrix": [13, 0], "x": 9, "y": 7.85}, + {"matrix": [13, 0], "x": 9, "y": 7.7}, {"matrix": [13, 1], "x": 10, "y": 7.6}, {"matrix": [13, 3], "x": 11, "y": 7.1} ] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 53ed8e752da..b5597da5146 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -122,17 +122,17 @@ {"matrix": [6, 4], "x": 5, "y": 6.1}, {"matrix": [5, 5], "x": 6, "y": 6.35}, - {"matrix": [5, 6], "x": 7, "y": 6.6}, + {"matrix": [5, 6], "x": 7, "y": 6.45}, - {"matrix": [12, 0], "x": 9, "y": 6.6}, + {"matrix": [12, 0], "x": 9, "y": 6.45}, {"matrix": [12, 1], "x": 10, "y": 6.35}, {"matrix": [13, 2], "x": 11, "y": 6.1}, {"matrix": [6, 3], "x": 5, "y": 7.1}, {"matrix": [6, 5], "x": 6, "y": 7.6}, - {"matrix": [6, 6], "x": 7, "y": 7.85}, + {"matrix": [6, 6], "x": 7, "y": 7.7}, - {"matrix": [13, 0], "x": 9, "y": 7.85}, + {"matrix": [13, 0], "x": 9, "y": 7.7}, {"matrix": [13, 1], "x": 10, "y": 7.6}, {"matrix": [13, 3], "x": 11, "y": 7.1} ] From 52493198eef55464af2c4c1ac90978a0f3bd0779 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 19 Jul 2023 04:17:22 +0100 Subject: [PATCH 14/32] Update readme.md alteration diagrams amended to match prettied layouts --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 84be4abd172..5720a414427 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -35,9 +35,9 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* ### Alteration | Code | Description | Diagram
*4x6 example* | | :---: | :---: | :---: | -| ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | ![ex](https://i.imgur.com/pnW1LPwh.png) | -| eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | ![eic](https://i.imgur.com/myKWapoh.png) | -| exic | *ex* and *eic* combined | ![exic](https://i.imgur.com/iAIRVikh.png) | +| ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | ![ex](https://i.imgur.com/ifhDa7Zh.png) | +| eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | ![eic](https://i.imgur.com/stuHtsXh.png) | +| exic | *ex* and *eic* combined | ![exic](https://i.imgur.com/t37nF0uh.png) | ### Legacy 5x7 variant From 7bd383fcead61084aba2d0a643ea362f9eae3311 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 21 Jul 2023 09:55:20 +0100 Subject: [PATCH 15/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 5720a414427..fb0e782557f 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -11,7 +11,7 @@ Forked from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform), the *Da ## Variants -*Dactyl ManuForm Carbonfet's* are built in variations that cater for different row and column counts. +*Dactyl ManuForm Carbonfets* are built in variations that cater for different row and column counts. As standard: - The finger keywell bottom row has 2 keys, 1 each in ring and middle columns @@ -33,7 +33,7 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* | 7 | As *6 column* with additional pinky column | ### Alteration -| Code | Description | Diagram
*4x6 example* | +| Code | Description | Diagram
*(4x6 example)* | | :---: | :---: | :---: | | ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | ![ex](https://i.imgur.com/ifhDa7Zh.png) | | eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | ![eic](https://i.imgur.com/stuHtsXh.png) | From 30967e46fb18ddb49bc253c8150e7155275cf807 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 22 Jul 2023 22:47:33 +0100 Subject: [PATCH 16/32] update info.json correct usb.device_version --- keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/5x6_exic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/6x6_exic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index 2dcfc34e279..22f40f7075a 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index 58ca831e7d1..06523df9c2a 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index 582fbfbbcb4..95b0890359c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index a8242815943..1a2c870e1c4 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index 3eb75c5c12d..434862cf8d8 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index dcf3ed460cc..59e07acbe22 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index 9a61292fc09..b54d1d79a13 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index fa7ceea49fc..5eb742f0196 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index bd265afa17d..c9b5341d071 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index 844a3d3a8e0..07d31067962 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index 227ecd76310..d6e718de132 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index 086dc163cc1..6a488e87a04 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index b1c7df19f42..255282b5265 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 1defdb956be..16f2fd93abc 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index cd85f9d4677..f61af20cd78 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index b5597da5146..395a056914d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -3,7 +3,7 @@ "usb": { "vid": "0x444D", "pid": "0x3435", - "device_version": "0.0.1" + "device_version": "1.0.0" }, "features": { "bootmagic": true, From 7a9e84d7c996a192753eb3b6a3abea62b388292f Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 25 Jul 2023 20:58:43 +0100 Subject: [PATCH 17/32] update `usb.pid` --- keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/5x6_exic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json | 2 +- .../handwired/dactyl_manuform_carbonfet/6x6_exic/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json | 2 +- keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index 22f40f7075a..044fc180816 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC450", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index 06523df9c2a..a2f017af16e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 eic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC45B", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index 95b0890359c..b36da033c4a 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 4x6", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC460", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index 1a2c870e1c4..2ff78b3b7b0 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC46B", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index 434862cf8d8..a9afd9dce50 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 ex", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC46A", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 59e07acbe22..8cbccd443e8 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC46C", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index b54d1d79a13..1cc9e7f24e6 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 5x6", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC560", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index 5eb742f0196..898d44998b9 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 eic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC56B", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index c9b5341d071..eceedbfc405 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 ex", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC56A", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index 07d31067962..68046290d72 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 exic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC56C", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index d6e718de132..74b8b310200 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x6", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC660", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index 6a488e87a04..bbe98fa1018 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 eic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC66B", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index 255282b5265..72914450155 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 ex", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC66A", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 16f2fd93abc..f4a9be3a877 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 exic", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC66C", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index f61af20cd78..21af33a872d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x7", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC670", "device_version": "1.0.0" }, "features": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 395a056914d..849755a7370 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 ex", "usb": { "vid": "0x444D", - "pid": "0x3435", + "pid": "0xC67B", "device_version": "1.0.0" }, "features": { From ed302c11d3dff2ff477951eba3de4086e1e4e142 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 25 Jul 2023 21:37:59 +0100 Subject: [PATCH 18/32] Update info.json --- keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 849755a7370..83027cfa490 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 ex", "usb": { "vid": "0x444D", - "pid": "0xC67B", + "pid": "0xC67A", "device_version": "1.0.0" }, "features": { From 707b259e53c44494c83ff5681265a9cf7435e451 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 25 Jul 2023 21:50:44 +0100 Subject: [PATCH 19/32] move shared items to parent `info.json` --- .../dactyl_manuform_carbonfet/4x5/info.json | 9 --------- .../dactyl_manuform_carbonfet/4x5_eic/info.json | 9 --------- .../dactyl_manuform_carbonfet/4x6/info.json | 9 --------- .../dactyl_manuform_carbonfet/4x6_eic/info.json | 9 --------- .../dactyl_manuform_carbonfet/4x6_ex/info.json | 9 --------- .../4x6_exic/info.json | 9 --------- .../dactyl_manuform_carbonfet/5x6/info.json | 9 --------- .../dactyl_manuform_carbonfet/5x6_eic/info.json | 9 --------- .../dactyl_manuform_carbonfet/5x6_ex/info.json | 9 --------- .../5x6_exic/info.json | 9 --------- .../dactyl_manuform_carbonfet/6x6/info.json | 9 --------- .../dactyl_manuform_carbonfet/6x6_eic/info.json | 9 --------- .../dactyl_manuform_carbonfet/6x6_ex/info.json | 9 --------- .../6x6_exic/info.json | 9 --------- .../dactyl_manuform_carbonfet/6x7/info.json | 9 --------- .../dactyl_manuform_carbonfet/6x7_ex/info.json | 9 --------- .../dactyl_manuform_carbonfet/info.json | 17 ++++++++++++++--- 17 files changed, 14 insertions(+), 147 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index 044fc180816..cd67e894bbb 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", "usb": { - "vid": "0x444D", "pid": "0xC450", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index a2f017af16e..b42911266bd 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 eic", "usb": { - "vid": "0x444D", "pid": "0xC45B", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index b36da033c4a..b975bebcff9 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6", "usb": { - "vid": "0x444D", "pid": "0xC460", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index 2ff78b3b7b0..ee3c7ec3280 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", "usb": { - "vid": "0x444D", "pid": "0xC46B", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index a9afd9dce50..ae68ca586e5 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 ex", "usb": { - "vid": "0x444D", "pid": "0xC46A", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 8cbccd443e8..0caa5ecfaaf 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", "usb": { - "vid": "0x444D", "pid": "0xC46C", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index 1cc9e7f24e6..c6c4ba27bc9 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6", "usb": { - "vid": "0x444D", "pid": "0xC560", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index 898d44998b9..70aca38a82f 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 eic", "usb": { - "vid": "0x444D", "pid": "0xC56B", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index eceedbfc405..cca373e5c90 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 ex", "usb": { - "vid": "0x444D", "pid": "0xC56A", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index 68046290d72..803f1b66b30 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 exic", "usb": { - "vid": "0x444D", "pid": "0xC56C", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index 74b8b310200..aca290064ae 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6", "usb": { - "vid": "0x444D", "pid": "0xC660", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index bbe98fa1018..20ee7b11c99 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 eic", "usb": { - "vid": "0x444D", "pid": "0xC66B", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index 72914450155..79572a2eb93 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 ex", "usb": { - "vid": "0x444D", "pid": "0xC66A", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index f4a9be3a877..5e0936bb250 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 exic", "usb": { - "vid": "0x444D", "pid": "0xC66C", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index 21af33a872d..e5ede2888ea 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x7", "usb": { - "vid": "0x444D", "pid": "0xC670", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 83027cfa490..87a1067b9a9 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -1,18 +1,9 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 ex", "usb": { - "vid": "0x444D", "pid": "0xC67A", "device_version": "1.0.0" }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": false - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json index e09ae25140c..61139f2961e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -1,9 +1,20 @@ { - "split": { - "enabled" : true - }, "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", + "usb": { + "vid": "0x444D" + }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "split": { + "enabled" : true + }, "tags": ["split"] } From 3e9395a35e6decf5b49294886ac0cc47ccf47ae4 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 14 Aug 2023 10:10:58 +0100 Subject: [PATCH 20/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index fb0e782557f..8b86f4c9361 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -26,6 +26,7 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* | 5 | As *4 row* with number row above | | 6 | As *5 row* with function row above | +### Column | Count | Description | | :---: | :---: | | 5 | A column for each finger with additional column for first finger | From 2994abec02c45fa72364cd195d7a70faa899d92a Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Mon, 4 Sep 2023 15:58:04 +0100 Subject: [PATCH 21/32] info.json changes --- keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/4x5_eic/info.json | 4 ++++ keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/4x6_eic/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/4x6_ex/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/4x6_exic/info.json | 4 ++++ keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/5x6_eic/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/5x6_ex/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/5x6_exic/info.json | 4 ++++ keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/6x6_eic/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/6x6_ex/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/6x6_exic/info.json | 4 ++++ keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json | 4 ++++ .../handwired/dactyl_manuform_carbonfet/6x7_ex/info.json | 4 ++++ keyboards/handwired/dactyl_manuform_carbonfet/info.json | 6 ------ 17 files changed, 64 insertions(+), 6 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index cd67e894bbb..5289752a69c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC450", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index b42911266bd..f96af8b1d15 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 eic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC45B", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index b975bebcff9..a0154b43eab 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC460", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index ee3c7ec3280..d5c0c015684 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC46B", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index ae68ca586e5..57e16a3a618 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 ex", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC46A", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 0caa5ecfaaf..072386dbb38 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC46C", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index c6c4ba27bc9..230a9887d56 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC560", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index 70aca38a82f..558d78e0fe5 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 eic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC56B", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index cca373e5c90..c7a6e5db675 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 ex", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC56A", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index 803f1b66b30..95ecb283770 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 exic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC56C", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index aca290064ae..2453a40ae11 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC660", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index 20ee7b11c99..91787bdf7e1 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 eic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC66B", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index 79572a2eb93..b66cc2e6e45 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 ex", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC66A", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 5e0936bb250..4b8f2128b32 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 exic", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC66C", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index e5ede2888ea..b0503cdb28b 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x7", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC670", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 87a1067b9a9..3381b6c6de2 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -1,6 +1,10 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 ex", + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", "usb": { + "vid": "0x444D", "pid": "0xC67A", "device_version": "1.0.0" }, diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json index 61139f2961e..7a8a804e7fa 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -1,10 +1,4 @@ { - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", - "usb": { - "vid": "0x444D" - }, "features": { "bootmagic": true, "console": false, From 95f8d528be097db5be230e48637f17d932d0dfd0 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 12 Oct 2023 18:38:01 +0100 Subject: [PATCH 22/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 8b86f4c9361..9a07385446f 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -13,7 +13,7 @@ Forked from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform), the *Da *Dactyl ManuForm Carbonfets* are built in variations that cater for different row and column counts. -As standard: +As standard, per half: - The finger keywell bottom row has 2 keys, 1 each in ring and middle columns - The thumb cluster has 6 keys, arranged in a 2 row by 3 column arrangement. From 3a2a113ce82c582c909707de986d8e37f8b4f217 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 2 Dec 2023 15:05:55 +0000 Subject: [PATCH 23/32] change thumb cluster x and y positions --- .../dactyl_manuform_carbonfet/4x5/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/4x5_eic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/4x6/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/4x6_eic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/4x6_ex/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/4x6_exic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/5x6/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/5x6_eic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/5x6_ex/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/5x6_exic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/6x6/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/6x6_eic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/6x6_ex/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/6x6_exic/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/6x7/info.json | 16 ++++++++-------- .../dactyl_manuform_carbonfet/6x7_ex/info.json | 16 ++++++++-------- 16 files changed, 128 insertions(+), 128 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index 5289752a69c..183b9a7c24f 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -66,19 +66,19 @@ {"matrix": [8, 3], "x": 11, "y": 3.1}, {"matrix": [4, 2], "x": 3, "y": 4.1}, - {"matrix": [3, 3], "x": 4, "y": 4.35}, - {"matrix": [3, 4], "x": 5, "y": 4.45}, + {"matrix": [3, 3], "x": 4, "y": 4.2}, + {"matrix": [3, 4], "x": 5, "y": 4.3}, - {"matrix": [8, 0], "x": 7, "y": 4.45}, - {"matrix": [8, 1], "x": 8, "y": 4.35}, + {"matrix": [8, 0], "x": 7, "y": 4.3}, + {"matrix": [8, 1], "x": 8, "y": 4.2}, {"matrix": [9, 2], "x": 9, "y": 4.1}, {"matrix": [4, 1], "x": 3, "y": 5.1}, - {"matrix": [4, 3], "x": 4, "y": 5.6}, - {"matrix": [4, 4], "x": 5, "y": 5.7}, + {"matrix": [4, 3], "x": 4, "y": 5.7}, + {"matrix": [4, 4], "x": 5, "y": 5.8}, - {"matrix": [9, 0], "x": 7, "y": 5.7}, - {"matrix": [9, 1], "x": 8, "y": 5.6}, + {"matrix": [9, 0], "x": 7, "y": 5.8}, + {"matrix": [9, 1], "x": 8, "y": 5.7}, {"matrix": [9, 3], "x": 9, "y": 5.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index f96af8b1d15..4a69952d3c7 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -70,19 +70,19 @@ {"matrix": [8, 4], "x": 11, "y": 3.1}, {"matrix": [4, 2], "x": 3, "y": 4.1}, - {"matrix": [3, 3], "x": 4, "y": 4.35}, - {"matrix": [3, 4], "x": 5, "y": 4.45}, + {"matrix": [3, 3], "x": 4, "y": 4.2}, + {"matrix": [3, 4], "x": 5, "y": 4.3}, - {"matrix": [8, 1], "x": 7, "y": 4.45}, - {"matrix": [8, 2], "x": 8, "y": 4.35}, + {"matrix": [8, 1], "x": 7, "y": 4.3}, + {"matrix": [8, 2], "x": 8, "y": 4.2}, {"matrix": [9, 3], "x": 9, "y": 4.1}, {"matrix": [4, 1], "x": 3, "y": 5.1}, - {"matrix": [4, 3], "x": 4, "y": 5.6}, - {"matrix": [4, 4], "x": 5, "y": 5.7}, + {"matrix": [4, 3], "x": 4, "y": 5.7}, + {"matrix": [4, 4], "x": 5, "y": 5.8}, - {"matrix": [9, 1], "x": 7, "y": 5.7}, - {"matrix": [9, 2], "x": 8, "y": 5.6}, + {"matrix": [9, 1], "x": 7, "y": 5.8}, + {"matrix": [9, 2], "x": 8, "y": 5.7}, {"matrix": [9, 4], "x": 9, "y": 5.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index a0154b43eab..c61a30d62f9 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -72,19 +72,19 @@ {"matrix": [8, 3], "x": 12, "y": 3.1}, {"matrix": [4, 3], "x": 4, "y": 4.1}, - {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.45}, + {"matrix": [3, 4], "x": 5, "y": 4.2}, + {"matrix": [3, 5], "x": 6, "y": 4.3}, - {"matrix": [8, 0], "x": 8, "y": 4.45}, - {"matrix": [8, 1], "x": 9, "y": 4.35}, + {"matrix": [8, 0], "x": 8, "y": 4.3}, + {"matrix": [8, 1], "x": 9, "y": 4.2}, {"matrix": [9, 2], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.7}, + {"matrix": [4, 4], "x": 5, "y": 5.7}, + {"matrix": [4, 5], "x": 6, "y": 5.8}, - {"matrix": [9, 0], "x": 8, "y": 5.7}, - {"matrix": [9, 1], "x": 9, "y": 5.6}, + {"matrix": [9, 0], "x": 8, "y": 5.8}, + {"matrix": [9, 1], "x": 9, "y": 5.7}, {"matrix": [9, 3], "x": 10, "y": 5.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index d5c0c015684..45259d26402 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -76,19 +76,19 @@ {"matrix": [8, 4], "x": 12, "y": 3.1}, {"matrix": [4, 3], "x": 4, "y": 4.1}, - {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.45}, + {"matrix": [3, 4], "x": 5, "y": 4.2}, + {"matrix": [3, 5], "x": 6, "y": 4.3}, - {"matrix": [8, 1], "x": 8, "y": 4.45}, - {"matrix": [8, 2], "x": 9, "y": 4.35}, + {"matrix": [8, 1], "x": 8, "y": 4.3}, + {"matrix": [8, 2], "x": 9, "y": 4.2}, {"matrix": [9, 3], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.7}, + {"matrix": [4, 4], "x": 5, "y": 5.7}, + {"matrix": [4, 5], "x": 6, "y": 5.8}, - {"matrix": [9, 1], "x": 8, "y": 5.7}, - {"matrix": [9, 2], "x": 9, "y": 5.6}, + {"matrix": [9, 1], "x": 8, "y": 5.8}, + {"matrix": [9, 2], "x": 9, "y": 5.7}, {"matrix": [9, 4], "x": 10, "y": 5.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index 57e16a3a618..ec2836d3328 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -76,19 +76,19 @@ {"matrix": [8, 5], "x": 14, "y": 3.6}, {"matrix": [4, 3], "x": 4, "y": 4.1}, - {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.45}, + {"matrix": [3, 4], "x": 5, "y": 4.2}, + {"matrix": [3, 5], "x": 6, "y": 4.3}, - {"matrix": [8, 0], "x": 8, "y": 4.45}, - {"matrix": [8, 1], "x": 9, "y": 4.35}, + {"matrix": [8, 0], "x": 8, "y": 4.3}, + {"matrix": [8, 1], "x": 9, "y": 4.2}, {"matrix": [9, 2], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.7}, + {"matrix": [4, 4], "x": 5, "y": 5.7}, + {"matrix": [4, 5], "x": 6, "y": 5.8}, - {"matrix": [9, 0], "x": 8, "y": 5.7}, - {"matrix": [9, 1], "x": 9, "y": 5.6}, + {"matrix": [9, 0], "x": 8, "y": 5.8}, + {"matrix": [9, 1], "x": 9, "y": 5.7}, {"matrix": [9, 3], "x": 10, "y": 5.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 072386dbb38..97a829cfaed 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -80,19 +80,19 @@ {"matrix": [8, 6], "x": 14, "y": 3.6}, {"matrix": [4, 3], "x": 4, "y": 4.1}, - {"matrix": [3, 4], "x": 5, "y": 4.35}, - {"matrix": [3, 5], "x": 6, "y": 4.45}, + {"matrix": [3, 4], "x": 5, "y": 4.2}, + {"matrix": [3, 5], "x": 6, "y": 4.3}, - {"matrix": [8, 1], "x": 8, "y": 4.45}, - {"matrix": [8, 2], "x": 9, "y": 4.35}, + {"matrix": [8, 1], "x": 8, "y": 4.3}, + {"matrix": [8, 2], "x": 9, "y": 4.2}, {"matrix": [9, 3], "x": 10, "y": 4.1}, {"matrix": [4, 2], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.6}, - {"matrix": [4, 5], "x": 6, "y": 5.7}, + {"matrix": [4, 4], "x": 5, "y": 5.7}, + {"matrix": [4, 5], "x": 6, "y": 5.8}, - {"matrix": [9, 1], "x": 8, "y": 5.7}, - {"matrix": [9, 2], "x": 9, "y": 5.6}, + {"matrix": [9, 1], "x": 8, "y": 5.8}, + {"matrix": [9, 2], "x": 9, "y": 5.7}, {"matrix": [9, 4], "x": 10, "y": 5.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index 230a9887d56..cb31c3b8029 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -86,19 +86,19 @@ {"matrix": [10, 3], "x": 12, "y": 4.1}, {"matrix": [5, 3], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.45}, + {"matrix": [4, 4], "x": 5, "y": 5.2}, + {"matrix": [4, 5], "x": 6, "y": 5.3}, - {"matrix": [10, 0], "x": 8, "y": 5.45}, - {"matrix": [10, 1], "x": 9, "y": 5.35}, + {"matrix": [10, 0], "x": 8, "y": 5.3}, + {"matrix": [10, 1], "x": 9, "y": 5.2}, {"matrix": [11, 2], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.7}, + {"matrix": [5, 4], "x": 5, "y": 6.7}, + {"matrix": [5, 5], "x": 6, "y": 6.8}, - {"matrix": [11, 0], "x": 8, "y": 6.7}, - {"matrix": [11, 1], "x": 9, "y": 6.6}, + {"matrix": [11, 0], "x": 8, "y": 6.8}, + {"matrix": [11, 1], "x": 9, "y": 6.7}, {"matrix": [11, 3], "x": 10, "y": 6.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index 558d78e0fe5..a24bda851d2 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -92,19 +92,19 @@ {"matrix": [10, 4], "x": 12, "y": 4.1}, {"matrix": [5, 3], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.45}, + {"matrix": [4, 4], "x": 5, "y": 5.2}, + {"matrix": [4, 5], "x": 6, "y": 5.3}, - {"matrix": [10, 1], "x": 8, "y": 5.45}, - {"matrix": [10, 2], "x": 9, "y": 5.35}, + {"matrix": [10, 1], "x": 8, "y": 5.3}, + {"matrix": [10, 2], "x": 9, "y": 5.2}, {"matrix": [11, 3], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.7}, + {"matrix": [5, 4], "x": 5, "y": 6.7}, + {"matrix": [5, 5], "x": 6, "y": 6.8}, - {"matrix": [11, 1], "x": 8, "y": 6.7}, - {"matrix": [11, 2], "x": 9, "y": 6.6}, + {"matrix": [11, 1], "x": 8, "y": 6.8}, + {"matrix": [11, 2], "x": 9, "y": 6.7}, {"matrix": [11, 4], "x": 10, "y": 6.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index c7a6e5db675..c2be455410e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -90,19 +90,19 @@ {"matrix": [10, 5], "x": 14, "y": 4.6}, {"matrix": [5, 3], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.45}, + {"matrix": [4, 4], "x": 5, "y": 5.2}, + {"matrix": [4, 5], "x": 6, "y": 5.3}, - {"matrix": [10, 0], "x": 8, "y": 5.45}, - {"matrix": [10, 1], "x": 9, "y": 5.35}, + {"matrix": [10, 0], "x": 8, "y": 5.3}, + {"matrix": [10, 1], "x": 9, "y": 5.2}, {"matrix": [11, 2], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.7}, + {"matrix": [5, 4], "x": 5, "y": 6.7}, + {"matrix": [5, 5], "x": 6, "y": 6.8}, - {"matrix": [11, 0], "x": 8, "y": 6.7}, - {"matrix": [11, 1], "x": 9, "y": 6.6}, + {"matrix": [11, 0], "x": 8, "y": 6.8}, + {"matrix": [11, 1], "x": 9, "y": 6.7}, {"matrix": [11, 3], "x": 10, "y": 6.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index 95ecb283770..a4a4468e4bc 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -96,19 +96,19 @@ {"matrix": [10, 6], "x": 14, "y": 4.6}, {"matrix": [5, 3], "x": 4, "y": 5.1}, - {"matrix": [4, 4], "x": 5, "y": 5.35}, - {"matrix": [4, 5], "x": 6, "y": 5.45}, + {"matrix": [4, 4], "x": 5, "y": 5.2}, + {"matrix": [4, 5], "x": 6, "y": 5.3}, - {"matrix": [10, 1], "x": 8, "y": 5.45}, - {"matrix": [10, 2], "x": 9, "y": 5.35}, + {"matrix": [10, 1], "x": 8, "y": 5.3}, + {"matrix": [10, 2], "x": 9, "y": 5.2}, {"matrix": [11, 3], "x": 10, "y": 5.1}, {"matrix": [5, 2], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.6}, - {"matrix": [5, 5], "x": 6, "y": 6.7}, + {"matrix": [5, 4], "x": 5, "y": 6.7}, + {"matrix": [5, 5], "x": 6, "y": 6.8}, - {"matrix": [11, 1], "x": 8, "y": 6.7}, - {"matrix": [11, 2], "x": 9, "y": 6.6}, + {"matrix": [11, 1], "x": 8, "y": 6.8}, + {"matrix": [11, 2], "x": 9, "y": 6.7}, {"matrix": [11, 4], "x": 10, "y": 6.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index 2453a40ae11..16f60a01c6a 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -100,19 +100,19 @@ {"matrix": [12, 3], "x": 12, "y": 5.1}, {"matrix": [6, 3], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.45}, + {"matrix": [5, 4], "x": 5, "y": 6.2}, + {"matrix": [5, 5], "x": 6, "y": 6.3}, - {"matrix": [12, 0], "x": 8, "y": 6.45}, - {"matrix": [12, 1], "x": 9, "y": 6.35}, + {"matrix": [12, 0], "x": 8, "y": 6.3}, + {"matrix": [12, 1], "x": 9, "y": 6.2}, {"matrix": [13, 2], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, - {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.7}, + {"matrix": [6, 4], "x": 5, "y": 7.7}, + {"matrix": [6, 5], "x": 6, "y": 7.8}, - {"matrix": [13, 0], "x": 8, "y": 7.7}, - {"matrix": [13, 1], "x": 9, "y": 7.6}, + {"matrix": [13, 0], "x": 8, "y": 7.8}, + {"matrix": [13, 1], "x": 9, "y": 7.7}, {"matrix": [13, 3], "x": 10, "y": 7.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index 91787bdf7e1..bcd49f778e6 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -108,19 +108,19 @@ {"matrix": [12, 4], "x": 12, "y": 5.1}, {"matrix": [6, 3], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.45}, + {"matrix": [5, 4], "x": 5, "y": 6.2}, + {"matrix": [5, 5], "x": 6, "y": 6.3}, - {"matrix": [12, 1], "x": 8, "y": 6.45}, - {"matrix": [12, 2], "x": 9, "y": 6.35}, + {"matrix": [12, 1], "x": 8, "y": 6.3}, + {"matrix": [12, 2], "x": 9, "y": 6.2}, {"matrix": [13, 3], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, - {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.7}, + {"matrix": [6, 4], "x": 5, "y": 7.7}, + {"matrix": [6, 5], "x": 6, "y": 7.8}, - {"matrix": [13, 1], "x": 8, "y": 7.7}, - {"matrix": [13, 2], "x": 9, "y": 7.6}, + {"matrix": [13, 1], "x": 8, "y": 7.8}, + {"matrix": [13, 2], "x": 9, "y": 7.7}, {"matrix": [13, 4], "x": 10, "y": 7.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index b66cc2e6e45..49f2c1d325c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -104,19 +104,19 @@ {"matrix": [12, 5], "x": 14, "y": 5.6}, {"matrix": [6, 3], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.45}, + {"matrix": [5, 4], "x": 5, "y": 6.2}, + {"matrix": [5, 5], "x": 6, "y": 6.3}, - {"matrix": [12, 0], "x": 8, "y": 6.45}, - {"matrix": [12, 1], "x": 9, "y": 6.35}, + {"matrix": [12, 0], "x": 8, "y": 6.3}, + {"matrix": [12, 1], "x": 9, "y": 6.2}, {"matrix": [13, 2], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, - {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.7}, + {"matrix": [6, 4], "x": 5, "y": 7.7}, + {"matrix": [6, 5], "x": 6, "y": 7.8}, - {"matrix": [13, 0], "x": 8, "y": 7.7}, - {"matrix": [13, 1], "x": 9, "y": 7.5}, + {"matrix": [13, 0], "x": 8, "y": 7.8}, + {"matrix": [13, 1], "x": 9, "y": 7.7}, {"matrix": [13, 3], "x": 10, "y": 7.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 4b8f2128b32..03287c226c3 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -112,19 +112,19 @@ {"matrix": [12, 6], "x": 14, "y": 5.6}, {"matrix": [6, 3], "x": 4, "y": 6.1}, - {"matrix": [5, 4], "x": 5, "y": 6.35}, - {"matrix": [5, 5], "x": 6, "y": 6.45}, + {"matrix": [5, 4], "x": 5, "y": 6.2}, + {"matrix": [5, 5], "x": 6, "y": 6.3}, - {"matrix": [12, 1], "x": 8, "y": 6.45}, - {"matrix": [12, 2], "x": 9, "y": 6.35}, + {"matrix": [12, 1], "x": 8, "y": 6.3}, + {"matrix": [12, 2], "x": 9, "y": 6.2}, {"matrix": [13, 3], "x": 10, "y": 6.1}, {"matrix": [6, 2], "x": 4, "y": 7.1}, - {"matrix": [6, 4], "x": 5, "y": 7.6}, - {"matrix": [6, 5], "x": 6, "y": 7.7}, + {"matrix": [6, 4], "x": 5, "y": 7.7}, + {"matrix": [6, 5], "x": 6, "y": 7.8}, - {"matrix": [13, 1], "x": 8, "y": 7.7}, - {"matrix": [13, 2], "x": 9, "y": 7.6}, + {"matrix": [13, 1], "x": 8, "y": 7.8}, + {"matrix": [13, 2], "x": 9, "y": 7.7}, {"matrix": [13, 4], "x": 10, "y": 7.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index b0503cdb28b..9dfb60f50b1 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -110,19 +110,19 @@ {"matrix": [12, 3], "x": 13, "y": 5.1}, {"matrix": [6, 4], "x": 5, "y": 6.1}, - {"matrix": [5, 5], "x": 6, "y": 6.35}, - {"matrix": [5, 6], "x": 7, "y": 6.45}, + {"matrix": [5, 5], "x": 6, "y": 6.2}, + {"matrix": [5, 6], "x": 7, "y": 6.3}, - {"matrix": [12, 0], "x": 9, "y": 6.45}, - {"matrix": [12, 1], "x": 10, "y": 6.35}, + {"matrix": [12, 0], "x": 9, "y": 6.3}, + {"matrix": [12, 1], "x": 10, "y": 6.2}, {"matrix": [13, 2], "x": 11, "y": 6.1}, {"matrix": [6, 3], "x": 5, "y": 7.1}, - {"matrix": [6, 5], "x": 6, "y": 7.6}, - {"matrix": [6, 6], "x": 7, "y": 7.7}, + {"matrix": [6, 5], "x": 6, "y": 7.7}, + {"matrix": [6, 6], "x": 7, "y": 7.8}, - {"matrix": [13, 0], "x": 9, "y": 7.7}, - {"matrix": [13, 1], "x": 10, "y": 7.6}, + {"matrix": [13, 0], "x": 9, "y": 7.8}, + {"matrix": [13, 1], "x": 10, "y": 7.7}, {"matrix": [13, 3], "x": 11, "y": 7.1} ] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 3381b6c6de2..765ac4e765e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -116,19 +116,19 @@ {"matrix": [12, 6], "x": 16, "y": 5.6}, {"matrix": [6, 4], "x": 5, "y": 6.1}, - {"matrix": [5, 5], "x": 6, "y": 6.35}, - {"matrix": [5, 6], "x": 7, "y": 6.45}, + {"matrix": [5, 5], "x": 6, "y": 6.2}, + {"matrix": [5, 6], "x": 7, "y": 6.3}, - {"matrix": [12, 0], "x": 9, "y": 6.45}, - {"matrix": [12, 1], "x": 10, "y": 6.35}, + {"matrix": [12, 0], "x": 9, "y": 6.3}, + {"matrix": [12, 1], "x": 10, "y": 6.2}, {"matrix": [13, 2], "x": 11, "y": 6.1}, {"matrix": [6, 3], "x": 5, "y": 7.1}, - {"matrix": [6, 5], "x": 6, "y": 7.6}, - {"matrix": [6, 6], "x": 7, "y": 7.7}, + {"matrix": [6, 5], "x": 6, "y": 7.7}, + {"matrix": [6, 6], "x": 7, "y": 7.8}, - {"matrix": [13, 0], "x": 9, "y": 7.7}, - {"matrix": [13, 1], "x": 10, "y": 7.6}, + {"matrix": [13, 0], "x": 9, "y": 7.8}, + {"matrix": [13, 1], "x": 10, "y": 7.7}, {"matrix": [13, 3], "x": 11, "y": 7.1} ] } From f4741e3fb76c497e380f2615abe88769e9db43df Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 23 Apr 2024 11:58:32 +0100 Subject: [PATCH 24/32] adjustments to info.json --- .../dactyl_manuform_carbonfet/4x5/info.json | 9 +++++++++ .../dactyl_manuform_carbonfet/4x5_eic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/4x6/info.json | 9 +++++++++ .../dactyl_manuform_carbonfet/4x6_eic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/4x6_ex/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/4x6_exic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/5x6/info.json | 9 +++++++++ .../dactyl_manuform_carbonfet/5x6_eic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/5x6_ex/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/5x6_exic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/6x6/info.json | 9 +++++++++ .../dactyl_manuform_carbonfet/6x6_eic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/6x6_ex/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/6x6_exic/info.json | 11 ++++++++++- .../dactyl_manuform_carbonfet/6x7/info.json | 9 +++++++++ .../dactyl_manuform_carbonfet/6x7_ex/info.json | 11 ++++++++++- .../handwired/dactyl_manuform_carbonfet/info.json | 13 +------------ .../handwired/dactyl_manuform_carbonfet/readme.md | 4 ++-- 18 files changed, 158 insertions(+), 25 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json index 183b9a7c24f..d836a1e940f 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json index 4a69952d3c7..f10ab19dd65 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 eic", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 EIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json index c61a30d62f9..c68a7f7954c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json index 45259d26402..df50e04fe11 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 eic", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 EIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json index ec2836d3328..ffb425223da 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 ex", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 EX", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json index 97a829cfaed..821f9c57f16 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 exic", + "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 EXIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json index cb31c3b8029..259cd835679 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json index a24bda851d2..d770713f36b 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 eic", + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 EIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json index c2be455410e..a20b05ba36a 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 ex", + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 EX", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json index a4a4468e4bc..3425e2e85c3 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 exic", + "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 EXIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -17,8 +17,17 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json index 16f60a01c6a..3dd2013caa5 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json @@ -14,11 +14,20 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json index bcd49f778e6..84e7bfee429 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 eic", + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 EIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -14,11 +14,20 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json index 49f2c1d325c..ab1efd6d2b5 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 ex", + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 EX", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -14,11 +14,20 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json index 03287c226c3..45efec2aba2 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 exic", + "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 EXIC", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -14,11 +14,20 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json index 9dfb60f50b1..0bebc1f9d48 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json @@ -14,11 +14,20 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json index 765ac4e765e..2497547887c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 ex", + "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 EX", "manufacturer": "carbonfet", "url": "https://github.com/carbonfet/dactyl-manuform", "maintainer": "dunk2k", @@ -14,11 +14,20 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "console": false, + "command": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "development_board": "promicro", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json index 7a8a804e7fa..1a2b2e2ea00 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -1,14 +1,3 @@ { - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "split": { - "enabled" : true - }, - "tags": ["split"] + "tags": ["dactyl_manuform", "split"] } diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 9a07385446f..c3995e8d74c 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -1,12 +1,12 @@ # Dactyl ManuForm Carbonfet -![GlamShot](https://i.imgur.com/0ugz1C9h.jpg) +![TopView](https://i.imgur.com/0ugz1C9h.jpg) *Dactyl Manuform Carbonfet 5x6* Forked from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform), the *Dactyl ManuForm Carbonfet* reshapes the former's thumb key cluster from a 3 row, 2 column arrangement to a 2 row, 3 column arrangement. * Keyboard Maintainer: [Carbonfet](https://github.com/carbonfet) -* Hardware Supported: Pro Micro, or clone of +* Hardware Supported: Pro Micro development board * Hardware Availability: [Github](https://github.com/carbonfet/dactyl-manuform) ## Variants From f7652cd0322add777dd1845624550f45a413d0c2 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 23 Apr 2024 12:01:14 +0100 Subject: [PATCH 25/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index c3995e8d74c..85605239289 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -31,7 +31,7 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* | :---: | :---: | | 5 | A column for each finger with additional column for first finger | | 6 | As *5 column* with additional pinky finger column | -| 7 | As *6 column* with additional pinky column | +| 7 | As *6 column* with additional pinky finger column | ### Alteration | Code | Description | Diagram
*(4x6 example)* | From ce977f0e40ee3fe86a898c490baa085623b201b9 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 23 Apr 2024 15:10:59 +0100 Subject: [PATCH 26/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 85605239289..190c43da02b 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -11,7 +11,7 @@ Forked from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform), the *Da ## Variants -*Dactyl ManuForm Carbonfets* are built in variations that cater for different row and column counts. +*Dactyl ManuForm Carbonfets* are built in variations that cater for different row and column counts, i.e. there is no default. As standard, per half: - The finger keywell bottom row has 2 keys, 1 each in ring and middle columns From 5afca9816dc3f7dc9fcf838b95363147f8524d1b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 30 May 2024 19:30:15 +0100 Subject: [PATCH 27/32] info.json/rules.mk to keyboard.json --- .../dactyl_manuform_carbonfet/4x5/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk | 1 - .../4x5_eic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk | 1 - .../dactyl_manuform_carbonfet/4x6/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk | 1 - .../4x6_eic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk | 1 - .../4x6_ex/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk | 1 - .../4x6_exic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk | 1 - .../dactyl_manuform_carbonfet/5x6/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk | 1 - .../5x6_eic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk | 1 - .../5x6_ex/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk | 1 - .../5x6_exic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk | 1 - .../dactyl_manuform_carbonfet/6x6/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk | 1 - .../6x6_eic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk | 1 - .../6x6_ex/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk | 1 - .../6x6_exic/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk | 1 - .../dactyl_manuform_carbonfet/6x7/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk | 1 - .../6x7_ex/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk | 1 - 32 files changed, 16 deletions(-) rename keyboards/handwired/dactyl_manuform_carbonfet/4x5/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/4x6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/5x6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/6x6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/6x7/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk rename keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/4x5/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/4x5/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/4x6/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/4x6/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/5x6/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/5x6/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/6x6/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/6x6/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/6x7/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/6x7/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/info.json rename to keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk deleted file mode 100644 index 98861888b8f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionlly blank From 18b1c593c99be97733edaa1a81c25fad3b9aa925 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 25 Aug 2024 14:43:24 +0100 Subject: [PATCH 28/32] remove VIA --- .../4x5/keymaps/via/keymap.c | 72 ------------------ .../4x5/keymaps/via/rules.mk | 1 - .../4x5_eic/keymaps/via/keymap.c | 76 ------------------- .../4x5_eic/keymaps/via/rules.mk | 1 - .../4x6/keymaps/via/keymap.c | 56 -------------- .../4x6/keymaps/via/rules.mk | 1 - .../4x6_eic/keymaps/via/keymap.c | 43 ----------- .../4x6_eic/keymaps/via/rules.mk | 1 - .../4x6_ex/keymaps/via/keymap.c | 58 -------------- .../4x6_ex/keymaps/via/rules.mk | 1 - .../4x6_exic/keymaps/via/keymap.c | 43 ----------- .../4x6_exic/keymaps/via/rules.mk | 1 - .../5x6/keymaps/via/fules.mk | 1 - .../5x6/keymaps/via/keymap.c | 60 --------------- .../5x6_eic/keymaps/via/keymap.c | 58 -------------- .../5x6_eic/keymaps/via/rules.mk | 1 - .../5x6_ex/keymaps/via/keymap.c | 46 ----------- .../5x6_ex/keymaps/via/rules.mk | 1 - .../5x6_exic/keymaps/via/keymap.c | 49 ------------ .../5x6_exic/keymaps/via/rules.mk | 1 - .../6x6/keymaps/via/keymap.c | 49 ------------ .../6x6/keymaps/via/rules.mk | 1 - .../6x6_eic/keymaps/via/keymap.c | 54 ------------- .../6x6_eic/keymaps/via/rules.mk | 1 - .../6x6_ex/keymaps/via/keymap.c | 51 ------------- .../6x6_ex/keymaps/via/rules.mk | 1 - .../6x6_exic/keymaps/via/keymap.c | 53 ------------- .../6x6_exic/keymaps/via/rules.mk | 1 - .../6x7/keymaps/via/keymap.c | 47 ------------ .../6x7/keymaps/via/rules.mk | 1 - .../6x7_ex/keymaps/via/keymap.c | 48 ------------ .../6x7_ex/keymaps/via/rules.mk | 1 - 32 files changed, 879 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c deleted file mode 100644 index bce5c3d3302..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/keymap.c +++ /dev/null @@ -1,72 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - _RAISE, - _LOWER -}; - -#define SFT_ESC SFT_T(KC_ESC) -#define CTL_BSPC CTL_T(KC_BSPC) -#define ALT_SPC ALT_T(KC_SPC) -#define SFT_ENT SFT_T(KC_ENT) - -#define KC_ML KC_MS_LEFT -#define KC_MR KC_MS_RIGHT -#define KC_MU KC_MS_UP -#define KC_MD KC_MS_DOWN -#define KC_MB1 KC_MS_BTN1 -#define KC_MB2 KC_MS_BTN2 - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - 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_QUOT, - KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, - SFT_ESC, CTL_BSPC, KC_HOME, KC_END, ALT_SPC, SFT_ENT, - KC_TAB, RAISE, KC_GRV, KC_LGUI, LOWER, KC_DEL - - ), - - [_RAISE] = LAYOUT( - _______, _______, KC_MU, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, - _______, KC_ML, KC_MD, KC_MR, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, - _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, - _______, _______, KC_MB1, KC_MB2, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ), - - [_LOWER] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, - KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c deleted file mode 100644 index bf0bc226fc5..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/keymap.c +++ /dev/null @@ -1,76 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - _RAISE, - _LOWER -}; - -#define SFT_ESC SFT_T(KC_ESC) -#define CTL_BSPC CTL_T(KC_BSPC) -#define ALT_SPC ALT_T(KC_SPC) -#define SFT_ENT SFT_T(KC_ENT) - -#define KC_ML KC_MS_LEFT -#define KC_MR KC_MS_RIGHT -#define KC_MU KC_MS_UP -#define KC_MD KC_MS_DOWN -#define KC_MB1 KC_MS_BTN1 -#define KC_MB2 KC_MS_BTN2 - -#define APP_X A(KC_F4) -#define DKMGR G(KC_TAB) -#define APP_P LSA(KC_TAB) -#define APP_N A(KC_TAB) - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, APP_X, DKMGR, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_A, KC_S, KC_D, KC_F, KC_G, APP_P, APP_N, 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_QUOT, - KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, - SFT_ESC, CTL_BSPC, KC_HOME, KC_END, ALT_SPC, SFT_ENT, - KC_GRV, RAISE, KC_TAB, KC_DEL, LOWER, KC_LGUI - ), - - [_RAISE] = LAYOUT( - _______, _______, KC_MU, _______, _______, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, - _______, KC_ML, KC_MD, KC_MR, _______, _______, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, - _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, - _______, _______, KC_MB1, KC_MB2, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ), - - [_LOWER] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, - KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c deleted file mode 100644 index cc372e62f69..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2023 Duncan Sutherland (@dunk2k) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - _RAISE, - _LOWER -}; - -#define SFT_ESC SFT_T(KC_ESC) -#define CTL_BSPC CTL_T(KC_BSPC) -#define ALT_SPC ALT_T(KC_SPC) -#define SFT_ENT SFT_T(KC_ENT) - -#define KC_ML KC_MS_LEFT -#define KC_MR KC_MS_RIGHT -#define KC_MU KC_MS_UP -#define KC_MD KC_MS_DOWN -#define KC_MB1 KC_MS_BTN1 -#define KC_MB2 KC_MS_BTN1 - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_BASE] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, - KC_TAB, 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_BSLS, - KC_LBRC, KC_RBRC, KC_PLUS, KC_EQL, - RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, - KC_TAB, KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, KC_DEL - - ), - - [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, - _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, - _______, KC_PSCR, _______, KC_P0, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ), - - [_RAISE] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, - _______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, KC_EQL, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c deleted file mode 100644 index 4d6caeac6e1..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/keymap.c +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2023 Duncan Sutherland (@dunk2k) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum layers { - _QWERTY, - _FN, - _NUMPAD -}; - -#define C_HOME LCTL_T(KC_HOME) -#define C_PGUP RCTL_T(KC_PGUP) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, G(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), - KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, - TT(_FN), KC_SPC, C_HOME, C_PGUP, KC_BSPC, KC_ENT, - KC_LGUI, KC_LALT, KC_END, KC_PGDN, KC_RALT, KC_RGUI - ), - - [_FN] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, - KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, - _______, _______, _______, _______, KC_DEL, KC_INS, - _______, _______, _______, _______, KC_PAUS, KC_PSCR - ), - - [_NUMPAD] = LAYOUT( - - _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, - _______, _______, _______, _______, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______, - _______, _______, KC_P0, KC_PDOT, - _______, _______, _______, _______, _______, KC_PENT, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c deleted file mode 100644 index df118bffd97..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/keymap.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -enum layer_number { - _BASE, - _LOWER, - _RAISE -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_TAB, 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_LCTL, KC_LALT, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, - RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER, - KC_BSPC, KC_CAPS, KC_GRV, KC_LGUI, KC_APP, KC_DEL - - ), - - [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, - _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, - _______, _______, _______, KC_PSCR, _______, KC_P0, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ), - - [_RAISE] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, KC_EQL, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c deleted file mode 100644 index 34bc47cf97c..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/keymap.c +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2023 Duncan Sutherland (@dunk2k) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum layers{ - _QWERTY, - _FN, - _NUMPAD -}; - -#define LT1_BSPC LT(_FN, KC_BSPC) -#define OSM_CS OSM(MOD_LSFT | MOD_LCTL) -#define OSM_CA OSM(MOD_LCTL | MOD_LALT) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, G(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), - KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_RALT, KC_RCTL, - LT1_BSPC, KC_SPC, KC_HOME, KC_PGUP, KC_ENT, KC_DEL, - OSM_CS, KC_LGUI, KC_END, KC_PGDN, KC_RGUI, OSM_CA - ), - - [_FN] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, LSA(KC_TAB), A(KC_TAB), KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - KC_EXLM, KC_AT, KC_HASH, KC_DLR ,KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, - _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, _______, _______, - _______, _______, _______, _______, _______, KC_INS, - _______, _______, _______, _______, KC_PAUS, KC_PSCR - ), - - [_NUMPAD] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, - _______, _______, _______, _______, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______, - _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, - _______, _______, _______, _______, _______, KC_PENT, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/fules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c deleted file mode 100644 index 8b8e09188ef..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keymaps/via/keymap.c +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2019 Tom Short - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -enum layers { - _QWERTY, - _LOWER, - _RAISE -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, - KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, - KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, - KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, - KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, - RAISE, KC_SPC, KC_HOME, KC_END, KC_ENT, LOWER , - KC_TAB, KC_BSPC, KC_GRV, KC_LGUI, KC_LALT,KC_DEL - - ), - - [_LOWER] = LAYOUT( - KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, - _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, - _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, - _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, - _______,KC_PSCR, _______, KC_P0, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, - _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, - _______,_______, KC_EQL ,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c deleted file mode 100644 index f636266685f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/keymap.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2019 Tom Short -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -enum layers{ - _QWERTY, - _FN, - _NUMPAD -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, A(KC_TAB), TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), - KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, - TT(_FN), KC_SPC, KC_HOME, KC_PGUP, KC_BSPC, KC_ENT, - KC_LALT, KC_LGUI, KC_END, KC_PGDN, KC_RCTL, KC_RALT - ), - - [_FN] = LAYOUT( - _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, - _______, _______, _______, _______, KC_DEL, _______, - _______, _______, _______, _______, KC_PSCR, KC_PAUS - ), - - [_NUMPAD] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, - _______, _______, KC_P0, KC_PDOT, - _______, _______, _______, _______, _______, KC_PENT, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c deleted file mode 100644 index b7fad440155..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2023 Kostas Pagratis (@kpagratis) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum custom_layers { - _QWERTY, - _LOWER, - _RAISE -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_LCTL, KC_LALT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_RALT, KC_RCTL, - RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, - KC_HOME, KC_PGUP, KC_LGUI, KC_RGUI, KC_PGDN, KC_END - ), - - [_LOWER] = LAYOUT( - KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, - _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,_______, - _______,_______, KC_INS,KC_PAUS,KC_PSCR,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,_______,_______, - _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,_______,_______, - _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - - ), - - [_RAISE] = 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_TRNS, KC_TRNS,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE, - _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_TRNS, KC_TRNS,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, - _______,_______,_______,_______, _______,_______,_______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c deleted file mode 100644 index 0cbf55d5828..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/keymap.c +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2023 Duncan Sutherland (@dunk2k) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum layers{ - _QWERTY, - _FN, - _NUMPAD -}; - -// Some basic macros -#define TASK LCTL(LSFT(KC_ESC)) -#define TAB_R LCTL(KC_TAB) -#define TAB_L LCTL(LSFT(KC_TAB)) -#define TAB_RO LCTL(LSFT(KC_T)) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, TAB_RO, TG(_NUMPAD), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), - KC_CAPS, KC_LGUI, TAB_L, TAB_R, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, - TT(_FN), KC_SPC, KC_HOME, KC_PGUP, KC_BSPC, KC_ENT, - KC_PSCR, TASK, KC_END, KC_PGDN, KC_LCTL, KC_LALT - - ), - - [_FN] = LAYOUT( - _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, - _______, _______, _______, _______, KC_DEL, _______, - _______, _______, _______, _______, _______, _______ - ), - - [_NUMPAD] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, - _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, - _______, _______, _______, _______, _______, KC_PENT, - _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c deleted file mode 100644 index 5d04491d0ff..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/keymap.c +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2021 david@impstyle.com (@zwnk) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum custom_layers { - _QWERTY, - _LOWER, - _RAISE, -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - 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_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, - KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS, - KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, - KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, - KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, - RAISE ,KC_SPC , KC_HOME, KC_END, KC_ENT, LOWER, - KC_TAB,KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, KC_DEL - - ), - - [_LOWER] = LAYOUT( - 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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, - _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, - _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, - _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, - _______,KC_PSCR, _______, KC_P0, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, - _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, - _______,_______, KC_EQL ,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c deleted file mode 100644 index 3619d047ef6..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/keymap.c +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2012 Jun Wako -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum custom_layers { - _QWERTY, - _LOWER, - _RAISE, -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) -#define LS_CAPS LSFT_T(KC_CAPS) -#define RS_QUOT RSFT_T(KC_QUOT) -#define APP_N A(KC_TAB) -#define APP_P LSA(KC_TAB) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, APP_P, APP_N, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - LS_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RS_QUOT, - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, - KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, - RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, - KC_LALT, KC_LGUI, KC_HOME, KC_END, KC_RGUI, KC_RALT - - ), - - [_LOWER] = LAYOUT( - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, - _______,_______,KC_EXLM,KC_AT, KC_HASH, KC_DLR,_______, _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______, - _______,_______,_______,_______,KC_PGUP,_______,_______, _______,KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, - _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______, _______,KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, - _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, - _______,_______, KC_P0, KC_PDOT, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = LAYOUT( - KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,KC_F18,_______, _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,KC_VOLU,_______,_______, _______,_______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,KC_MUTE,_______,_______, _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______, - _______,_______,_______,_______,KC_VOLD,_______, _______,_______,_______,_______,_______,_______, - _______,_______, _______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c deleted file mode 100644 index c3ffe60f663..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/keymap.c +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2012 Jun Wako -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum custom_layers { - _QWERTY, - _LOWER, - _RAISE, -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) -#define APP_P A(KC_TAB) -#define APP_N LSA(KC_TAB) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - 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_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, - KC_LALT, APP_P, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, APP_N, KC_RALT, - RAISE, KC_SPC, KC_LSFT, KC_RSFT, KC_ENT, LOWER, - KC_HOME, KC_BSPC,KC_LGUI, KC_RGUI, KC_DEL, KC_END - ), - - [_LOWER] = LAYOUT( - 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_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, - _______,_______,_______,_______,KC_PGUP,_______, KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, - _______,KC_SCRL,KC_INS, KC_PAUS,KC_PSCR,_______, KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, - _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, - _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = 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_VOLU,KC_LBRC, KC_RBRC,_______,_______,_______,_______,_______, - _______,_______,_______,_______,KC_MUTE,KC_LPRN, KC_RPRN,KC_MNXT,KC_MPRV,KC_MPLY,_______,_______, - _______,_______,_______,_______,KC_VOLD,KC_LCBR, KC_RCBR,_______,_______,_______,_______,_______, - _______,_______,_______,_______, _______,_______,_______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c deleted file mode 100644 index bfd63b0e737..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2012 Jun Wako -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum custom_layers { - _QWERTY, - _LOWER, - _RAISE, -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) -#define APP_P A(KC_TAB) -#define APP_N LSA(KC_TAB) -#define DKMGR G(KC_TAB) -#define TKMGR RCS(KC_ESC) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, DKMGR, TKMGR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_ESC, KC_1, KC_2, KC_3, KC_6, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, 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_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, - KC_LALT, APP_P, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, APP_N, KC_RALT, - RAISE, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, LOWER, - KC_LGUI, KC_LSFT, KC_HOME, KC_END, KC_RSFT, KC_RGUI - ), - - [_LOWER] = LAYOUT( - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, - _______,_______,KC_EXLM,KC_AT, KC_HASH, KC_DLR,_______, _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______, - _______,_______,_______,_______,KC_PGUP,_______,_______, _______,KC_NUM, KC_P7, KC_P8, KC_P9, KC_PMNS,_______, - _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______, _______,KC_PAST,KC_P4, KC_P5, KC_P6, KC_PPLS,_______, - _______,_______,_______,_______,KC_PGDN,_______, KC_PSLS,KC_P1, KC_P2, KC_P3, KC_PENT,_______, - _______,_______,_______,_______, KC_P0, KC_PDOT,_______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = LAYOUT( - KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,KC_F18,_______, _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,KC_VOLU,_______,_______, _______,_______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,KC_MUTE,_______,_______, _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______, - _______,_______,_______,_______,KC_VOLD,_______, _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______, _______,_______,_______,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c deleted file mode 100644 index 0ca0a22ae5e..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H - -enum custom_layer { - _QWERTY, - _LOWER, - _RAISE, -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -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_F9 , KC_F10, KC_F11, KC_F12 , _______, - _______, KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_LBRC , KC_RBRC, - _______, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , KC_BSLS, - _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______, - _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______, - KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL, - RAISE ,KC_SPC , KC_HOME, KC_END, KC_ENT, LOWER , - KC_TAB,KC_BSPC, KC_GRV, KC_LGUI,KC_LALT, KC_DEL - ), - - [_LOWER] = LAYOUT( - KC_TRNS, 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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL , _______, - _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______, - _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, _______, - _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, _______, - _______,KC_PSCR, _______, KC_P0, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = 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_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______, - _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, - _______,_______, KC_EQL ,_______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c deleted file mode 100644 index c9b1d58276f..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H - -enum custom_layer { - _QWERTY, - _LOWER, - _RAISE, -}; - -#define RAISE MO(_RAISE) -#define LOWER MO(_LOWER) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12 , KC_GRV, - _______, KC_ESC , 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_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , _______, - _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______, - _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______, - _______, KC_LBRC , KC_RBRC,KC_LEFT,KC_RGHT, KC_UP, KC_DOWN,KC_MINS, KC_EQL , _______, - RAISE ,KC_SPC ,KC_HOME, KC_END, KC_ENT, LOWER , - KC_LGUI,KC_LALT,KC_BSPC, KC_DEL, KC_RGUI, KC_RALT - - ), - - [_LOWER] = LAYOUT( - _______, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, - _______, KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, _______, - _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______, - _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,_______,KC_PIPE, _______, - _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,_______,KC_UNDS, _______, - _______, _______,_______,KC_PAUS,KC_PSCR, KC_P0 ,KC_PDOT,_______,_______, _______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ), - - [_RAISE] = LAYOUT( - _______,KC_F13 , KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19 , KC_F20, KC_F21, KC_F22,KC_F23 ,KC_F24 , _______, - _______,_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, _______, - _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, - _______,_______,_______,_______,_______, KC_EQL ,_______,_______,_______, _______, - _______,_______,_______, _______,_______,_______, - _______,_______,_______, _______,_______,_______ - ) -}; diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb..00000000000 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes From f460172c0febf8b90c0a66ef56a436ccbfecc8b4 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 11 Mar 2025 00:13:28 +0000 Subject: [PATCH 29/32] move common defines to `info.json` --- .../4x5/keyboard.json | 21 ------------------- .../4x5_eic/keyboard.json | 21 ------------------- .../4x6/keyboard.json | 21 ------------------- .../4x6_eic/keyboard.json | 21 ------------------- .../4x6_ex/keyboard.json | 21 ------------------- .../4x6_exic/keyboard.json | 21 ------------------- .../5x6/keyboard.json | 21 ------------------- .../5x6_eic/keyboard.json | 21 ------------------- .../5x6_ex/keyboard.json | 21 ------------------- .../5x6_exic/keyboard.json | 21 ------------------- .../6x6/keyboard.json | 21 ------------------- .../6x6_eic/keyboard.json | 21 ------------------- .../6x6_ex/keyboard.json | 21 ------------------- .../6x6_exic/keyboard.json | 21 ------------------- .../6x7/keyboard.json | 21 ------------------- .../6x7_ex/keyboard.json | 21 ------------------- .../dactyl_manuform_carbonfet/info.json | 18 ++++++++++++++++ 17 files changed, 18 insertions(+), 336 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keyboard.json index d836a1e940f..119d0203e2e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x5", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC450", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keyboard.json index f10ab19dd65..7d1786b3aeb 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x5_eic/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x5 EIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC45B", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keyboard.json index c68a7f7954c..0cb68fc79ed 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC460", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keyboard.json index df50e04fe11..17708a90da3 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_eic/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 EIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC46B", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keyboard.json index ffb425223da..a7e99bc28e2 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_ex/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 EX", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC46A", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keyboard.json index 821f9c57f16..28ab1577605 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/4x6_exic/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 4x6 EXIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC46C", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keyboard.json index 259cd835679..76d3e84276d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC560", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keyboard.json index d770713f36b..5897fa5c504 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_eic/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 EIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC56B", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keyboard.json index a20b05ba36a..b7a18215862 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_ex/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 EX", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC56A", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keyboard.json index 3425e2e85c3..1690269d803 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/5x6_exic/keyboard.json @@ -1,34 +1,13 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 5x6 EXIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC56C", "device_version": "1.0.0" }, - "ws2812": { - "pin": "D3" - }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keyboard.json index 3dd2013caa5..fe8bc8e3df3 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6/keyboard.json @@ -1,10 +1,6 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC660", "device_version": "1.0.0" }, @@ -12,23 +8,6 @@ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "ws2812": { - "pin": "D3" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keyboard.json index 84e7bfee429..53db7767f2d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_eic/keyboard.json @@ -1,10 +1,6 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 EIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC66B", "device_version": "1.0.0" }, @@ -12,23 +8,6 @@ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "ws2812": { - "pin": "D3" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keyboard.json index ab1efd6d2b5..89be93261cc 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_ex/keyboard.json @@ -1,10 +1,6 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 EX", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC66A", "device_version": "1.0.0" }, @@ -12,23 +8,6 @@ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "ws2812": { - "pin": "D3" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keyboard.json index 45efec2aba2..60440d23eb0 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x6_exic/keyboard.json @@ -1,10 +1,6 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x6 EXIC", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC66C", "device_version": "1.0.0" }, @@ -12,23 +8,6 @@ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "ws2812": { - "pin": "D3" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keyboard.json index 0bebc1f9d48..0e3717858d9 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7/keyboard.json @@ -1,10 +1,6 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x7", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC670", "device_version": "1.0.0" }, @@ -12,23 +8,6 @@ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "ws2812": { - "pin": "D3" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keyboard.json b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keyboard.json index 2497547887c..bcfa28ecc5b 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/6x7_ex/keyboard.json @@ -1,10 +1,6 @@ { "keyboard_name": "Dactyl ManuForm Carbonfet 6x7 EX", - "manufacturer": "carbonfet", - "url": "https://github.com/carbonfet/dactyl-manuform", - "maintainer": "dunk2k", "usb": { - "vid": "0x444D", "pid": "0xC67A", "device_version": "1.0.0" }, @@ -12,23 +8,6 @@ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "ws2812": { - "pin": "D3" - }, - "features": { - "bootmagic": true, - "console": false, - "command": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json index 1a2b2e2ea00..9d0b92ad5e8 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -1,3 +1,21 @@ { + "manufacturer": "carbonfet", + "url": "https://github.com/carbonfet/dactyl-manuform", + "maintainer": "dunk2k", + "usb": { + "vid": "0x444D" + }, + "development_board": "promicro", + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D0" + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "tags": ["dactyl_manuform", "split"] } From eb41380ce4692e7bf228feb9050fdf4240713c6b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 11 Mar 2025 08:36:54 +0000 Subject: [PATCH 30/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 190c43da02b..7cd3736c15e 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -3,7 +3,7 @@ ![TopView](https://i.imgur.com/0ugz1C9h.jpg) *Dactyl Manuform Carbonfet 5x6* -Forked from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform), the *Dactyl ManuForm Carbonfet* reshapes the former's thumb key cluster from a 3 row, 2 column arrangement to a 2 row, 3 column arrangement. +Forked from the Dactyl ManuForm, the *Dactyl ManuForm Carbonfet* reshapes the former's thumb key cluster from a 3 row, 2 column arrangement to a 2 row, 3 column arrangement. * Keyboard Maintainer: [Carbonfet](https://github.com/carbonfet) * Hardware Supported: Pro Micro development board @@ -42,7 +42,7 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* ### Legacy 5x7 variant -Is the [5x6_exic](./5x6_exic/) variant. +Is equivalent to [5x6_exic](./5x6_exic/) variant ## Compile From 01e4a475dfff472aae9f0d38d81dc08de720dfe8 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 21 Mar 2025 21:31:49 +0000 Subject: [PATCH 31/32] `soft_serial_pin` to `serial.pin` --- keyboards/handwired/dactyl_manuform_carbonfet/info.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/info.json b/keyboards/handwired/dactyl_manuform_carbonfet/info.json index 9d0b92ad5e8..f19c3b4d802 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/info.json +++ b/keyboards/handwired/dactyl_manuform_carbonfet/info.json @@ -9,7 +9,9 @@ "diode_direction": "COL2ROW", "split": { "enabled": true, - "soft_serial_pin": "D0" + "serial": { + "pin": "D0" + } }, "features": { "bootmagic": true, From ab3ee8dfe4de802ef4d6679ee71edde9ed2cfcf7 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 29 May 2025 13:06:03 +0100 Subject: [PATCH 32/32] Update readme.md --- keyboards/handwired/dactyl_manuform_carbonfet/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md index 7cd3736c15e..cb8163e7a3d 100644 --- a/keyboards/handwired/dactyl_manuform_carbonfet/readme.md +++ b/keyboards/handwired/dactyl_manuform_carbonfet/readme.md @@ -34,7 +34,7 @@ Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)* | 7 | As *6 column* with additional pinky finger column | ### Alteration -| Code | Description | Diagram
*(4x6 example)* | +| Suffix | Description | Diagram
*(4x6 example)* | | :---: | :---: | :---: | | ex | **Ex**tended Bottom Row: Key count on the finger well bottom row is extended outward from the default 2 | ![ex](https://i.imgur.com/ifhDa7Zh.png) | | eic | **E**xtended **I**nner **C**olumn: Each half gains an additional inner column though the bottom key of said column is ommitted | ![eic](https://i.imgur.com/stuHtsXh.png) |