From 0d084a0a3e412154cc4a9bea554acf9f43562803 Mon Sep 17 00:00:00 2001 From: vin Date: Mon, 16 Oct 2023 15:48:42 -0400 Subject: [PATCH] replace colemad with workman TODO: Think of ways to use oneshot and tap-dances --- keyboards/crkbd/keymaps/colemad/readme.md | 122 ------------------ .../keymaps/{colemad => workman}/config.h | 2 +- .../keymaps/{colemad => workman}/glcdfont.c | 0 .../keymaps/{colemad => workman}/keycodes.h | 8 -- .../keymaps/{colemad => workman}/keymap.c | 20 +-- .../keymaps/{colemad => workman}/layers.h | 2 +- .../crkbd/keymaps/{colemad => workman}/oled.c | 0 .../crkbd/keymaps/{colemad => workman}/oled.h | 0 .../{colemad => workman}/process_records.c | 0 .../{colemad => workman}/process_records.h | 0 .../keymaps/{colemad => workman}/rules.mk | 0 11 files changed, 12 insertions(+), 142 deletions(-) delete mode 100644 keyboards/crkbd/keymaps/colemad/readme.md rename keyboards/crkbd/keymaps/{colemad => workman}/config.h (86%) rename keyboards/crkbd/keymaps/{colemad => workman}/glcdfont.c (100%) rename keyboards/crkbd/keymaps/{colemad => workman}/keycodes.h (66%) rename keyboards/crkbd/keymaps/{colemad => workman}/keymap.c (84%) rename keyboards/crkbd/keymaps/{colemad => workman}/layers.h (92%) rename keyboards/crkbd/keymaps/{colemad => workman}/oled.c (100%) rename keyboards/crkbd/keymaps/{colemad => workman}/oled.h (100%) rename keyboards/crkbd/keymaps/{colemad => workman}/process_records.c (100%) rename keyboards/crkbd/keymaps/{colemad => workman}/process_records.h (100%) rename keyboards/crkbd/keymaps/{colemad => workman}/rules.mk (100%) diff --git a/keyboards/crkbd/keymaps/colemad/readme.md b/keyboards/crkbd/keymaps/colemad/readme.md deleted file mode 100644 index fd216bea36..0000000000 --- a/keyboards/crkbd/keymaps/colemad/readme.md +++ /dev/null @@ -1,122 +0,0 @@ -# **COLEMAD** - -Compiled and tested: `July 12, 2023` - -## Corne Keyboard (CRKBD) **Colemak** layout by [ACortesDev](https://github.com/ACortesDev) - -1. **Ergonomic navigation keys**. -2. **Symbols where expected to be**. -3. **Numbers (numpad)**. - Using the Telephone/ATM numpad layout. Easier to memorize/visualize as numbers follow *left-to-right, top-to-bottom* order. -4. **Easy Capital letters**. - Added a *CAPS Lock* key because... [There is no *CAPS Lock* key in the Colemak Layout](https://colemak.com/FAQ#Where_is_the_Caps_Lock_key.3F). - ---- - -### **Flashing** - -~~For *Pro Micro* execute: `sudo make crkbd:colemad:avrdude`~~ - -~~For *Elite-C* execute: `sudo make crkbd:colemad:dfu`~~ - -For *Pro Micro* and *Elite-C* run: - -```sh -qmk flash -kb crkbd -km colemad -bl dfu -``` - ---- - -### **Layers** - -#### 0. **COLEMAK** - -Notes: - -- Double tap Shift to (de)activate CAPS Lock. -- Hold down the Enter thumb key to switch to the LOWER layer -- Hold down the Space thumb key to switch to the RAISE layer -- Characters **"** **:** **|** **<** **>** **?** as you would expect them using *Shift*. - -```text - ,-----------------------------------------------------. ,-----------------------------------------------------. - | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | BackSP | A | R | S | T | D | | H | N | E | I | O | ' | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | Shift | Z | X | C | V | B | | K | M | , | . | / | ESC | - `--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------' - ,--------. ,--------. - ,-----------------| | | |-----------------. - | Alt | Ctrl | Space | | Enter | Shift | GUI | - | | | (RAISE)| |(LOWER) | | | - `--------+--------+--------' `--------+--------+--------' -``` - -#### 1. **LOWER** - -##### Numpad + Navigation - -```text - ,-----------------------------------------------------. ,-----------------------------------------------------. - | Tab | 0 | 1 | 2 | 3 | - | | PgUP | HOME | ↑ | END | ESC | | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | BackSP | / | 4 | 5 | 6 | + | | PgDN | ← | ↓ | → | DEL | | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | Shift | * | 7 | 8 | 9 | = | | | | | | | ESC | - `--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------' - ,--------. ,--------. - ,-----------------| | | |-----------------. - | Alt | Ctrl | Space | | | Shift | GUI | - | | | (RAISE)| |(LOWER) | | | - `--------+--------+--------' `--------+--------+--------' -``` - -#### 2. **RAISE** - -##### Symbols + Function Keys - -```text - ,-----------------------------------------------------. ,-----------------------------------------------------. - | Tab | ! | @ | # | $ | % | | ^ | & | * | ( | ) | F11 | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | BackSP | F1 | F2 | F3 | F4 | F5 | | ` | - | = | [ | ] | F12 | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | Shift | F6 | F7 | F8 | F9 | F10 | | ~ | _ | + | { | } | ESC | - `--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------' - ,--------. ,--------. - ,-----------------| | | |-----------------. - | Alt | Ctrl | | | Enter | Shift | GUI | - | | | (RAISE)| |(LOWER) | | | - `--------+--------+--------' `--------+--------+--------' -``` - -#### 3. **ADJUST** - -##### Macros + Settings - -Notes: - -- Function keys (from F13 to F19) to use for Linux/MacOS shortcuts. - -```text - ,-----------------------------------------------------. ,-----------------------------------------------------. - | | | F13 | F14 | F15 | | |RGB_TOG |RGB_MOD |RGB_VAI |RGB_HUI |RGB_SAI |RGB_SPI | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | | F16 | F17 | F18 | F19 | | | |RGB_RMOD|RGB_VAD |RGB_HUD |RGB_SAD |RGB_SPD | - |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - | | | | | | | | | | | | | | - `--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------' - ,--------. ,--------. - ,-----------------| | | |-----------------. - | | | | | | | | - | | | (RAISE)| |(LOWER) | | | - `--------+--------+--------' `--------+--------+--------' -``` - -##### Ready to use Macro examples - -Checkout `keycodes.h` and `process_records.c/h` files. - -- Macro **VSCTERM**: Toggles the vscode terminal (Ctrl + `) -- Macro **CHNLANG**: Changes the OS keyboard layout (Ctrl + Shift + N) diff --git a/keyboards/crkbd/keymaps/colemad/config.h b/keyboards/crkbd/keymaps/workman/config.h similarity index 86% rename from keyboards/crkbd/keymaps/colemad/config.h rename to keyboards/crkbd/keymaps/workman/config.h index d8b6861567..7a28bb5012 100644 --- a/keyboards/crkbd/keymaps/colemad/config.h +++ b/keyboards/crkbd/keymaps/workman/config.h @@ -13,5 +13,5 @@ #define SPLIT_MODS_ENABLE #define SPLIT_OLED_ENABLE #define OLED_TIMEOUT 60000 - #define OLED_FONT_H "keyboards/crkbd/keymaps/colemad/glcdfont.c" + #define OLED_FONT_H "keyboards/crkbd/keymaps/workman/glcdfont.c" #endif diff --git a/keyboards/crkbd/keymaps/colemad/glcdfont.c b/keyboards/crkbd/keymaps/workman/glcdfont.c similarity index 100% rename from keyboards/crkbd/keymaps/colemad/glcdfont.c rename to keyboards/crkbd/keymaps/workman/glcdfont.c diff --git a/keyboards/crkbd/keymaps/colemad/keycodes.h b/keyboards/crkbd/keymaps/workman/keycodes.h similarity index 66% rename from keyboards/crkbd/keymaps/colemad/keycodes.h rename to keyboards/crkbd/keymaps/workman/keycodes.h index 0f75dabef6..2d7db40ecd 100644 --- a/keyboards/crkbd/keymaps/colemad/keycodes.h +++ b/keyboards/crkbd/keymaps/workman/keycodes.h @@ -9,14 +9,6 @@ #define KC_LOWER LT(_LOWER, KC_ENT) /* Tap for Enter, Hold for LOWER layer */ #define KC_RAISE LT(_RAISE, KC_SPC) /* Tap for Space, Hold for RAISE layer */ -/* Tap Dance keycodes */ -#if defined(TAP_DANCE_ENABLE) - #include "tap_dances.h" - #define KC_T_SFT T_SFT /* Single tap for Shift, Double tap for CAPS Lock */ -#else - #define KC_T_SFT KC_LSFT -#endif - /* Macros */ enum custom_keycodes { VSCTERM = QK_USER, diff --git a/keyboards/crkbd/keymaps/colemad/keymap.c b/keyboards/crkbd/keymaps/workman/keymap.c similarity index 84% rename from keyboards/crkbd/keymaps/colemad/keymap.c rename to keyboards/crkbd/keymaps/workman/keymap.c index 888499f5a2..f84b31a246 100644 --- a/keyboards/crkbd/keymaps/colemad/keymap.c +++ b/keyboards/crkbd/keymaps/workman/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) +// Copyright 2023 Shokara Kou // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H @@ -12,25 +12,25 @@ /* Layer keymaps */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_COLEMAK] = LAYOUT( + [_WORKMAN] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS, + KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSLS, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, + KC_BSPC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - T_SFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + KC_ESC, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LALT, KC_LCTL,KC_RAISE, KC_LOWER, T_SFT, KC_LGUI + KC_LALT, KC_LCTL,KC_RAISE, KC_LOWER, KC_LSFT, KC_LGUI // `-------------------------' `--------------------------' ), [_LOWER] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, KC_0, KC_1, KC_2, KC_3, KC_MINS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_ESC, XXXXXXX, + _______, KC_ASTR, KC_7, KC_8, KC_9, KC_MINS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_ESC, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, KC_SLSH, KC_4, KC_5, KC_6, KC_PLUS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, KC_ASTR, KC_7, KC_8, KC_9, KC_EQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + _______, KC_0, KC_1, KC_2, KC_3, KC_EQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, _______, _______, _______, _______, _______ // `-------------------------' `--------------------------' @@ -50,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - XXXXXXX, XXXXXXX, KC_F13, KC_F14, KC_F15, XXXXXXX, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, + XXXXXXX, XXXXXXX, KC_F13, KC_F14, KC_F15, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - XXXXXXX, KC_F16, KC_F17, KC_F18, KC_F19, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, + XXXXXXX, KC_F16, KC_F17, KC_F18, KC_F19, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| diff --git a/keyboards/crkbd/keymaps/colemad/layers.h b/keyboards/crkbd/keymaps/workman/layers.h similarity index 92% rename from keyboards/crkbd/keymaps/colemad/layers.h rename to keyboards/crkbd/keymaps/workman/layers.h index f569ad156e..95a29e4e44 100644 --- a/keyboards/crkbd/keymaps/colemad/layers.h +++ b/keyboards/crkbd/keymaps/workman/layers.h @@ -3,7 +3,7 @@ #pragma once enum custom_layers { - _COLEMAK, + _WORKMAN, _LOWER, _RAISE, _ADJUST, diff --git a/keyboards/crkbd/keymaps/colemad/oled.c b/keyboards/crkbd/keymaps/workman/oled.c similarity index 100% rename from keyboards/crkbd/keymaps/colemad/oled.c rename to keyboards/crkbd/keymaps/workman/oled.c diff --git a/keyboards/crkbd/keymaps/colemad/oled.h b/keyboards/crkbd/keymaps/workman/oled.h similarity index 100% rename from keyboards/crkbd/keymaps/colemad/oled.h rename to keyboards/crkbd/keymaps/workman/oled.h diff --git a/keyboards/crkbd/keymaps/colemad/process_records.c b/keyboards/crkbd/keymaps/workman/process_records.c similarity index 100% rename from keyboards/crkbd/keymaps/colemad/process_records.c rename to keyboards/crkbd/keymaps/workman/process_records.c diff --git a/keyboards/crkbd/keymaps/colemad/process_records.h b/keyboards/crkbd/keymaps/workman/process_records.h similarity index 100% rename from keyboards/crkbd/keymaps/colemad/process_records.h rename to keyboards/crkbd/keymaps/workman/process_records.h diff --git a/keyboards/crkbd/keymaps/colemad/rules.mk b/keyboards/crkbd/keymaps/workman/rules.mk similarity index 100% rename from keyboards/crkbd/keymaps/colemad/rules.mk rename to keyboards/crkbd/keymaps/workman/rules.mk