From fcc5f0d04f6c122d2f00c3ec82f07732c49bd6cb Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 20 Apr 2023 15:34:53 +0100 Subject: [PATCH 01/28] Added `dactyl_cc` keyboard - entry added to `data/mappings/keyboard_aliases.hjson` --- data/mappings/keyboard_aliases.hjson | 3 + keyboards/handwired/dactyl_cc/config.h | 49 ++++++++ keyboards/handwired/dactyl_cc/dactyl_cc.h | 46 ++++++++ keyboards/handwired/dactyl_cc/info.json | 105 ++++++++++++++++++ .../dactyl_cc/keymaps/default/keymap.c | 51 +++++++++ .../handwired/dactyl_cc/keymaps/via/keymap.c | 78 +++++++++++++ .../handwired/dactyl_cc/keymaps/via/rules.mk | 1 + keyboards/handwired/dactyl_cc/readme.md | 47 ++++++++ 8 files changed, 380 insertions(+) create mode 100644 keyboards/handwired/dactyl_cc/config.h create mode 100644 keyboards/handwired/dactyl_cc/dactyl_cc.h create mode 100644 keyboards/handwired/dactyl_cc/info.json create mode 100644 keyboards/handwired/dactyl_cc/keymaps/default/keymap.c create mode 100644 keyboards/handwired/dactyl_cc/keymaps/via/keymap.c create mode 100644 keyboards/handwired/dactyl_cc/keymaps/via/rules.mk create mode 100644 keyboards/handwired/dactyl_cc/readme.md diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index f005bb34c399..5250e56747d5 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -200,6 +200,9 @@ "gmmk/pro/iso": { "target": "gmmk/pro/rev1/iso" }, + "handwired/ergo_s-1":{ + "target": "handwired/dactyl_cc" + } "handwired/ferris": { "target": "ferris/0_1" }, diff --git a/keyboards/handwired/dactyl_cc/config.h b/keyboards/handwired/dactyl_cc/config.h new file mode 100644 index 000000000000..94d0548adcbb --- /dev/null +++ b/keyboards/handwired/dactyl_cc/config.h @@ -0,0 +1,49 @@ +/* +Copyright 2023 QMK + +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 + +/* mouse config */ +#define MOUSEKEY_DELAY 0 +// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 7 +#define MOUSEKEY_WHEEL_DELAY 0 + +/* layer config */ +#define TAPPING_TOGGLE 1 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Enables This makes it easier for fast typists to use dual-function keys */ +#define PERMISSIVE_HOLD + +// Feature disable options +// These options are also useful to firmware size reduction. + +/* disable print */ +// #define NO_DEBUG +// #define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/dactyl_cc/dactyl_cc.h b/keyboards/handwired/dactyl_cc/dactyl_cc.h new file mode 100644 index 000000000000..aab1362020fe --- /dev/null +++ b/keyboards/handwired/dactyl_cc/dactyl_cc.h @@ -0,0 +1,46 @@ +/* +Copyright 2023 QMK + +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 + +#include "quantum.h" + +#define LAYOUT_dactylk(\ + 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, \ + L41, L42, L43, L44, R41, R42, R43, R44, \ + L55, L54, R51, R50, \ + L53, R52, \ + L50, L51, L52, R53, R54, R55 \ + )\ + {\ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { KC_NO, L41, L42, L43, L44, KC_NO }, \ + { L50, L51, L52, L53, L54, L55 }, \ +\ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { R30, R31, R32, R33, R34, R35 }, \ + { KC_NO, R41, R42, R43, R44, KC_NO }, \ + { R50, R51, R52, R53, R54, R55 } \ +} diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json new file mode 100644 index 000000000000..fedf4f1a7c64 --- /dev/null +++ b/keyboards/handwired/dactyl_cc/info.json @@ -0,0 +1,105 @@ +{ + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": false + }, + "keyboard_name": "Dactyl CC", + "manufacturer": "mjohns", + "url": "https://github.com/mjohns/dactyl-cc", + "maintainer": "qmk", + "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" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "development_board": "promicro", + "layouts": { + "LAYOUT_dactylk": { + "layout": [ + {"label":"L00", "x":0, "y":0}, + {"label":"L01", "x":1, "y":0}, + {"label":"L02", "x":2, "y":0}, + {"label":"L03", "x":3, "y":0}, + {"label":"L04", "x":4, "y":0}, + {"label":"L05", "x":5, "y":0}, + {"label":"R00", "x":11, "y":0}, + {"label":"R01", "x":12, "y":0}, + {"label":"R02", "x":13, "y":0}, + {"label":"R03", "x":14, "y":0}, + {"label":"R04", "x":15, "y":0}, + {"label":"R05", "x":16, "y":0}, + {"label":"L10", "x":0, "y":1}, + {"label":"L11", "x":1, "y":1}, + {"label":"L12", "x":2, "y":1}, + {"label":"L13", "x":3, "y":1}, + {"label":"L14", "x":4, "y":1}, + {"label":"L15", "x":5, "y":1}, + {"label":"R10", "x":11, "y":1}, + {"label":"R11", "x":12, "y":1}, + {"label":"R12", "x":13, "y":1}, + {"label":"R13", "x":14, "y":1}, + {"label":"R14", "x":15, "y":1}, + {"label":"R15", "x":16, "y":1}, + {"label":"L20", "x":0, "y":2}, + {"label":"L21", "x":1, "y":2}, + {"label":"L22", "x":2, "y":2}, + {"label":"L23", "x":3, "y":2}, + {"label":"L24", "x":4, "y":2}, + {"label":"L25", "x":5, "y":2}, + {"label":"R20", "x":11, "y":2}, + {"label":"R21", "x":12, "y":2}, + {"label":"R22", "x":13, "y":2}, + {"label":"R23", "x":14, "y":2}, + {"label":"R24", "x":15, "y":2}, + {"label":"R25", "x":16, "y":2}, + {"label":"L30", "x":0, "y":3}, + {"label":"L31", "x":1, "y":3}, + {"label":"L32", "x":2, "y":3}, + {"label":"L33", "x":3, "y":3}, + {"label":"L34", "x":4, "y":3}, + {"label":"L35", "x":5, "y":3}, + {"label":"R30", "x":11, "y":3}, + {"label":"R31", "x":12, "y":3}, + {"label":"R32", "x":13, "y":3}, + {"label":"R33", "x":14, "y":3}, + {"label":"R34", "x":15, "y":3}, + {"label":"R35", "x":16, "y":3}, + {"label":"L41", "x":1, "y":4}, + {"label":"L42", "x":2, "y":4}, + {"label":"L43", "x":3, "y":4}, + {"label":"L44", "x":4, "y":4}, + {"label":"R41", "x":12, "y":4}, + {"label":"R42", "x":13, "y":4}, + {"label":"R43", "x":14, "y":4}, + {"label":"R44", "x":15, "y":4}, + {"label":"L55", "x":6, "y":5}, + {"label":"L54", "x":7, "y":5}, + {"label":"R51", "x":9, "y":5}, + {"label":"R50", "x":10, "y":5}, + {"label":"L53", "x":7, "y":6}, + {"label":"R52", "x":9, "y":6}, + {"label":"L50", "x":5, "y":7, "h":2}, + {"label":"L51", "x":6, "y":7, "h":2}, + {"label":"L52", "x":7, "y":7}, + {"label":"R53", "x":9, "y":7}, + {"label":"R54", "x":10, "y":7, "h":2}, + {"label":"R55", "x":11, "y":7, "h":2} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c new file mode 100644 index 000000000000..71372e4a3b86 --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c @@ -0,0 +1,51 @@ +/* +Copyright 2023 QMK + +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, + NAV +}; + +#define CTL_ESC LCTL_T(KC_ESC) +#define CTL_CAP LCTL_T(KC_CAPS) +#define ALT_BSP LALT_T(KC_BSPC) +#define LT_SCLN LT(NAV, KC_SCLN) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_dactylk( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + TT(NAV), KC_DEL, KC_PGUP, KC_RCTL, + KC_LGUI, KC_PGDN, + KC_BSPC, CTL_ESC, KC_LALT, KC_RALT, KC_ENT, KC_SPC + ), + [NAV] = LAYOUT_dactylk( + QK_BOOT, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_BRIU, KC_P7, KC_P8, KC_P9, KC_NO, QK_BOOT, + _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_PAST, KC_PCMM, KC_P0, KC_PDOT, KC_PENT, _______, + KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + _______, _______, KC_HOME, _______, + _______, KC_END, + KC_BTN1, KC_BTN2, _______, ALT_BSP, _______, _______ + ) +}; \ No newline at end of file diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c new file mode 100644 index 000000000000..b80d401be480 --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -0,0 +1,78 @@ +/* +Copyright 2023 QMK + +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, + _NAV, + _SYS, + _BLANK +}; + +#define LT_1BSP LT(1, KC_BSPC) +#define LT_2SPC LT(2, KC_SPC) +#define MH_DEL MEH_T(KC_DEL) +#define HY_ENT HYPR_T(KC_ENT) +#define CA_PGDN LCA_T(KC_PGDN) +#define CAG_END LCAG_T(KC_END) +#define AG_PGUP LAG_T(KC_PGUP) +#define CG_HOME MT(MOD_LGUI | MOD_LCTL, KC_HOME) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_dactylk( + 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_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL, + CG_HOME, AG_PGUP, + LT_1BSP, MH_DEL, CAG_END, CA_PGDN, HY_ENT, LT_2SPC + ), + [_NAV] = LAYOUT_dactylk( + _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, + _______, _______, _______, _______, _______, _______, KC_PDOT, KC_PENT, + _______, _______, _______, KC_P0, + _______, _______, + _______, _______, _______, _______, _______, MO(3) + ), + [_SYS] = LAYOUT_dactylk( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, QK_F12, + _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, + _______, KC_MUTE, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_PSCR, KC_PAUS, KC_INS, KC_SCRL, _______, + _______, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, + _______, _______, _______, _______, _______, _______, KC_NO, KC_NO, + _______, _______, _______, _______, + _______, _______, + KC_BTN1, KC_BTN2, _______, _______, _______, _______ + + ), + [_BLANK] = LAYOUT_dactylk( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_SLEP, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + ) +}; \ No newline at end of file diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/rules.mk b/keyboards/handwired/dactyl_cc/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md new file mode 100644 index 000000000000..569bb2f6b07c --- /dev/null +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -0,0 +1,47 @@ +# Dactyl-CC / Ergo S-1 + +![DactylCC](https://i.imgur.com/CUbPLZC.jpeg) +*Dactyl-CC* + +![ErgoS-1](https://wizardkeyboards.com/wp-content/uploads/2021/11/20211108_233645-1024x498.jpg) +*Ergo S-1* + +* Hardware Supported: Pro micro controller or clones of + +## Dactyl-CC +* Keyboard Maintainer: [Michael Johns](https://github.com/mjohns) +* Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc) + +Make example for this keyboard (after setting up your build environment): +``` + make handwired/dactyl_cc:default +``` +Flashing example for this keyboard: +``` + make handwired/dactyl_cc:default:flash +``` + +## Ergo S-1 +* Keyboard Maintainer: [Andrew Wells](https://github.com/wizarddata) +* Hardware Availability: [Ergo S-1 GitHub](https://github.com/wizarddata/Ergo-S-1) + +`handwired/ergo_s-1` is an alias of `handwired/dactly_cc` + +Make example for this keyboard (after setting up your build environment): +``` + make handwired/ergo_s-1:default +``` +Flashing example for this keyboard: +``` + make handwired/ergo_s-1: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**: 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 48ca0d81b8439b63cbc0405e22a57f0970957a10 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 20 Apr 2023 15:44:06 +0100 Subject: [PATCH 02/28] Update `readme.md` --- keyboards/handwired/dactyl_cc/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 569bb2f6b07c..2d7ae80e5dbe 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -6,9 +6,13 @@ ![ErgoS-1](https://wizardkeyboards.com/wp-content/uploads/2021/11/20211108_233645-1024x498.jpg) *Ergo S-1* +Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opted to psychically split the handed key-wells instead. + +Electronically both the Dactyl-CC and Ergo S-1 are indentical, though psychically the Ergo S-1 has larger casing designed to be used as a palm rest. + * Hardware Supported: Pro micro controller or clones of -## Dactyl-CC +### Dactyl-CC * Keyboard Maintainer: [Michael Johns](https://github.com/mjohns) * Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc) @@ -21,11 +25,11 @@ Flashing example for this keyboard: make handwired/dactyl_cc:default:flash ``` -## Ergo S-1 +### Ergo S-1 * Keyboard Maintainer: [Andrew Wells](https://github.com/wizarddata) * Hardware Availability: [Ergo S-1 GitHub](https://github.com/wizarddata/Ergo-S-1) -`handwired/ergo_s-1` is an alias of `handwired/dactly_cc` +*`handwired/ergo_s-1` is an alias of `handwired/dactly_cc`* Make example for this keyboard (after setting up your build environment): ``` From a53c27216b44c5a00f984f808380923dec60ec9b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Thu, 20 Apr 2023 16:16:21 +0100 Subject: [PATCH 03/28] added new line EOF --- keyboards/handwired/dactyl_cc/info.json | 2 +- keyboards/handwired/dactyl_cc/keymaps/default/keymap.c | 2 +- keyboards/handwired/dactyl_cc/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index fedf4f1a7c64..b827cd70fb53 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -102,4 +102,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c index 71372e4a3b86..255f65610a2e 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c @@ -48,4 +48,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_END, KC_BTN1, KC_BTN2, _______, ALT_BSP, _______, _______ ) -}; \ No newline at end of file +}; diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c index b80d401be480..1c19e4753a38 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -75,4 +75,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, ) -}; \ No newline at end of file +}; From c1cb81e4eb8877595c154f5446f7f3aa02bc46f3 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Thu, 20 Apr 2023 16:28:15 +0100 Subject: [PATCH 04/28] Update readme.md --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 2d7ae80e5dbe..0f6aef7152b4 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -6,7 +6,7 @@ ![ErgoS-1](https://wizardkeyboards.com/wp-content/uploads/2021/11/20211108_233645-1024x498.jpg) *Ergo S-1* -Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opted to psychically split the handed key-wells instead. +Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. Electronically both the Dactyl-CC and Ergo S-1 are indentical, though psychically the Ergo S-1 has larger casing designed to be used as a palm rest. From b091198b66f18e3f061d7110137574b5d366bd88 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 21 Apr 2023 10:59:11 +0100 Subject: [PATCH 05/28] moved to data driven layout - .h removed - `layout` element in `info.json` added with matrices and .h like labels --- keyboards/handwired/dactyl_cc/dactyl_cc.h | 46 -------- keyboards/handwired/dactyl_cc/info.json | 136 +++++++++++----------- 2 files changed, 68 insertions(+), 114 deletions(-) delete mode 100644 keyboards/handwired/dactyl_cc/dactyl_cc.h diff --git a/keyboards/handwired/dactyl_cc/dactyl_cc.h b/keyboards/handwired/dactyl_cc/dactyl_cc.h deleted file mode 100644 index aab1362020fe..000000000000 --- a/keyboards/handwired/dactyl_cc/dactyl_cc.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright 2023 QMK - -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 - -#include "quantum.h" - -#define LAYOUT_dactylk(\ - 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, \ - L41, L42, L43, L44, R41, R42, R43, R44, \ - L55, L54, R51, R50, \ - L53, R52, \ - L50, L51, L52, R53, R54, R55 \ - )\ - {\ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, L41, L42, L43, L44, KC_NO }, \ - { L50, L51, L52, L53, L54, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { KC_NO, R41, R42, R43, R44, KC_NO }, \ - { R50, R51, R52, R53, R54, R55 } \ -} diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index b827cd70fb53..99a9d7966265 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -31,74 +31,74 @@ "layouts": { "LAYOUT_dactylk": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"R30", "x":11, "y":3}, - {"label":"R31", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R33", "x":14, "y":3}, - {"label":"R34", "x":15, "y":3}, - {"label":"R35", "x":16, "y":3}, - {"label":"L41", "x":1, "y":4}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":3, "y":4}, - {"label":"L44", "x":4, "y":4}, - {"label":"R41", "x":12, "y":4}, - {"label":"R42", "x":13, "y":4}, - {"label":"R43", "x":14, "y":4}, - {"label":"R44", "x":15, "y":4}, - {"label":"L55", "x":6, "y":5}, - {"label":"L54", "x":7, "y":5}, - {"label":"R51", "x":9, "y":5}, - {"label":"R50", "x":10, "y":5}, - {"label":"L53", "x":7, "y":6}, - {"label":"R52", "x":9, "y":6}, - {"label":"L50", "x":5, "y":7, "h":2}, - {"label":"L51", "x":6, "y":7, "h":2}, - {"label":"L52", "x":7, "y":7}, - {"label":"R53", "x":9, "y":7}, - {"label":"R54", "x":10, "y":7, "h":2}, - {"label":"R55", "x":11, "y":7, "h":2} + {"matrix": [0, 0], "label":"L00", "x":0, "y":0}, + {"matrix": [0, 1], "label":"L01", "x":1, "y":0}, + {"matrix": [0, 2], "label":"L02", "x":2, "y":0}, + {"matrix": [0, 3], "label":"L03", "x":3, "y":0}, + {"matrix": [0, 4], "label":"L04", "x":4, "y":0}, + {"matrix": [0, 5], "label":"L05", "x":5, "y":0}, + {"matrix": [6, 0], "label":"R00", "x":11, "y":0}, + {"matrix": [6, 1], "label":"R01", "x":12, "y":0}, + {"matrix": [6, 2], "label":"R02", "x":13, "y":0}, + {"matrix": [6, 3], "label":"R03", "x":14, "y":0}, + {"matrix": [6, 4], "label":"R04", "x":15, "y":0}, + {"matrix": [6, 5], "label":"R05", "x":16, "y":0}, + {"matrix": [1, 0], "label":"L10", "x":0, "y":1}, + {"matrix": [1, 1], "label":"L11", "x":1, "y":1}, + {"matrix": [1, 2], "label":"L12", "x":2, "y":1}, + {"matrix": [1, 3], "label":"L13", "x":3, "y":1}, + {"matrix": [1, 4], "label":"L14", "x":4, "y":1}, + {"matrix": [1, 5], "label":"L15", "x":5, "y":1}, + {"matrix": [7, 0], "label":"R10", "x":11, "y":1}, + {"matrix": [7, 1], "label":"R11", "x":12, "y":1}, + {"matrix": [7, 2], "label":"R12", "x":13, "y":1}, + {"matrix": [7, 3], "label":"R13", "x":14, "y":1}, + {"matrix": [7, 4], "label":"R14", "x":15, "y":1}, + {"matrix": [7, 5], "label":"R15", "x":16, "y":1}, + {"matrix": [2, 0], "label":"L20", "x":0, "y":2}, + {"matrix": [2, 1], "label":"L21", "x":1, "y":2}, + {"matrix": [2, 2], "label":"L22", "x":2, "y":2}, + {"matrix": [2, 3], "label":"L23", "x":3, "y":2}, + {"matrix": [2, 4], "label":"L24", "x":4, "y":2}, + {"matrix": [2, 5], "label":"L25", "x":5, "y":2}, + {"matrix": [8, 0], "label":"R20", "x":11, "y":2}, + {"matrix": [8, 1], "label":"R21", "x":12, "y":2}, + {"matrix": [8, 2], "label":"R22", "x":13, "y":2}, + {"matrix": [8, 3], "label":"R23", "x":14, "y":2}, + {"matrix": [8, 4], "label":"R24", "x":15, "y":2}, + {"matrix": [8, 5], "label":"R25", "x":16, "y":2}, + {"matrix": [3, 0], "label":"L30", "x":0, "y":3}, + {"matrix": [3, 1], "label":"L31", "x":1, "y":3}, + {"matrix": [3, 2], "label":"L32", "x":2, "y":3}, + {"matrix": [3, 3], "label":"L33", "x":3, "y":3}, + {"matrix": [3, 4], "label":"L34", "x":4, "y":3}, + {"matrix": [3, 5], "label":"L35", "x":5, "y":3}, + {"matrix": [9, 0], "label":"R30", "x":11, "y":3}, + {"matrix": [9, 1], "label":"R31", "x":12, "y":3}, + {"matrix": [9, 2], "label":"R32", "x":13, "y":3}, + {"matrix": [9, 3], "label":"R33", "x":14, "y":3}, + {"matrix": [9, 4], "label":"R34", "x":15, "y":3}, + {"matrix": [9, 5], "label":"R35", "x":16, "y":3}, + {"matrix": [4, 0], "label":"L40", "x":1, "y":4}, + {"matrix": [4, 1], "label":"L41", "x":2, "y":4}, + {"matrix": [4, 2], "label":"L42", "x":3, "y":4}, + {"matrix": [4, 3], "label":"L43", "x":4, "y":4}, + {"matrix": [10, 2], "label":"R42", "x":12, "y":4}, + {"matrix": [10, 3], "label":"R43", "x":13, "y":4}, + {"matrix": [10, 4], "label":"R44", "x":14, "y":4}, + {"matrix": [10, 5], "label":"R45", "x":15, "y":4}, + {"matrix": [4, 4], "label":"L44", "x":6, "y":5}, + {"matrix": [4, 5], "label":"L45", "x":7, "y":5}, + {"matrix": [10, 0], "label":"R40", "x":9, "y":5}, + {"matrix": [10, 1], "label":"R41", "x":10, "y":5}, + {"matrix": [5, 5], "label":"L55", "x":7, "y":6}, + {"matrix": [11, 0], "label":"R50", "x":9, "y":6}, + {"matrix": [5, 2], "label":"L52", "x":5, "y":7, "h":2}, + {"matrix": [5, 3], "label":"L52", "x":6, "y":7, "h":2}, + {"matrix": [5, 4], "label":"L54", "x":7, "y":7}, + {"matrix": [11, 1], "label":"R51", "x":9, "y":7}, + {"matrix": [11, 2], "label":"R52", "x":10, "y":7, "h":2}, + {"matrix": [11, 3], "label":"R53", "x":11, "y":7, "h":2} ] } } From bf15fd8e7af4935144f04fe666edb05bb704f18e Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:38:32 +0100 Subject: [PATCH 06/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Drashna Jaelre --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 0f6aef7152b4..c3e5ad8e2a7f 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -1,6 +1,6 @@ # Dactyl-CC / Ergo S-1 -![DactylCC](https://i.imgur.com/CUbPLZC.jpeg) +![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) *Dactyl-CC* ![ErgoS-1](https://wizardkeyboards.com/wp-content/uploads/2021/11/20211108_233645-1024x498.jpg) From c39b784d178eb948ad48f9ed873a8019ccfce1f5 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:39:22 +0100 Subject: [PATCH 07/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Drashna Jaelre --- keyboards/handwired/dactyl_cc/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index c3e5ad8e2a7f..2cb786f345de 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -17,13 +17,13 @@ Electronically both the Dactyl-CC and Ergo S-1 are indentical, though psychicall * Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc) Make example for this keyboard (after setting up your build environment): -``` + make handwired/dactyl_cc:default -``` + Flashing example for this keyboard: -``` + make handwired/dactyl_cc:default:flash -``` + ### Ergo S-1 * Keyboard Maintainer: [Andrew Wells](https://github.com/wizarddata) From 676c4be5c682ca7a0a3c8781c0401e3d31e7300f Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:39:52 +0100 Subject: [PATCH 08/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Drashna Jaelre --- keyboards/handwired/dactyl_cc/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 2cb786f345de..65304ddb7102 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -32,13 +32,13 @@ Flashing example for this keyboard: *`handwired/ergo_s-1` is an alias of `handwired/dactly_cc`* Make example for this keyboard (after setting up your build environment): -``` + make handwired/ergo_s-1:default -``` + Flashing example for this keyboard: -``` + make handwired/ergo_s-1: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). From 5c058f9a2db275f69d0c47655e0c33e994a8ef5d Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sat, 6 May 2023 10:10:25 +0100 Subject: [PATCH 09/28] Update readme.md changed S-1 image to different hosted domain --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 65304ddb7102..25afd1944077 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -3,7 +3,7 @@ ![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) *Dactyl-CC* -![ErgoS-1](https://wizardkeyboards.com/wp-content/uploads/2021/11/20211108_233645-1024x498.jpg) +![ErgoS-1](https://kbd.news/pic/2022/81/1470.jpg) *Ergo S-1* Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. From 0808c0e014f324e11b1cafcfa3723c997d6bb986 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 7 May 2023 13:15:02 +0100 Subject: [PATCH 10/28] Update readme.md changed image URL for Ergo S-1 --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 25afd1944077..921b79602256 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -3,7 +3,7 @@ ![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) *Dactyl-CC* -![ErgoS-1](https://kbd.news/pic/2022/81/1470.jpg) +![ErgoS-1](https://i.imgur.com/JTLCw3N.jpg) *Ergo S-1* Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. From f24cb89778e45eb9f13ae8048b9a97f8810591d2 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 7 May 2023 13:20:30 +0100 Subject: [PATCH 11/28] Update readme.md --- keyboards/handwired/dactyl_cc/readme.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 921b79602256..a76a665c8a76 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -12,7 +12,7 @@ Electronically both the Dactyl-CC and Ergo S-1 are indentical, though psychicall * Hardware Supported: Pro micro controller or clones of -### Dactyl-CC +## Dactyl-CC * Keyboard Maintainer: [Michael Johns](https://github.com/mjohns) * Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc) @@ -24,8 +24,7 @@ Flashing example for this keyboard: make handwired/dactyl_cc:default:flash - -### Ergo S-1 +## Ergo S-1 * Keyboard Maintainer: [Andrew Wells](https://github.com/wizarddata) * Hardware Availability: [Ergo S-1 GitHub](https://github.com/wizarddata/Ergo-S-1) @@ -39,7 +38,6 @@ Flashing example for this keyboard: make handwired/ergo_s-1: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 From 3f7b38a4ecfd8352c765f291c8d11a1460aa6321 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 7 May 2023 18:29:14 +0100 Subject: [PATCH 12/28] Update readme.md --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index a76a665c8a76..03aaf5540a16 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -28,7 +28,7 @@ Flashing example for this keyboard: * Keyboard Maintainer: [Andrew Wells](https://github.com/wizarddata) * Hardware Availability: [Ergo S-1 GitHub](https://github.com/wizarddata/Ergo-S-1) -*`handwired/ergo_s-1` is an alias of `handwired/dactly_cc`* +*`handwired/ergo_s-1` is an alias of `handwired/dactyl_cc`* Make example for this keyboard (after setting up your build environment): From b706967db0abd3fe0377ae7eaddf96574602ae68 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 7 May 2023 18:52:10 +0100 Subject: [PATCH 13/28] Update keymap.c --- .../handwired/dactyl_cc/keymaps/via/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c index 1c19e4753a38..4d4d13ae3bcb 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAV] = LAYOUT_dactylk( _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, QK_BOOT, _______, _______, KC_SLEP, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, KC_PDOT, KC_PENT, _______, _______, _______, KC_P0, @@ -66,13 +66,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_BLANK] = LAYOUT_dactylk( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_SLEP, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, ) }; From d4105ed16964b5e5903877258cf65d034b4b5773 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 7 May 2023 18:56:13 +0100 Subject: [PATCH 14/28] Update keymap.c --- keyboards/handwired/dactyl_cc/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c index 4d4d13ae3bcb..7ca86b666607 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -55,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, MO(3) ), [_SYS] = LAYOUT_dactylk( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, QK_F12, + 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_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, _______, KC_MUTE, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_PSCR, KC_PAUS, KC_INS, KC_SCRL, _______, _______, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, - _______, _______, _______, _______, _______, _______, KC_NO, KC_NO, + _______, _______, _______, _______, _______, _______, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______ From e81520b9779851c4d826f99cce48d15739bd9a13 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Tue, 9 May 2023 11:06:28 +0100 Subject: [PATCH 15/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Drashna Jaelre --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 03aaf5540a16..d36e1a2aba44 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -3,7 +3,7 @@ ![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) *Dactyl-CC* -![ErgoS-1](https://i.imgur.com/JTLCw3N.jpg) +![ErgoS-1](https://i.imgur.com/JTLCw3Nh.jpg) *Ergo S-1* Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. From 60fd23381992e30f799ef39db2a5b400d45c58a7 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 9 May 2023 11:13:44 +0100 Subject: [PATCH 16/28] some `config.h` contents moved to keymap --- keyboards/handwired/dactyl_cc/config.h | 15 --------- .../dactyl_cc/keymaps/default/config.h | 33 +++++++++++++++++++ .../handwired/dactyl_cc/keymaps/via/config.h | 33 +++++++++++++++++++ 3 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 keyboards/handwired/dactyl_cc/keymaps/default/config.h create mode 100644 keyboards/handwired/dactyl_cc/keymaps/via/config.h diff --git a/keyboards/handwired/dactyl_cc/config.h b/keyboards/handwired/dactyl_cc/config.h index 94d0548adcbb..e93c706fd9dd 100644 --- a/keyboards/handwired/dactyl_cc/config.h +++ b/keyboards/handwired/dactyl_cc/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once -/* mouse config */ -#define MOUSEKEY_DELAY 0 -// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_MAX_SPEED 7 -#define MOUSEKEY_WHEEL_DELAY 0 - -/* layer config */ -#define TAPPING_TOGGLE 1 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -42,8 +32,3 @@ along with this program. If not, see . /* disable print */ // #define NO_DEBUG // #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/config.h b/keyboards/handwired/dactyl_cc/keymaps/default/config.h new file mode 100644 index 000000000000..58c2af08bbdb --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/default/config.h @@ -0,0 +1,33 @@ +/* +Copyright 2023 QMK + +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 + +/* mouse config */ +#define MOUSEKEY_DELAY 0 +// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 7 +#define MOUSEKEY_WHEEL_DELAY 0 + +/* layer config */ +#define TAPPING_TOGGLE 1 + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/config.h b/keyboards/handwired/dactyl_cc/keymaps/via/config.h new file mode 100644 index 000000000000..58c2af08bbdb --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/via/config.h @@ -0,0 +1,33 @@ +/* +Copyright 2023 QMK + +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 + +/* mouse config */ +#define MOUSEKEY_DELAY 0 +// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 7 +#define MOUSEKEY_WHEEL_DELAY 0 + +/* layer config */ +#define TAPPING_TOGGLE 1 + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT From 98ada8d31b2a7103ff90e0a559139e943b90ae68 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 9 May 2023 12:14:57 +0100 Subject: [PATCH 17/28] LAYOUT name reverted --- keyboards/handwired/dactyl_cc/info.json | 17 ++++++++++++++++- .../dactyl_cc/keymaps/default/keymap.c | 4 ++-- .../handwired/dactyl_cc/keymaps/via/keymap.c | 8 ++++---- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index 99a9d7966265..9157b468bcfe 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -29,7 +29,7 @@ "bootloader": "caterina", "development_board": "promicro", "layouts": { - "LAYOUT_dactylk": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "label":"L00", "x":0, "y":0}, {"matrix": [0, 1], "label":"L01", "x":1, "y":0}, @@ -37,65 +37,80 @@ {"matrix": [0, 3], "label":"L03", "x":3, "y":0}, {"matrix": [0, 4], "label":"L04", "x":4, "y":0}, {"matrix": [0, 5], "label":"L05", "x":5, "y":0}, + {"matrix": [6, 0], "label":"R00", "x":11, "y":0}, {"matrix": [6, 1], "label":"R01", "x":12, "y":0}, {"matrix": [6, 2], "label":"R02", "x":13, "y":0}, {"matrix": [6, 3], "label":"R03", "x":14, "y":0}, {"matrix": [6, 4], "label":"R04", "x":15, "y":0}, {"matrix": [6, 5], "label":"R05", "x":16, "y":0}, + {"matrix": [1, 0], "label":"L10", "x":0, "y":1}, {"matrix": [1, 1], "label":"L11", "x":1, "y":1}, {"matrix": [1, 2], "label":"L12", "x":2, "y":1}, {"matrix": [1, 3], "label":"L13", "x":3, "y":1}, {"matrix": [1, 4], "label":"L14", "x":4, "y":1}, {"matrix": [1, 5], "label":"L15", "x":5, "y":1}, + {"matrix": [7, 0], "label":"R10", "x":11, "y":1}, {"matrix": [7, 1], "label":"R11", "x":12, "y":1}, {"matrix": [7, 2], "label":"R12", "x":13, "y":1}, {"matrix": [7, 3], "label":"R13", "x":14, "y":1}, {"matrix": [7, 4], "label":"R14", "x":15, "y":1}, {"matrix": [7, 5], "label":"R15", "x":16, "y":1}, + {"matrix": [2, 0], "label":"L20", "x":0, "y":2}, {"matrix": [2, 1], "label":"L21", "x":1, "y":2}, {"matrix": [2, 2], "label":"L22", "x":2, "y":2}, {"matrix": [2, 3], "label":"L23", "x":3, "y":2}, {"matrix": [2, 4], "label":"L24", "x":4, "y":2}, {"matrix": [2, 5], "label":"L25", "x":5, "y":2}, + {"matrix": [8, 0], "label":"R20", "x":11, "y":2}, {"matrix": [8, 1], "label":"R21", "x":12, "y":2}, {"matrix": [8, 2], "label":"R22", "x":13, "y":2}, {"matrix": [8, 3], "label":"R23", "x":14, "y":2}, {"matrix": [8, 4], "label":"R24", "x":15, "y":2}, {"matrix": [8, 5], "label":"R25", "x":16, "y":2}, + {"matrix": [3, 0], "label":"L30", "x":0, "y":3}, {"matrix": [3, 1], "label":"L31", "x":1, "y":3}, {"matrix": [3, 2], "label":"L32", "x":2, "y":3}, {"matrix": [3, 3], "label":"L33", "x":3, "y":3}, {"matrix": [3, 4], "label":"L34", "x":4, "y":3}, {"matrix": [3, 5], "label":"L35", "x":5, "y":3}, + {"matrix": [9, 0], "label":"R30", "x":11, "y":3}, {"matrix": [9, 1], "label":"R31", "x":12, "y":3}, {"matrix": [9, 2], "label":"R32", "x":13, "y":3}, {"matrix": [9, 3], "label":"R33", "x":14, "y":3}, {"matrix": [9, 4], "label":"R34", "x":15, "y":3}, {"matrix": [9, 5], "label":"R35", "x":16, "y":3}, + {"matrix": [4, 0], "label":"L40", "x":1, "y":4}, {"matrix": [4, 1], "label":"L41", "x":2, "y":4}, {"matrix": [4, 2], "label":"L42", "x":3, "y":4}, {"matrix": [4, 3], "label":"L43", "x":4, "y":4}, + {"matrix": [10, 2], "label":"R42", "x":12, "y":4}, {"matrix": [10, 3], "label":"R43", "x":13, "y":4}, {"matrix": [10, 4], "label":"R44", "x":14, "y":4}, {"matrix": [10, 5], "label":"R45", "x":15, "y":4}, + {"matrix": [4, 4], "label":"L44", "x":6, "y":5}, {"matrix": [4, 5], "label":"L45", "x":7, "y":5}, + {"matrix": [10, 0], "label":"R40", "x":9, "y":5}, {"matrix": [10, 1], "label":"R41", "x":10, "y":5}, + {"matrix": [5, 5], "label":"L55", "x":7, "y":6}, + {"matrix": [11, 0], "label":"R50", "x":9, "y":6}, + {"matrix": [5, 2], "label":"L52", "x":5, "y":7, "h":2}, {"matrix": [5, 3], "label":"L52", "x":6, "y":7, "h":2}, {"matrix": [5, 4], "label":"L54", "x":7, "y":7}, + {"matrix": [11, 1], "label":"R51", "x":9, "y":7}, {"matrix": [11, 2], "label":"R52", "x":10, "y":7, "h":2}, {"matrix": [11, 3], "label":"R53", "x":11, "y":7, "h":2} diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c index 255f65610a2e..775f1b141c89 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c @@ -28,7 +28,7 @@ enum layers { #define LT_SCLN LT(NAV, KC_SCLN) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_dactylk( + [BASE] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_SCLN, KC_QUOT, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_PGDN, KC_BSPC, CTL_ESC, KC_LALT, KC_RALT, KC_ENT, KC_SPC ), - [NAV] = LAYOUT_dactylk( + [NAV] = LAYOUT( QK_BOOT, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_BRIU, KC_P7, KC_P8, KC_P9, KC_NO, QK_BOOT, _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c index 7ca86b666607..55238800ee68 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -34,7 +34,7 @@ enum layers { #define CG_HOME MT(MOD_LGUI | MOD_LCTL, KC_HOME) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_dactylk( + [_BASE] = 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_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_SCLN, KC_QUOT, @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { CG_HOME, AG_PGUP, LT_1BSP, MH_DEL, CAG_END, CA_PGDN, HY_ENT, LT_2SPC ), - [_NAV] = LAYOUT_dactylk( + [_NAV] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, _______, QK_BOOT, _______, _______, KC_SLEP, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [_SYS] = LAYOUT_dactylk( + [_SYS] = 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_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, _______, KC_MUTE, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_PSCR, KC_PAUS, KC_INS, KC_SCRL, _______, @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_BTN1, KC_BTN2, _______, _______, _______, _______ ), - [_BLANK] = LAYOUT_dactylk( + [_BLANK] = LAYOUT( KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, From 5276fd57f036087089d206a2e5953f66ac392d43 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Wed, 10 May 2023 04:08:45 +0100 Subject: [PATCH 18/28] Update data/mappings/keyboard_aliases.hjson Co-authored-by: Ryan --- data/mappings/keyboard_aliases.hjson | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 5250e56747d5..f005bb34c399 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -200,9 +200,6 @@ "gmmk/pro/iso": { "target": "gmmk/pro/rev1/iso" }, - "handwired/ergo_s-1":{ - "target": "handwired/dactyl_cc" - } "handwired/ferris": { "target": "ferris/0_1" }, From 418087a3eb61c13db79f38cc9bff97319285f178 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Wed, 10 May 2023 04:08:57 +0100 Subject: [PATCH 19/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Ryan --- keyboards/handwired/dactyl_cc/readme.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index d36e1a2aba44..a0f031687029 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -24,20 +24,6 @@ Flashing example for this keyboard: make handwired/dactyl_cc:default:flash -## Ergo S-1 -* Keyboard Maintainer: [Andrew Wells](https://github.com/wizarddata) -* Hardware Availability: [Ergo S-1 GitHub](https://github.com/wizarddata/Ergo-S-1) - -*`handwired/ergo_s-1` is an alias of `handwired/dactyl_cc`* - -Make example for this keyboard (after setting up your build environment): - - make handwired/ergo_s-1:default - -Flashing example for this keyboard: - - make handwired/ergo_s-1: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 From 3e408d3a61e712386fa1e9461bae61b657b791f9 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Wed, 10 May 2023 04:09:06 +0100 Subject: [PATCH 20/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Ryan --- keyboards/handwired/dactyl_cc/readme.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index a0f031687029..4effe63c0eca 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -1,15 +1,9 @@ # Dactyl-CC / Ergo S-1 ![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) -*Dactyl-CC* - -![ErgoS-1](https://i.imgur.com/JTLCw3Nh.jpg) -*Ergo S-1* Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. -Electronically both the Dactyl-CC and Ergo S-1 are indentical, though psychically the Ergo S-1 has larger casing designed to be used as a palm rest. - * Hardware Supported: Pro micro controller or clones of ## Dactyl-CC From ea51d8f1b85ebb1d3cd0e269e99c2b22a638442f Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Wed, 10 May 2023 04:09:26 +0100 Subject: [PATCH 21/28] Update keyboards/handwired/dactyl_cc/readme.md Co-authored-by: Ryan --- keyboards/handwired/dactyl_cc/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 4effe63c0eca..f660e439c02b 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -5,8 +5,6 @@ Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. * Hardware Supported: Pro micro controller or clones of - -## Dactyl-CC * Keyboard Maintainer: [Michael Johns](https://github.com/mjohns) * Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc) From 054d48981f23587df5cefc4cd9bedd367ce3acc7 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Wed, 10 May 2023 04:15:15 +0100 Subject: [PATCH 22/28] Update readme.md --- keyboards/handwired/dactyl_cc/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index f660e439c02b..5c0bc9ba20d9 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -1,11 +1,11 @@ -# Dactyl-CC / Ergo S-1 +# Dactyl-CC ![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) -Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's function and program row, board(s) retain the finger and thumb key placements of the KA but opt to psychically split the handed key-wells instead. +Modelled on the *Kinesis Advantage* (KA) 1|2, though missing its function and program row, the *Dactyl CC* retains the finger and thumb key placements of the KA but opts to psychically split the handed key-wells. -* Hardware Supported: Pro micro controller or clones of * Keyboard Maintainer: [Michael Johns](https://github.com/mjohns) +* Hardware Supported: Pro micro controller or clones of * Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc) Make example for this keyboard (after setting up your build environment): From 737365b6014afabc3895118617ab054fe6e1bd3d Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 14 May 2023 12:17:18 +0100 Subject: [PATCH 23/28] Update keyboards/handwired/dactyl_cc/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/dactyl_cc/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index 9157b468bcfe..6ce1ea877274 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -25,8 +25,6 @@ "enabled": true, "soft_serial_pin": "D0" }, - "processor": "atmega32u4", - "bootloader": "caterina", "development_board": "promicro", "layouts": { "LAYOUT": { From 921ba75b5a93837e696dcce19928bd0121aa4958 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 20 May 2023 22:16:14 +0100 Subject: [PATCH 24/28] update info.json --- keyboards/handwired/dactyl_cc/info.json | 138 ++++++++++++------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index 6ce1ea877274..f389d5e878c4 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -29,89 +29,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "label":"L00", "x":0, "y":0}, - {"matrix": [0, 1], "label":"L01", "x":1, "y":0}, - {"matrix": [0, 2], "label":"L02", "x":2, "y":0}, - {"matrix": [0, 3], "label":"L03", "x":3, "y":0}, - {"matrix": [0, 4], "label":"L04", "x":4, "y":0}, - {"matrix": [0, 5], "label":"L05", "x":5, "y":0}, + {"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": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "y": 0}, - {"matrix": [6, 0], "label":"R00", "x":11, "y":0}, - {"matrix": [6, 1], "label":"R01", "x":12, "y":0}, - {"matrix": [6, 2], "label":"R02", "x":13, "y":0}, - {"matrix": [6, 3], "label":"R03", "x":14, "y":0}, - {"matrix": [6, 4], "label":"R04", "x":15, "y":0}, - {"matrix": [6, 5], "label":"R05", "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, 0], "label":"L10", "x":0, "y":1}, - {"matrix": [1, 1], "label":"L11", "x":1, "y":1}, - {"matrix": [1, 2], "label":"L12", "x":2, "y":1}, - {"matrix": [1, 3], "label":"L13", "x":3, "y":1}, - {"matrix": [1, 4], "label":"L14", "x":4, "y":1}, - {"matrix": [1, 5], "label":"L15", "x":5, "y":1}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "y": 1}, - {"matrix": [7, 0], "label":"R10", "x":11, "y":1}, - {"matrix": [7, 1], "label":"R11", "x":12, "y":1}, - {"matrix": [7, 2], "label":"R12", "x":13, "y":1}, - {"matrix": [7, 3], "label":"R13", "x":14, "y":1}, - {"matrix": [7, 4], "label":"R14", "x":15, "y":1}, - {"matrix": [7, 5], "label":"R15", "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, 0], "label":"L20", "x":0, "y":2}, - {"matrix": [2, 1], "label":"L21", "x":1, "y":2}, - {"matrix": [2, 2], "label":"L22", "x":2, "y":2}, - {"matrix": [2, 3], "label":"L23", "x":3, "y":2}, - {"matrix": [2, 4], "label":"L24", "x":4, "y":2}, - {"matrix": [2, 5], "label":"L25", "x":5, "y":2}, + {"matrix": [8, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "y": 2}, - {"matrix": [8, 0], "label":"R20", "x":11, "y":2}, - {"matrix": [8, 1], "label":"R21", "x":12, "y":2}, - {"matrix": [8, 2], "label":"R22", "x":13, "y":2}, - {"matrix": [8, 3], "label":"R23", "x":14, "y":2}, - {"matrix": [8, 4], "label":"R24", "x":15, "y":2}, - {"matrix": [8, 5], "label":"R25", "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, 0], "label":"L30", "x":0, "y":3}, - {"matrix": [3, 1], "label":"L31", "x":1, "y":3}, - {"matrix": [3, 2], "label":"L32", "x":2, "y":3}, - {"matrix": [3, 3], "label":"L33", "x":3, "y":3}, - {"matrix": [3, 4], "label":"L34", "x":4, "y":3}, - {"matrix": [3, 5], "label":"L35", "x":5, "y":3}, + {"matrix": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "y": 3}, - {"matrix": [9, 0], "label":"R30", "x":11, "y":3}, - {"matrix": [9, 1], "label":"R31", "x":12, "y":3}, - {"matrix": [9, 2], "label":"R32", "x":13, "y":3}, - {"matrix": [9, 3], "label":"R33", "x":14, "y":3}, - {"matrix": [9, 4], "label":"R34", "x":15, "y":3}, - {"matrix": [9, 5], "label":"R35", "x":16, "y":3}, + {"matrix": [4, 0], "x": 1, "y": 4}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4}, - {"matrix": [4, 0], "label":"L40", "x":1, "y":4}, - {"matrix": [4, 1], "label":"L41", "x":2, "y":4}, - {"matrix": [4, 2], "label":"L42", "x":3, "y":4}, - {"matrix": [4, 3], "label":"L43", "x":4, "y":4}, + {"matrix": [10, 2], "x": 12, "y": 4}, + {"matrix": [10, 3], "x": 13, "y": 4}, + {"matrix": [10, 4], "x": 14, "y": 4}, + {"matrix": [10, 5], "x": 15, "y": 4}, - {"matrix": [10, 2], "label":"R42", "x":12, "y":4}, - {"matrix": [10, 3], "label":"R43", "x":13, "y":4}, - {"matrix": [10, 4], "label":"R44", "x":14, "y":4}, - {"matrix": [10, 5], "label":"R45", "x":15, "y":4}, + {"matrix": [4, 4], "x": 6, "y": 5}, + {"matrix": [4, 5], "x": 7, "y": 5}, - {"matrix": [4, 4], "label":"L44", "x":6, "y":5}, - {"matrix": [4, 5], "label":"L45", "x":7, "y":5}, + {"matrix": [10, 0], "x": 9, "y": 5}, + {"matrix": [10, 1], "x": 10, "y": 5}, - {"matrix": [10, 0], "label":"R40", "x":9, "y":5}, - {"matrix": [10, 1], "label":"R41", "x":10, "y":5}, - - {"matrix": [5, 5], "label":"L55", "x":7, "y":6}, + {"matrix": [5, 5], "x": 7, "y": 6}, - {"matrix": [11, 0], "label":"R50", "x":9, "y":6}, + {"matrix": [11, 0], "x": 9, "y": 6}, - {"matrix": [5, 2], "label":"L52", "x":5, "y":7, "h":2}, - {"matrix": [5, 3], "label":"L52", "x":6, "y":7, "h":2}, - {"matrix": [5, 4], "label":"L54", "x":7, "y":7}, + {"matrix": [5, 2], "x": 5, "y": 7, "h": 2}, + {"matrix": [5, 3], "x": 6, "y": 7, "h": 2}, + {"matrix": [5, 4], "x": 7, "y": 7}, - {"matrix": [11, 1], "label":"R51", "x":9, "y":7}, - {"matrix": [11, 2], "label":"R52", "x":10, "y":7, "h":2}, - {"matrix": [11, 3], "label":"R53", "x":11, "y":7, "h":2} + {"matrix": [11, 1], "x": 9, "y": 7}, + {"matrix": [11, 2], "x": 10, "y": 7, "h": 2}, + {"matrix": [11, 3], "x": 11, "y": 7, "h": 2} ] } } From 8ed17867dc15a7f2e0f81f24d0d6ef9ed436d035 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 31 May 2023 12:12:54 +0100 Subject: [PATCH 25/28] update info.json --- keyboards/handwired/dactyl_cc/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index f389d5e878c4..5c30bb9776dc 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -105,13 +105,13 @@ {"matrix": [11, 0], "x": 9, "y": 6}, - {"matrix": [5, 2], "x": 5, "y": 7, "h": 2}, - {"matrix": [5, 3], "x": 6, "y": 7, "h": 2}, + {"matrix": [5, 2], "x": 5, "y": 6, "h": 2}, + {"matrix": [5, 3], "x": 6, "y": 6, "h": 2}, {"matrix": [5, 4], "x": 7, "y": 7}, {"matrix": [11, 1], "x": 9, "y": 7}, - {"matrix": [11, 2], "x": 10, "y": 7, "h": 2}, - {"matrix": [11, 3], "x": 11, "y": 7, "h": 2} + {"matrix": [11, 2], "x": 10, "y": 6, "h": 2}, + {"matrix": [11, 3], "x": 11, "y": 6, "h": 2} ] } } From e289a1b726769858e934fcdebdfc7dc936dcdb08 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 2 Jun 2023 22:25:04 +0100 Subject: [PATCH 26/28] keyboard directory tidied --- keyboards/handwired/dactyl_cc/config.h | 34 ---------- keyboards/handwired/dactyl_cc/info.json | 27 ++++---- .../dactyl_cc/keymaps/default/config.h | 23 +++---- .../dactyl_cc/keymaps/default/keymap.c | 46 +++++--------- .../handwired/dactyl_cc/keymaps/via/config.h | 23 +++---- .../handwired/dactyl_cc/keymaps/via/keymap.c | 62 +++++++------------ keyboards/handwired/dactyl_cc/rules.mk | 0 7 files changed, 71 insertions(+), 144 deletions(-) delete mode 100644 keyboards/handwired/dactyl_cc/config.h create mode 100644 keyboards/handwired/dactyl_cc/rules.mk diff --git a/keyboards/handwired/dactyl_cc/config.h b/keyboards/handwired/dactyl_cc/config.h deleted file mode 100644 index e93c706fd9dd..000000000000 --- a/keyboards/handwired/dactyl_cc/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2023 QMK - -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 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Enables This makes it easier for fast typists to use dual-function keys */ -#define PERMISSIVE_HOLD - -// Feature disable options -// These options are also useful to firmware size reduction. - -/* disable print */ -// #define NO_DEBUG -// #define NO_PRINT diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json index 5c30bb9776dc..ffaf326f21a8 100644 --- a/keyboards/handwired/dactyl_cc/info.json +++ b/keyboards/handwired/dactyl_cc/info.json @@ -1,4 +1,8 @@ { + "keyboard_name": "Dactyl CC", + "manufacturer": "mjohns", + "url": "https://github.com/mjohns/dactyl-cc", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x3060", @@ -12,19 +16,15 @@ "command": true, "nkro": false }, - "keyboard_name": "Dactyl CC", - "manufacturer": "mjohns", - "url": "https://github.com/mjohns/dactyl-cc", - "maintainer": "qmk", "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] }, - "diode_direction": "COL2ROW", - "split": { + "diode_direction": "COL2ROW", + "split": { "enabled": true, "soft_serial_pin": "D0" - }, + }, "development_board": "promicro", "layouts": { "LAYOUT": { @@ -101,17 +101,16 @@ {"matrix": [10, 0], "x": 9, "y": 5}, {"matrix": [10, 1], "x": 10, "y": 5}, - {"matrix": [5, 5], "x": 7, "y": 6}, - - {"matrix": [11, 0], "x": 9, "y": 6}, - {"matrix": [5, 2], "x": 5, "y": 6, "h": 2}, {"matrix": [5, 3], "x": 6, "y": 6, "h": 2}, - {"matrix": [5, 4], "x": 7, "y": 7}, + {"matrix": [5, 5], "x": 7, "y": 6}, - {"matrix": [11, 1], "x": 9, "y": 7}, + {"matrix": [11, 0], "x": 9, "y": 6}, {"matrix": [11, 2], "x": 10, "y": 6, "h": 2}, - {"matrix": [11, 3], "x": 11, "y": 6, "h": 2} + {"matrix": [11, 3], "x": 11, "y": 6, "h": 2}, + + {"matrix": [5, 4], "x": 7, "y": 7}, + {"matrix": [11, 1], "x": 9, "y": 7} ] } } diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/config.h b/keyboards/handwired/dactyl_cc/keymaps/default/config.h index 58c2af08bbdb..49d5477f0a71 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/default/config.h +++ b/keyboards/handwired/dactyl_cc/keymaps/default/config.h @@ -1,21 +1,16 @@ -/* -Copyright 2023 QMK +// Copyright 2022 mjohns +// SPDX-License-Identifier: GPL-2.0-or-later -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. +#pragma once -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. +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE -#pragma once +/* Enables This makes it easier for fast typists to use dual-function keys */ +#define PERMISSIVE_HOLD /* mouse config */ #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c index 775f1b141c89..6422699684c4 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c @@ -1,19 +1,5 @@ -/* -Copyright 2023 QMK - -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 . -*/ +// Copyright 2022 mjohns +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H @@ -29,23 +15,23 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TT(NAV), KC_DEL, KC_PGUP, KC_RCTL, - KC_LGUI, KC_PGDN, - KC_BSPC, CTL_ESC, KC_LALT, KC_RALT, KC_ENT, KC_SPC + KC_BSPC, CTL_ESC, KC_LGUI, KC_PGDN, KC_ENT, KC_SPC, + KC_LALT, KC_RALT ), [NAV] = LAYOUT( - QK_BOOT, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_BRIU, KC_P7, KC_P8, KC_P9, KC_NO, QK_BOOT, - _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, - _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, - KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_PAST, KC_PCMM, KC_P0, KC_PDOT, KC_PENT, _______, - KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_BRIU, KC_P7, KC_P8, KC_P9, KC_NO, QK_BOOT, + _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_PAST, KC_PCMM, KC_P0, KC_PDOT, KC_PENT, _______, + KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, - _______, KC_END, - KC_BTN1, KC_BTN2, _______, ALT_BSP, _______, _______ + KC_BTN1, KC_BTN2, _______, KC_END, _______, _______, + _______, ALT_BSP ) }; diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/config.h b/keyboards/handwired/dactyl_cc/keymaps/via/config.h index 58c2af08bbdb..49d5477f0a71 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/config.h +++ b/keyboards/handwired/dactyl_cc/keymaps/via/config.h @@ -1,21 +1,16 @@ -/* -Copyright 2023 QMK +// Copyright 2022 mjohns +// SPDX-License-Identifier: GPL-2.0-or-later -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. +#pragma once -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. +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE -#pragma once +/* Enables This makes it easier for fast typists to use dual-function keys */ +#define PERMISSIVE_HOLD /* mouse config */ #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c index 55238800ee68..a08843f27bec 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -1,19 +1,5 @@ -/* -Copyright 2023 QMK - -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 . -*/ +// Copyright 2022 mjohns +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H @@ -35,34 +21,34 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = 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_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + 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_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL, - CG_HOME, AG_PGUP, - LT_1BSP, MH_DEL, CAG_END, CA_PGDN, HY_ENT, LT_2SPC + LT_1BSP, MH_DEL, CG_HOME, AG_PGUP, HY_ENT, LT_2SPC, + CAG_END, CA_PGDN ), [_NAV] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, - _______, QK_BOOT, _______, _______, KC_SLEP, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, + _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, QK_BOOT, _______, _______, KC_SLEP, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, KC_PDOT, KC_PENT, - _______, _______, _______, KC_P0, - _______, _______, - _______, _______, _______, _______, _______, MO(3) + _______, _______, _______, KC_P0, + _______, _______, _______, _______, _______, MO(3), + _______, _______ ), [_SYS] = 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_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, + 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_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, _______, KC_MUTE, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_PSCR, KC_PAUS, KC_INS, KC_SCRL, _______, - _______, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, - _______, _______, _______, _______, _______, _______, KC_UP, KC_RGHT, + _______, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, KC_NO, KC_NO, KC_NO, KC_NO, _______, + _______, _______, _______, _______, _______, _______, KC_UP, KC_RGHT, _______, _______, _______, _______, - _______, _______, - KC_BTN1, KC_BTN2, _______, _______, _______, _______ + KC_BTN1, KC_BTN2, _______, _______, _______, _______, + _______, _______ ), [_BLANK] = LAYOUT( @@ -72,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO ) }; diff --git a/keyboards/handwired/dactyl_cc/rules.mk b/keyboards/handwired/dactyl_cc/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 From 2b62c2d3829d564e893eb4417d9d25277c6206b4 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Fri, 2 Jun 2023 23:05:03 +0100 Subject: [PATCH 27/28] Update keymap.c --- keyboards/handwired/dactyl_cc/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c index a08843f27bec..aad8656a06c6 100644 --- a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = 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_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_SCLN, KC_QUOT, + 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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL, From 91ec2425201729440ae92417791a72feb3dde38b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland <75046609+dunk2k@users.noreply.github.com> Date: Sun, 4 Jun 2023 12:38:14 +0100 Subject: [PATCH 28/28] Update readme.md --- keyboards/handwired/dactyl_cc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md index 5c0bc9ba20d9..580539639bd1 100644 --- a/keyboards/handwired/dactyl_cc/readme.md +++ b/keyboards/handwired/dactyl_cc/readme.md @@ -2,7 +2,7 @@ ![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg) -Modelled on the *Kinesis Advantage* (KA) 1|2, though missing its function and program row, the *Dactyl CC* retains the finger and thumb key placements of the KA but opts to psychically split the handed key-wells. +Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's combined function and program row, the *Dactyl CC* retains the finger and thumb key placements of the KA but opts to split board into physical halves. * Keyboard Maintainer: [Michael Johns](https://github.com/mjohns) * Hardware Supported: Pro micro controller or clones of