From 4637f7ea3076793a04c40be60f5ead39d8f3be8b Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:32:48 -0400 Subject: [PATCH 01/11] initial version of handwired/dactyl_manuform/5x7_2_6 keyboard --- .../dactyl_manuform/5x7_2_6/config.h | 22 ++++ .../dactyl_manuform/5x7_2_6/info.json | 88 ++++++++++++++ .../dactyl_manuform/5x7_2_6/keyboard.json | 43 +++++++ .../5x7_2_6/keymaps/default/keymap.c | 110 ++++++++++++++++++ .../dactyl_manuform/5x7_2_6/readme.md | 29 +++++ 5 files changed, 292 insertions(+) create mode 100644 keyboards/handwired/dactyl_manuform/5x7_2_6/config.h create mode 100644 keyboards/handwired/dactyl_manuform/5x7_2_6/info.json create mode 100644 keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json create mode 100644 keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h b/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h new file mode 100644 index 00000000000..02c636afdd3 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h @@ -0,0 +1,22 @@ +/* +Copyright 2012 Jun Wako Nikolai Grigoriev @ngrigoriev + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + + +#pragma once + + +#define EE_HANDS diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/info.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/info.json new file mode 100644 index 00000000000..e553ed81e02 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/info.json @@ -0,0 +1,88 @@ +{ + "manufacturer": "Nikolai Grigoriev", + "keyboard_name": "Dactyl Manuform 5x7 2-key last row 6-key thumb cluster", + "maintainer": "ngrigoriev", + "features": { + "backlight": false, + "extrakey": true, + "mousekey": true, + "rgb": false + }, + "url": "https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6", + "layouts": { + "LAYOUT_5x7_2_6": { + "layout": [ + {"label": "KC_GRV", "matrix": [0, 0], "x": 0, "y": 0.5, "w": 1.5}, + {"label": "KC_1", "matrix": [0, 1], "x": 1.5, "y": 0.5}, + {"label": "KC_2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "KC_3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "KC_4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "KC_5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "KC_NO", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, + {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, + {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, + {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, + {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, + {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, + {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, + {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, + {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, + {"label": "KC_EQL", "matrix": [6, 0], "x": 12, "y": 0}, + {"label": "KC_6", "matrix": [6, 1], "x": 13, "y": 0}, + {"label": "KC_7", "matrix": [6, 2], "x": 14, "y": 0}, + {"label": "KC_8", "matrix": [6, 3], "x": 15, "y": 0}, + {"label": "KC_9", "matrix": [6, 4], "x": 16, "y": 0}, + {"label": "KC_0", "matrix": [6, 5], "x": 17, "y": 0.5}, + {"label": "KC_BSPC", "matrix": [6, 6], "x": 18, "y": 0.5, "w": 1.5}, + {"label": "KC_MINUS", "matrix": [7, 0], "x": 12, "y": 1}, + {"label": "KC_Y", "matrix": [7, 1], "x": 13, "y": 1}, + {"label": "KC_U", "matrix": [7, 2], "x": 14, "y": 1}, + {"label": "KC_I", "matrix": [7, 3], "x": 15, "y": 1}, + {"label": "KC_O", "matrix": [7, 4], "x": 16, "y": 1}, + {"label": "KC_P", "matrix": [7, 5], "x": 17, "y": 1.5}, + {"label": "KC_BSLS", "matrix": [7, 6], "x": 18, "y": 1.5, "w": 1.5}, + {"label": "KC_DEL", "matrix": [8, 0], "x": 12, "y": 2}, + {"label": "KC_H", "matrix": [8, 1], "x": 13, "y": 2}, + {"label": "KC_J", "matrix": [8, 2], "x": 14, "y": 2}, + {"label": "KC_K", "matrix": [8, 3], "x": 15, "y": 2}, + {"label": "KC_L", "matrix": [8, 4], "x": 16, "y": 2}, + {"label": "KC_SCLN", "matrix": [8, 5], "x": 17, "y": 2.5}, + {"label": "KC_RSFT", "matrix": [8, 6], "x": 18, "y": 2.5, "w": 1.5}, + {"label": "KC_N", "matrix": [9, 1], "x": 13, "y": 3}, + {"label": "KC_M", "matrix": [9, 2], "x": 14, "y": 3}, + {"label": "KC_COMM", "matrix": [9, 3], "x": 15, "y": 3}, + {"label": "KC_DOT", "matrix": [9, 4], "x": 16, "y": 3}, + {"label": "KC_SLSH", "matrix": [9, 5], "x": 17, "y": 3.5}, + {"label": "KC_RSFT", "matrix": [9, 6], "x": 18, "y": 3.5, "w": 1.5}, + {"label": "KC_LBRC", "matrix": [10, 3], "x": 15, "y": 4}, + {"label": "KC_RBRC", "matrix": [10, 4], "x": 16, "y": 4}, + {"label": "KC_ENTER", "matrix": [10, 1], "x": 12.5, "y": 5, "h": 1.5, "r": -30}, + {"label": "KC_SPC", "matrix": [10, 2], "x": 13.5, "y": 5, "h": 1.5, "r": -30}, + {"label": "KC_LEFT", "matrix": [11, 3], "x": 10.5, "y": 7.5, "r": -45}, + {"label": "KC_RIGHT", "matrix": [11, 1], "x": 11, "y": 6.5, "r": -45}, + {"label": "KC_RCTL", "matrix": [11, 4], "x": 11.5, "y": 8, "r": -45}, + {"label": "KC_RALT", "matrix": [11, 2], "x": 12, "y": 7, "r": -45} + ] + } + } +} diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json new file mode 100644 index 00000000000..3cf5e74fda4 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -0,0 +1,43 @@ +{ + "manufacturer": "Nikolai Grigoriev", + "keyboard_name": "Dactyl Manuform 5x7 2-key last row 6-key thumb cluster", + "maintainer": "ngrigoriev", + "bootloader": "caterina", + "build": { + "lto": true + }, + "development_board": "promicro", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "processor": "atmega32u4", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "split": { + "enabled": true, + "soft_serial_pin": "D0", + "transport": { + "protocol": "i2c" + } + }, + "url": "https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + } +} diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c new file mode 100644 index 00000000000..e007501100a --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c @@ -0,0 +1,110 @@ +/* +Copyright 2012 Jun Wako Nikolai Grigoriev @ngrigoriev + +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 + +#define _BASE 0 // default layer +#define _MAGIC 1 +#define _NUMPAD 2 +#define _FN 3 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_5x7_2_6( + // left hand + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, MO(_MAGIC), + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(_NUMPAD), + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, _______, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_PGUP, KC_PGDN, + KC_LCTL, LT(_FN, KC_ESC), + KC_UP, KC_DOWN, + KC_LCMD, KC_LALT, + // right hand + KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_MINUS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_LBRC, KC_RBRC, + KC_ENTER, KC_SPC, + KC_LEFT, KC_RIGHT, + KC_RCTL, KC_RALT + ), + + [_FN] = LAYOUT_5x7_2_6( + // left hand + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, MO(_MAGIC), + _______, _______, _______, KC_UP, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, + KC_MPRV, KC_MNXT, + _______, _______, + _______, _______, + _______, _______, + // right hand + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, _______, _______, _______, _______, _______, KC_F12, + _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, + KC_DEL, _______, + _______, _______, + _______, _______ + ), + + [_NUMPAD] = LAYOUT_5x7_2_6( + // left hand + _______, _______, _______, _______, _______, _______, MO(_MAGIC), + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, + _______, _______, + _______, _______, + _______, _______, + // right hand + _______, _______, KC_NUM, _______, KC_PMNS, KC_PPLS, _______, + _______, _______, 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, + _______, _______, + _______, _______ + ), + + [_MAGIC] = LAYOUT_5x7_2_6( + // left hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, + _______, _______, + _______, _______, + _______, _______, + // right hand + CG_SWAP, _______, _______, _______, _______, _______, QK_REBOOT, + CG_NORM, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOTLOADER, + _______, _______, _______, _______, _______, _______, + _______, _______, + _______, _______, + _______, _______, + _______, _______ + ) +}; + diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md b/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md new file mode 100644 index 00000000000..7a7615f396e --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md @@ -0,0 +1,29 @@ +# handwired/dactyl_manuform/5x7_2_6 + +![Planck](https://raw.githubusercontent.com/ngrigoriev/dactyl-manuform-5x7_2_6/main/pics/kbpic_small_21.jpg) + +A standard Dactyl Manuform keyboard with 5x7 matrix, 6 thumb cluster keys. Last row has 2 keys only. Index column has 3 rows. The outer keys are 1,5u wide. [More info on https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6](https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6). Based on the original set of Dactyl Manuform keyboards created and maintaied by [Jack Humbert](https://github.com/jackhumbert). + +This keyboard can be generated using one of Dactyl Manuform generators, such as (https://dactyl.mbugert.de/manuform). + +* Keyboard Maintainer: [Nikolai Grigoriev](https://github.com/ngrigoriev) +* Hardware Supported: Promicro +* Hardware Availability: general DIY + +Make example for this keyboard (after setting up your build environment): + + make handwired/dactyl_manuform/5x7_2_6:default + +Flashing example for this keyboard: + + make handwired/dactyl_manuform/5x7_2_6:default flash + +See the [build environment setup](getting_started_build_tools) and the [make instructions](getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From a3b2ffd9d7e593aee22961b28ca36fd2dbb7d293 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:52:21 -0400 Subject: [PATCH 02/11] add the side detection based on USB connection --- keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index 3cf5e74fda4..046d648b054 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -29,9 +29,11 @@ }, "split": { "enabled": true, - "soft_serial_pin": "D0", "transport": { "protocol": "i2c" + }, + "usb_detect": { + "enabled": true } }, "url": "https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6", From dde7174a66bef0e16a6338ff07ebb650be7df03e Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:32:37 -0400 Subject: [PATCH 03/11] remove info.json and merge its contents into keyboard.json --- .../dactyl_manuform/5x7_2_6/info.json | 88 ------------------- .../dactyl_manuform/5x7_2_6/keyboard.json | 80 ++++++++++++++++- 2 files changed, 79 insertions(+), 89 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform/5x7_2_6/info.json diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/info.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/info.json deleted file mode 100644 index e553ed81e02..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/info.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "manufacturer": "Nikolai Grigoriev", - "keyboard_name": "Dactyl Manuform 5x7 2-key last row 6-key thumb cluster", - "maintainer": "ngrigoriev", - "features": { - "backlight": false, - "extrakey": true, - "mousekey": true, - "rgb": false - }, - "url": "https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6", - "layouts": { - "LAYOUT_5x7_2_6": { - "layout": [ - {"label": "KC_GRV", "matrix": [0, 0], "x": 0, "y": 0.5, "w": 1.5}, - {"label": "KC_1", "matrix": [0, 1], "x": 1.5, "y": 0.5}, - {"label": "KC_2", "matrix": [0, 2], "x": 2.5, "y": 0}, - {"label": "KC_3", "matrix": [0, 3], "x": 3.5, "y": 0}, - {"label": "KC_4", "matrix": [0, 4], "x": 4.5, "y": 0}, - {"label": "KC_5", "matrix": [0, 5], "x": 5.5, "y": 0}, - {"label": "KC_NO", "matrix": [0, 6], "x": 6.5, "y": 0}, - {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, - {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, - {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, - {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, - {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, - {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, - {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, - {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, - {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, - {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, - {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, - {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, - {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, - {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, - {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, - {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, - {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, - {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, - {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, - {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, - {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, - {"label": "KC_EQL", "matrix": [6, 0], "x": 12, "y": 0}, - {"label": "KC_6", "matrix": [6, 1], "x": 13, "y": 0}, - {"label": "KC_7", "matrix": [6, 2], "x": 14, "y": 0}, - {"label": "KC_8", "matrix": [6, 3], "x": 15, "y": 0}, - {"label": "KC_9", "matrix": [6, 4], "x": 16, "y": 0}, - {"label": "KC_0", "matrix": [6, 5], "x": 17, "y": 0.5}, - {"label": "KC_BSPC", "matrix": [6, 6], "x": 18, "y": 0.5, "w": 1.5}, - {"label": "KC_MINUS", "matrix": [7, 0], "x": 12, "y": 1}, - {"label": "KC_Y", "matrix": [7, 1], "x": 13, "y": 1}, - {"label": "KC_U", "matrix": [7, 2], "x": 14, "y": 1}, - {"label": "KC_I", "matrix": [7, 3], "x": 15, "y": 1}, - {"label": "KC_O", "matrix": [7, 4], "x": 16, "y": 1}, - {"label": "KC_P", "matrix": [7, 5], "x": 17, "y": 1.5}, - {"label": "KC_BSLS", "matrix": [7, 6], "x": 18, "y": 1.5, "w": 1.5}, - {"label": "KC_DEL", "matrix": [8, 0], "x": 12, "y": 2}, - {"label": "KC_H", "matrix": [8, 1], "x": 13, "y": 2}, - {"label": "KC_J", "matrix": [8, 2], "x": 14, "y": 2}, - {"label": "KC_K", "matrix": [8, 3], "x": 15, "y": 2}, - {"label": "KC_L", "matrix": [8, 4], "x": 16, "y": 2}, - {"label": "KC_SCLN", "matrix": [8, 5], "x": 17, "y": 2.5}, - {"label": "KC_RSFT", "matrix": [8, 6], "x": 18, "y": 2.5, "w": 1.5}, - {"label": "KC_N", "matrix": [9, 1], "x": 13, "y": 3}, - {"label": "KC_M", "matrix": [9, 2], "x": 14, "y": 3}, - {"label": "KC_COMM", "matrix": [9, 3], "x": 15, "y": 3}, - {"label": "KC_DOT", "matrix": [9, 4], "x": 16, "y": 3}, - {"label": "KC_SLSH", "matrix": [9, 5], "x": 17, "y": 3.5}, - {"label": "KC_RSFT", "matrix": [9, 6], "x": 18, "y": 3.5, "w": 1.5}, - {"label": "KC_LBRC", "matrix": [10, 3], "x": 15, "y": 4}, - {"label": "KC_RBRC", "matrix": [10, 4], "x": 16, "y": 4}, - {"label": "KC_ENTER", "matrix": [10, 1], "x": 12.5, "y": 5, "h": 1.5, "r": -30}, - {"label": "KC_SPC", "matrix": [10, 2], "x": 13.5, "y": 5, "h": 1.5, "r": -30}, - {"label": "KC_LEFT", "matrix": [11, 3], "x": 10.5, "y": 7.5, "r": -45}, - {"label": "KC_RIGHT", "matrix": [11, 1], "x": 11, "y": 6.5, "r": -45}, - {"label": "KC_RCTL", "matrix": [11, 4], "x": 11.5, "y": 8, "r": -45}, - {"label": "KC_RALT", "matrix": [11, 2], "x": 12, "y": 7, "r": -45} - ] - } - } -} diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index 046d648b054..e1e431c4b19 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -9,12 +9,14 @@ "development_board": "promicro", "diode_direction": "COL2ROW", "features": { + "backlight": false, "bootmagic": false, "command": false, "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb": false }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], @@ -41,5 +43,81 @@ "device_version": "1.0.0", "pid": "0x0000", "vid": "0xFEED" + }, + "layouts": { + "LAYOUT_5x7_2_6": { + "layout": [ + {"label": "KC_GRV", "matrix": [0, 0], "x": 0, "y": 0.5, "w": 1.5}, + {"label": "KC_1", "matrix": [0, 1], "x": 1.5, "y": 0.5}, + {"label": "KC_2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "KC_3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "KC_4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "KC_5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "KC_NO", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, + {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, + {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, + {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, + {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, + {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, + {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, + {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, + {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, + {"label": "KC_EQL", "matrix": [6, 0], "x": 12, "y": 0}, + {"label": "KC_6", "matrix": [6, 1], "x": 13, "y": 0}, + {"label": "KC_7", "matrix": [6, 2], "x": 14, "y": 0}, + {"label": "KC_8", "matrix": [6, 3], "x": 15, "y": 0}, + {"label": "KC_9", "matrix": [6, 4], "x": 16, "y": 0}, + {"label": "KC_0", "matrix": [6, 5], "x": 17, "y": 0.5}, + {"label": "KC_BSPC", "matrix": [6, 6], "x": 18, "y": 0.5, "w": 1.5}, + {"label": "KC_MINUS", "matrix": [7, 0], "x": 12, "y": 1}, + {"label": "KC_Y", "matrix": [7, 1], "x": 13, "y": 1}, + {"label": "KC_U", "matrix": [7, 2], "x": 14, "y": 1}, + {"label": "KC_I", "matrix": [7, 3], "x": 15, "y": 1}, + {"label": "KC_O", "matrix": [7, 4], "x": 16, "y": 1}, + {"label": "KC_P", "matrix": [7, 5], "x": 17, "y": 1.5}, + {"label": "KC_BSLS", "matrix": [7, 6], "x": 18, "y": 1.5, "w": 1.5}, + {"label": "KC_DEL", "matrix": [8, 0], "x": 12, "y": 2}, + {"label": "KC_H", "matrix": [8, 1], "x": 13, "y": 2}, + {"label": "KC_J", "matrix": [8, 2], "x": 14, "y": 2}, + {"label": "KC_K", "matrix": [8, 3], "x": 15, "y": 2}, + {"label": "KC_L", "matrix": [8, 4], "x": 16, "y": 2}, + {"label": "KC_SCLN", "matrix": [8, 5], "x": 17, "y": 2.5}, + {"label": "KC_RSFT", "matrix": [8, 6], "x": 18, "y": 2.5, "w": 1.5}, + {"label": "KC_N", "matrix": [9, 1], "x": 13, "y": 3}, + {"label": "KC_M", "matrix": [9, 2], "x": 14, "y": 3}, + {"label": "KC_COMM", "matrix": [9, 3], "x": 15, "y": 3}, + {"label": "KC_DOT", "matrix": [9, 4], "x": 16, "y": 3}, + {"label": "KC_SLSH", "matrix": [9, 5], "x": 17, "y": 3.5}, + {"label": "KC_RSFT", "matrix": [9, 6], "x": 18, "y": 3.5, "w": 1.5}, + {"label": "KC_LBRC", "matrix": [10, 3], "x": 15, "y": 4}, + {"label": "KC_RBRC", "matrix": [10, 4], "x": 16, "y": 4}, + {"label": "KC_ENTER", "matrix": [10, 1], "x": 12.5, "y": 5, "h": 1.5, "r": -30}, + {"label": "KC_SPC", "matrix": [10, 2], "x": 13.5, "y": 5, "h": 1.5, "r": -30}, + {"label": "KC_LEFT", "matrix": [11, 3], "x": 10.5, "y": 7.5, "r": -45}, + {"label": "KC_RIGHT", "matrix": [11, 1], "x": 11, "y": 6.5, "r": -45}, + {"label": "KC_RCTL", "matrix": [11, 4], "x": 11.5, "y": 8, "r": -45}, + {"label": "KC_RALT", "matrix": [11, 2], "x": 12, "y": 7, "r": -45} + ] + } } } From fdd9a01994d4337e2a1b92f6b3bca285fd2673c9 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:34:50 -0400 Subject: [PATCH 04/11] remove extra features --- keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index e1e431c4b19..d01bbf9e65b 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -9,14 +9,10 @@ "development_board": "promicro", "diode_direction": "COL2ROW", "features": { - "backlight": false, "bootmagic": false, "command": false, "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb": false + "nkro": true }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], From 644a8e156ed505ade4f5c5df0b429f848f8daa8c Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:38:47 -0400 Subject: [PATCH 05/11] remove processor and bootloader properties --- keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index d01bbf9e65b..aede6fba453 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -2,7 +2,6 @@ "manufacturer": "Nikolai Grigoriev", "keyboard_name": "Dactyl Manuform 5x7 2-key last row 6-key thumb cluster", "maintainer": "ngrigoriev", - "bootloader": "caterina", "build": { "lto": true }, @@ -18,7 +17,6 @@ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] }, - "processor": "atmega32u4", "qmk": { "locking": { "enabled": true, From 17088412189d61061a3ede5886475317be93cf25 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:41:20 -0400 Subject: [PATCH 06/11] moved to enum instead of defines --- .../dactyl_manuform/5x7_2_6/keymaps/default/keymap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c index e007501100a..52358ced57b 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c @@ -17,10 +17,12 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -#define _BASE 0 // default layer -#define _MAGIC 1 -#define _NUMPAD 2 -#define _FN 3 +enum layers { + _BASE, + _MAGIC, + _NUMPAD, + _FN +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_5x7_2_6( From 410cead821de737e9c12fedc69807da0759fe51a Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:43:42 -0400 Subject: [PATCH 07/11] fix make target, fix keyboard image alt text --- keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md b/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md index 7a7615f396e..6a7d620ef3d 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md @@ -1,6 +1,6 @@ # handwired/dactyl_manuform/5x7_2_6 -![Planck](https://raw.githubusercontent.com/ngrigoriev/dactyl-manuform-5x7_2_6/main/pics/kbpic_small_21.jpg) +![keyboad_image](https://raw.githubusercontent.com/ngrigoriev/dactyl-manuform-5x7_2_6/main/pics/kbpic_small_21.jpg) A standard Dactyl Manuform keyboard with 5x7 matrix, 6 thumb cluster keys. Last row has 2 keys only. Index column has 3 rows. The outer keys are 1,5u wide. [More info on https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6](https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6). Based on the original set of Dactyl Manuform keyboards created and maintaied by [Jack Humbert](https://github.com/jackhumbert). @@ -16,7 +16,7 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - make handwired/dactyl_manuform/5x7_2_6:default flash + make handwired/dactyl_manuform/5x7_2_6:default:flash See the [build environment setup](getting_started_build_tools) and the [make instructions](getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](newbs). From 0841ca48054a9fd6c2136c57226b4ac7f97af1f1 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 5 Aug 2024 20:24:26 -0400 Subject: [PATCH 08/11] moved the image to another hosting service --- keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md b/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md index 6a7d620ef3d..e29bbeb8cec 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/readme.md @@ -1,6 +1,6 @@ # handwired/dactyl_manuform/5x7_2_6 -![keyboad_image](https://raw.githubusercontent.com/ngrigoriev/dactyl-manuform-5x7_2_6/main/pics/kbpic_small_21.jpg) +![keyboad_image](https://i.ibb.co/09tfjY0/kbpic-small-21.jpg) A standard Dactyl Manuform keyboard with 5x7 matrix, 6 thumb cluster keys. Last row has 2 keys only. Index column has 3 rows. The outer keys are 1,5u wide. [More info on https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6](https://github.com/ngrigoriev/dactyl-manuform-5x7_2_6). Based on the original set of Dactyl Manuform keyboards created and maintaied by [Jack Humbert](https://github.com/jackhumbert). From 98d80dbe2c39061104c97474042c02b0c4a67671 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:53:46 -0400 Subject: [PATCH 09/11] rearrange the layout to match the physical look instead of the matrix --- .../dactyl_manuform/5x7_2_6/keyboard.json | 56 ++++----- .../5x7_2_6/keymaps/default/keymap.c | 106 ++++++------------ 2 files changed, 62 insertions(+), 100 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index aede6fba453..07c36ac18d1 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -48,34 +48,6 @@ {"label": "KC_4", "matrix": [0, 4], "x": 4.5, "y": 0}, {"label": "KC_5", "matrix": [0, 5], "x": 5.5, "y": 0}, {"label": "KC_NO", "matrix": [0, 6], "x": 6.5, "y": 0}, - {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, - {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, - {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, - {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, - {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, - {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, - {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, - {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, - {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, - {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, - {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, - {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, - {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, - {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, - {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, - {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, - {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, - {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, - {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, - {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, - {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, {"label": "KC_EQL", "matrix": [6, 0], "x": 12, "y": 0}, {"label": "KC_6", "matrix": [6, 1], "x": 13, "y": 0}, {"label": "KC_7", "matrix": [6, 2], "x": 14, "y": 0}, @@ -83,6 +55,13 @@ {"label": "KC_9", "matrix": [6, 4], "x": 16, "y": 0}, {"label": "KC_0", "matrix": [6, 5], "x": 17, "y": 0.5}, {"label": "KC_BSPC", "matrix": [6, 6], "x": 18, "y": 0.5, "w": 1.5}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, {"label": "KC_MINUS", "matrix": [7, 0], "x": 12, "y": 1}, {"label": "KC_Y", "matrix": [7, 1], "x": 13, "y": 1}, {"label": "KC_U", "matrix": [7, 2], "x": 14, "y": 1}, @@ -90,6 +69,13 @@ {"label": "KC_O", "matrix": [7, 4], "x": 16, "y": 1}, {"label": "KC_P", "matrix": [7, 5], "x": 17, "y": 1.5}, {"label": "KC_BSLS", "matrix": [7, 6], "x": 18, "y": 1.5, "w": 1.5}, + {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, {"label": "KC_DEL", "matrix": [8, 0], "x": 12, "y": 2}, {"label": "KC_H", "matrix": [8, 1], "x": 13, "y": 2}, {"label": "KC_J", "matrix": [8, 2], "x": 14, "y": 2}, @@ -97,18 +83,32 @@ {"label": "KC_L", "matrix": [8, 4], "x": 16, "y": 2}, {"label": "KC_SCLN", "matrix": [8, 5], "x": 17, "y": 2.5}, {"label": "KC_RSFT", "matrix": [8, 6], "x": 18, "y": 2.5, "w": 1.5}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, + {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, {"label": "KC_N", "matrix": [9, 1], "x": 13, "y": 3}, {"label": "KC_M", "matrix": [9, 2], "x": 14, "y": 3}, {"label": "KC_COMM", "matrix": [9, 3], "x": 15, "y": 3}, {"label": "KC_DOT", "matrix": [9, 4], "x": 16, "y": 3}, {"label": "KC_SLSH", "matrix": [9, 5], "x": 17, "y": 3.5}, {"label": "KC_RSFT", "matrix": [9, 6], "x": 18, "y": 3.5, "w": 1.5}, + {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, + {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, {"label": "KC_LBRC", "matrix": [10, 3], "x": 15, "y": 4}, {"label": "KC_RBRC", "matrix": [10, 4], "x": 16, "y": 4}, + {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, + {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, {"label": "KC_ENTER", "matrix": [10, 1], "x": 12.5, "y": 5, "h": 1.5, "r": -30}, {"label": "KC_SPC", "matrix": [10, 2], "x": 13.5, "y": 5, "h": 1.5, "r": -30}, + {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, + {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, {"label": "KC_LEFT", "matrix": [11, 3], "x": 10.5, "y": 7.5, "r": -45}, {"label": "KC_RIGHT", "matrix": [11, 1], "x": 11, "y": 6.5, "r": -45}, + {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, + {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, {"label": "KC_RCTL", "matrix": [11, 4], "x": 11.5, "y": 8, "r": -45}, {"label": "KC_RALT", "matrix": [11, 2], "x": 12, "y": 7, "r": -45} ] diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c index 52358ced57b..5ad2f77badf 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +/* vim: noai:ts=4:sw=4:nowrap +*/ /* Copyright 2012 Jun Wako Nikolai Grigoriev @ngrigoriev @@ -26,87 +28,47 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_5x7_2_6( - // left hand - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, MO(_MAGIC), - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(_NUMPAD), - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, _______, - OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_PGUP, KC_PGDN, - KC_LCTL, LT(_FN, KC_ESC), - KC_UP, KC_DOWN, - KC_LCMD, KC_LALT, - // right hand - KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_MINUS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), - KC_LBRC, KC_RBRC, - KC_ENTER, KC_SPC, - KC_LEFT, KC_RIGHT, - KC_RCTL, KC_RALT + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, MO(_MAGIC), KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(_NUMPAD), KC_MINUS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_DEL, 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_PGUP, KC_PGDN, KC_LBRC, KC_RBRC, + KC_LCTL, LT(_FN, KC_ESC), KC_ENTER,KC_SPC, + KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, + KC_LCMD, KC_LALT, KC_RCTL, KC_RALT ), [_FN] = LAYOUT_5x7_2_6( - // left hand - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, MO(_MAGIC), - _______, _______, _______, KC_UP, _______, _______, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, - _______, _______, _______, _______, _______, _______, - KC_MPRV, KC_MNXT, - _______, _______, - _______, _______, - _______, _______, - // right hand - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, _______, _______, _______, _______, _______, KC_F12, - _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, - KC_DEL, _______, - _______, _______, - _______, _______ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, MO(_MAGIC), _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F12, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MPRV, KC_MNXT, _______, _______, + _______, _______, KC_DEL, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ ), [_NUMPAD] = LAYOUT_5x7_2_6( - // left hand - _______, _______, _______, _______, _______, _______, MO(_MAGIC), - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, - _______, _______, - _______, _______, - _______, _______, - // right hand - _______, _______, KC_NUM, _______, KC_PMNS, KC_PPLS, _______, - _______, _______, 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, - _______, _______, - _______, _______ + _______, _______, _______, _______, _______, _______, MO(_MAGIC), _______, _______, KC_NUM, _______, KC_PMNS, KC_PPLS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_P4, KC_P5, KC_P6, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + _______, _______, KC_P0, KC_PDOT, + _______, _______, _______, KC_PENT, + _______, _______, _______, _______, + _______, _______, _______, _______ ), [_MAGIC] = LAYOUT_5x7_2_6( - // left hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, - _______, _______, - _______, _______, - _______, _______, - // right hand - CG_SWAP, _______, _______, _______, _______, _______, QK_REBOOT, - CG_NORM, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOTLOADER, - _______, _______, _______, _______, _______, _______, - _______, _______, - _______, _______, - _______, _______, - _______, _______ + _______, _______, _______, _______, _______, _______, _______, CG_SWAP, _______, _______, _______, _______, _______, QK_REBOOT, + _______, _______, _______, _______, _______, _______, _______, CG_NORM, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOTLOADER, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ ) }; From 4843907de0e44510e9e0414509103adfba0d3507 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:35:50 -0500 Subject: [PATCH 10/11] Update keyboards/handwired/dactyl_manuform/5x7_2_6/config.h formatting change Co-authored-by: Ryan --- keyboards/handwired/dactyl_manuform/5x7_2_6/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h b/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h index 02c636afdd3..ce536e2d005 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/config.h @@ -15,8 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - #pragma once - #define EE_HANDS From 8d21478a4f26806944d9cd57cfdd7d70020f89b4 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Mon, 7 Jul 2025 00:20:04 +0000 Subject: [PATCH 11/11] Update keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json address review comment Co-authored-by: Ryan --- keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index 07c36ac18d1..7e41ff00830 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": false, - "command": false, - "console": false, "nkro": true }, "matrix_pins": {