summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Sutherland <dunk2k_2000@hotmail.com>2023-07-07 15:32:26 +0100
committerGitHub <noreply@github.com>2023-07-08 00:32:26 +1000
commit43350c347d1a033e16ce6449d30bed1703c791d6 (patch)
tree63719521b954eee2ba397ae3c1612a8f2c87f5d0
parentdf5984022faf248c4fc4d05fcc4c50304baaab97 (diff)
rename and modernise `dactyl_manuform/6x6_kinesis` (#21302)
Diffstat
-rw-r--r--data/mappings/keyboard_aliases.hjson3
-rw-r--r--keyboards/handwired/dactyl_kinesis/info.json (renamed from keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json)37
-rw-r--r--keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c38
-rw-r--r--keyboards/handwired/dactyl_kinesis/readme.md109
-rw-r--r--keyboards/handwired/dactyl_kinesis/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c52
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md85
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk13
8 files changed, 175 insertions, 163 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 6cf1e206e2..f89b496c26 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -212,6 +212,9 @@
"gmmk/pro/iso": {
"target": "gmmk/pro/rev1/iso"
},
+ "handwired/dactyl_manuform/6x6_kinesis": {
+ "target": "handwired/dactyl_kinesis"
+ },
"handwired/ferris": {
"target": "ferris/0_1"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/info.json
index 3dd74aa3f6..91cb98e040 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_kinesis/info.json
@@ -1,6 +1,6 @@
{
- "keyboard_name": "Dactyl-Manuform (6x6+4)",
- "manufacturer": "tshort",
+ "keyboard_name": "Dactyl Kinesis",
+ "manufacturer": "dmik",
"url": "",
"maintainer": "dmik",
"usb": {
@@ -8,6 +8,17 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "audio": false,
+ "backlight": false,
+ "rgblight": false
+ },
"rgblight": {
"led_count": 12
},
@@ -20,12 +31,12 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
- "LAYOUT_6x6_kinesis": {
+ "LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -107,22 +118,22 @@
{"matrix": [12, 4], "x": 14, "y": 5},
{"matrix": [12, 5], "x": 15, "y": 5},
- {"matrix": [5, 4], "x": 5, "y": 7, "h": 2},
- {"matrix": [5, 5], "x": 6, "y": 7, "h": 2},
-
- {"matrix": [12, 0], "x": 10, "y": 7, "h": 2},
- {"matrix": [12, 1], "x": 11, "y": 7, "h": 2},
-
{"matrix": [6, 4], "x": 6, "y": 6},
{"matrix": [6, 5], "x": 7, "y": 6},
{"matrix": [13, 0], "x": 9, "y": 6},
{"matrix": [13, 1], "x": 10, "y": 6},
- {"matrix": [6, 2], "x": 7, "y": 8},
- {"matrix": [6, 3], "x": 7, "y": 7},
+ {"matrix": [5, 4], "x": 5, "y": 7, "h": 2},
+ {"matrix": [5, 5], "x": 6, "y": 7, "h": 2},
+
+ {"matrix": [12, 0], "x": 10, "y": 7, "h": 2},
+ {"matrix": [12, 1], "x": 11, "y": 7, "h": 2},
+ {"matrix": [6, 3], "x": 7, "y": 7},
{"matrix": [13, 2], "x": 9, "y": 7},
+
+ {"matrix": [6, 2], "x": 7, "y": 8},
{"matrix": [13, 3], "x": 9, "y": 8}
]
}
diff --git a/keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c
new file mode 100644
index 0000000000..05e138da72
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+ _QWERTY,
+ _LOWER
+};
+
+#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_CAPS,
+ KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS,
+ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS,
+ KC_LCTL, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+ KC_GRV , LOWER , KC_LEFT, KC_RGHT, KC_UP , KC_DOWN, KC_LBRC, KC_RBRC,
+ KC_LGUI, KC_LALT, KC_RCTL, KC_RGUI,
+ KC_BSPC, KC_DEL, KC_HOME, KC_PGUP, KC_ENT , KC_SPC ,
+ KC_END , KC_PGDN
+ ),
+
+ [_LOWER] = LAYOUT(
+ _______, KC_F11 , KC_F12 , _______, _______, _______, KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, KC_INS , _______, _______, _______, _______,
+ _______, _______
+ )
+};
diff --git a/keyboards/handwired/dactyl_kinesis/readme.md b/keyboards/handwired/dactyl_kinesis/readme.md
new file mode 100644
index 0000000000..69427406d1
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/readme.md
@@ -0,0 +1,109 @@
+# Dactyl Kinesis
+
+Essentially a Dactyl CC physical key layout with an additional top row, further emulating the Kinesis Advantage (*1|2*) physical key layout.
+
+* Keyboard Maintainer: [dmik](https://github.com/dmik)
+* Hardware Supported: Pro Micro controller, or clone of
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/dactyl_kinesis:default
+
+Flashing example for this keyboard:
+
+ make handwired/dactyl_kinesis: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).
+
+## Kinesis Advantage Keymap
+
+### About
+
+This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
+ - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
+ - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
+ - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
+ - Brigtness and volume control keys are added to LOWER layer.
+
+ The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
+ not have an activation key mapped. It is intended for possible extensions.
+
+### Keymap
+
+ Main QUERTY layer:
+ ,-------------------------------------------. ,-------------------------------------------.
+ | ESC | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | CAPS |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | LCtl | A | S | D | F | G | | H | J | K | L | ; | ' |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | LShift | Z | X | C | V | B | | N | M | , | . | / | RShift |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | ` | LOWER| Left | Rght | | Up | Dn | [ | ] |
+ `---------------------------' `---------------------------'
+ ,-------------. ,-------------.
+ | LGui | LAlt | | RCtl | RGui |
+ ,------|------|------| |------+------+------.
+ | | | Home | | PgUp | | |
+ | BkSp | Del |------| |------|Enter |Space |
+ | | | End | | PgDn | | |
+ `--------------------' `--------------------'
+
+ LOWER layer:
+ ,-------------------------------------------. ,-------------------------------------------.
+ | | F11 | F12 | | | | |BriDn |BriUp |VMute |VolDn |VolUp | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | | | | | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | | | | | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | | | | | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | | | | | |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | | | | | | | | | |
+ `---------------------------' `---------------------------'
+ ,-------------. ,-------------.
+ | | | | | |
+ ,------|------|------| |------+------+------.
+ | | | | | | | |
+ | | INS |------| |------| | |
+ | | | | | | | |
+ `--------------------' `--------------------'
+
+### Key Matrix Wiring
+
+The below picture shows correspondence between the keys and the row/column wires of the left and
+right halves:
+
+ ,-------------------------------------------. ,-------------------------------------------.
+ | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | L50 | L51 | L52 | L53 | | R52 | R53 | R54 | R55 |
+ `---------------------------' `---------------------------'
+ ,-------------. ,-------------.
+ | L64 | L65 | | R60 | R61 |
+ ,------|------|------| |------+------+------.
+ | | | L63 | | R62 | | |
+ | L54 | L55 |------| |------| R50 | R51 |
+ | | | L62 | | R63 | | |
+ `--------------------' `--------------------'
+
+## 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
diff --git a/keyboards/handwired/dactyl_kinesis/rules.mk b/keyboards/handwired/dactyl_kinesis/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
deleted file mode 100644
index 2ef9794d6d..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// 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)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_6x6_kinesis(
- KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_CAPS,
- KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS,
- KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS,
- KC_LCTL, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
- KC_GRV , LOWER , KC_LEFT, KC_RGHT, KC_UP , KC_DOWN, KC_LBRC, KC_RBRC,
- KC_BSPC, KC_DEL , KC_ENT , KC_SPC ,
- KC_LGUI, KC_LALT, KC_RCTL, KC_RGUI,
- KC_END , KC_HOME, KC_PGUP, KC_PGDN
- ),
-
- [_LOWER] = LAYOUT_6x6_kinesis(
- _______, KC_F11 , KC_F12 , _______, _______, _______, KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_INS , _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______
- ),
-
- [_RAISE] = LAYOUT_6x6_kinesis(
- _______, KC_F11 , KC_F12 , _______, _______, _______, KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_INS , _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______
- ),
-};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
deleted file mode 100644
index 1e44cc9601..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Kinesis Advantage Keymap
-
-## About this keymap
-
-This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
- - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
- - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
- - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
- - Brigtness and volume control keys are added to LOWER layer.
-
- The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
- not have an activation key mapped. It is intended for possible extensions.
-
-## Mapping details
-
- Main QUERTY layer:
- ,-------------------------------------------. ,-------------------------------------------.
- | ESC | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | CAPS |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | LCtl | A | S | D | F | G | | H | J | K | L | ; | ' |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | LShift | Z | X | C | V | B | | N | M | , | . | / | RShift |
- `--------+------+------+------+------+------' `------+------+------+------+------+--------'
- | ` | LOWER| Left | Rght | | Up | Dn | [ | ] |
- `---------------------------' `---------------------------'
- ,-------------. ,-------------.
- | LGui | LAlt | | RCtl | RGui |
- ,------|------|------| |------+------+------.
- | | | Home | | PgUp | | |
- | BkSp | Del |------| |------|Enter |Space |
- | | | End | | PgDn | | |
- `--------------------' `--------------------'
-
- LOWER layer:
- ,-------------------------------------------. ,-------------------------------------------.
- | | F11 | F12 | | | | |BriDn |BriUp |VMute |VolDn |VolUp | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- `--------+------+------+------+------+------' `------+------+------+------+------+--------'
- | | | | | | | | | |
- `---------------------------' `---------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | | | | | |
- | | INS |------| |------| | |
- | | | | | | | |
- `--------------------' `--------------------'
-
-## Soldering details
-
-The below picture shows correspondence between the keys and the row/column wires of the left and
-right halves:
-
- LOWER layer:
- ,-------------------------------------------. ,-------------------------------------------.
- | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 |
- `--------+------+------+------+------+------' `------+------+------+------+------+--------'
- | L50 | L51 | L52 | L53 | | R52 | R53 | R54 | R55 |
- `---------------------------' `---------------------------'
- ,-------------. ,-------------.
- | L64 | L65 | | R60 | R61 |
- ,------|------|------| |------+------+------.
- | | | L63 | | R62 | | |
- | L54 | L55 |------| |------| R50 | R51 |
- | | | L62 | | R63 | | |
- `--------------------' `--------------------'
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 06:08:01 +0000