From 84531841bbde7ba7d118326f933da4addf2c1881 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Fri, 24 Feb 2023 21:37:35 +0000 Subject: [PATCH 01/11] Adding md40 a ckrbd compatible keymap --- keyboards/crkbd/keymaps/md40/config.h | 55 ++++++++++++++++++++++++++ keyboards/crkbd/keymaps/md40/keymap.c | 33 ++++++++++++++++ keyboards/crkbd/keymaps/md40/readme.md | 23 +++++++++++ keyboards/crkbd/keymaps/md40/rules.mk | 21 ++++++++++ 4 files changed, 132 insertions(+) create mode 100644 keyboards/crkbd/keymaps/md40/config.h create mode 100644 keyboards/crkbd/keymaps/md40/keymap.c create mode 100644 keyboards/crkbd/keymaps/md40/readme.md create mode 100644 keyboards/crkbd/keymaps/md40/rules.mk diff --git a/keyboards/crkbd/keymaps/md40/config.h b/keyboards/crkbd/keymaps/md40/config.h new file mode 100644 index 000000000000..4147996e8d28 --- /dev/null +++ b/keyboards/crkbd/keymaps/md40/config.h @@ -0,0 +1,55 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +//#define USE_MATRIX_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS + + +#define TAPPING_FORCE_HOLD +#define TAPPING_TERM 300 + +#undef RGBLED_NUM +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE +#define RGBLED_NUM 27 +#define RGBLIGHT_LIMIT_VAL 120 +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + + +#define KC_ESCC MT(MOD_LCTL, KC_ESC) +#define KC_ENTS MT(MOD_LSFT, KC_ENT) +#define KC_FN MO(_FN) diff --git a/keyboards/crkbd/keymaps/md40/keymap.c b/keyboards/crkbd/keymaps/md40/keymap.c new file mode 100644 index 000000000000..063957c139dd --- /dev/null +++ b/keyboards/crkbd/keymaps/md40/keymap.c @@ -0,0 +1,33 @@ +#include QMK_KEYBOARD_H + +enum layers { + _QWERTY, + _CODE, + _FN, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + //,----+----+----+----+----+----. ,----+----+----+----+----+----. + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSPC, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + //|----+----+----+----+----+----+ |----+----+----+----+----+----| + KC_ESCC, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_ESC , + //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' + KC_LALT,KC_LGUI,KC_SPC , KC_ENTS,KC_FN,KC_FN + // `----+----+----' `+---+----+----'c + ), + [_FN] = LAYOUT( + //,----+----+----+----+----+----. ,----+----+----+----+----+----. + _______,KC_1, KC_2 ,KC_3, KC_4,KC_5, KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPC, + //|----+----+----+----+----+----| |----+----+----+----+----+----| + _______,KC_EXCLAIM,KC_AT,KC_HASH,KC_DOLLAR,KC_PERCENT, KC_LEFT,KC_DOWN, KC_UP ,KC_RIGHT,KC_LBRC,KC_RBRC, + //|----+----+----+----+----+----+ |----+----+----+----+----+----| + _______, KC_CIRCUMFLEX , KC_AMPR , KC_ASTERISK , KC_LEFT_PAREN , KC_RIGHT_PAREN , KC_MINUS,KC_PLUS,KC_EQL,KC_PIPE,KC_GRAVE,KC_BACKSLASH, + //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' + _______,_______,_______ , _______,_______,_______ + // `----+----+----' `----+----+----' + ) +}; + diff --git a/keyboards/crkbd/keymaps/md40/readme.md b/keyboards/crkbd/keymaps/md40/readme.md new file mode 100644 index 000000000000..28a02223d5d5 --- /dev/null +++ b/keyboards/crkbd/keymaps/md40/readme.md @@ -0,0 +1,23 @@ +# MD40: Minimally Disruptive 40% Keymap + +This keymap is an attempt to go from a standard keyboard layout to a 40% keyboard with minimal disruption. + +Some aims: +- Two layers only +- Existing keyboard positions where possible +- Exceptions where it's not possible +- Exceptions where it makes sense + +Supports crkbd only. + +## Base Layer + +![Base Layer](https://raw.githubusercontent.com/shano/shano.github.io/main/images/base.png) + + + + + +## Fn Layer + +![Base Layer](https://raw.githubusercontent.com/shano/shano.github.io/main/images/fn.png) diff --git a/keyboards/crkbd/keymaps/md40/rules.mk b/keyboards/crkbd/keymaps/md40/rules.mk new file mode 100644 index 000000000000..29d865983343 --- /dev/null +++ b/keyboards/crkbd/keymaps/md40/rules.mk @@ -0,0 +1,21 @@ + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +SWAP_HANDS_ENABLE = no # Enable one-hand typing +TAP_DANCE_ENABLE = no + +BOOTLOADER = caterina From fe4144887bcef75af1049abd69a4ee0e8cb44611 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Sat, 25 Feb 2023 22:56:37 +0000 Subject: [PATCH 02/11] Update keyboards/crkbd/keymaps/md40/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/crkbd/keymaps/md40/config.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/crkbd/keymaps/md40/config.h b/keyboards/crkbd/keymaps/md40/config.h index 4147996e8d28..71294b1ed4e6 100644 --- a/keyboards/crkbd/keymaps/md40/config.h +++ b/keyboards/crkbd/keymaps/md40/config.h @@ -20,15 +20,6 @@ along with this program. If not, see . #pragma once -//#define USE_MATRIX_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS - - #define TAPPING_FORCE_HOLD #define TAPPING_TERM 300 From cbe194b3af935865b81f6da8047f3aba96ceb188 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Sat, 25 Feb 2023 22:56:54 +0000 Subject: [PATCH 03/11] Update keyboards/crkbd/keymaps/md40/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/crkbd/keymaps/md40/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/crkbd/keymaps/md40/config.h b/keyboards/crkbd/keymaps/md40/config.h index 71294b1ed4e6..c1ef28df50ec 100644 --- a/keyboards/crkbd/keymaps/md40/config.h +++ b/keyboards/crkbd/keymaps/md40/config.h @@ -39,8 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 - - -#define KC_ESCC MT(MOD_LCTL, KC_ESC) -#define KC_ENTS MT(MOD_LSFT, KC_ENT) -#define KC_FN MO(_FN) From 74ccabf97d813be7976d489a6cd5339c1e28f892 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Sat, 25 Feb 2023 22:57:09 +0000 Subject: [PATCH 04/11] Update keyboards/crkbd/keymaps/md40/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/crkbd/keymaps/md40/keymap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/crkbd/keymaps/md40/keymap.c b/keyboards/crkbd/keymaps/md40/keymap.c index 063957c139dd..9e985b9b781c 100644 --- a/keyboards/crkbd/keymaps/md40/keymap.c +++ b/keyboards/crkbd/keymaps/md40/keymap.c @@ -1,4 +1,7 @@ #include QMK_KEYBOARD_H +#define KC_ESCC MT(MOD_LCTL, KC_ESC) +#define KC_ENTS MT(MOD_LSFT, KC_ENT) +#define KC_FN MO(_FN) enum layers { _QWERTY, From 68ac5d44d6135a0b96f76342f64549daaafe2a9e Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Sat, 25 Feb 2023 22:57:27 +0000 Subject: [PATCH 05/11] Update keyboards/crkbd/keymaps/md40/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/crkbd/keymaps/md40/rules.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/keyboards/crkbd/keymaps/md40/rules.mk b/keyboards/crkbd/keymaps/md40/rules.mk index 29d865983343..4b88e6aeea4b 100644 --- a/keyboards/crkbd/keymaps/md40/rules.mk +++ b/keyboards/crkbd/keymaps/md40/rules.mk @@ -5,17 +5,5 @@ # BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SWAP_HANDS_ENABLE = no # Enable one-hand typing -TAP_DANCE_ENABLE = no - +NKRO_ENABLE = no # Enable N-Key Rollover BOOTLOADER = caterina From 73116e98b488d0086f16475ef9f4244c287c95f6 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Sat, 25 Feb 2023 23:03:15 +0000 Subject: [PATCH 06/11] Adding a license header to md40 --- keyboards/crkbd/keymaps/md40/keymap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/crkbd/keymaps/md40/keymap.c b/keyboards/crkbd/keymaps/md40/keymap.c index 9e985b9b781c..85d9dc669f9a 100644 --- a/keyboards/crkbd/keymaps/md40/keymap.c +++ b/keyboards/crkbd/keymaps/md40/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Shane Dowling (@shano) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H #define KC_ESCC MT(MOD_LCTL, KC_ESC) #define KC_ENTS MT(MOD_LSFT, KC_ENT) From 16226140e0693da7a0ef51dd22b589b9757623f9 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Sat, 25 Feb 2023 23:20:02 +0000 Subject: [PATCH 07/11] md40: Using imgur, removing uncessary CODE layer --- keyboards/crkbd/keymaps/md40/keymap.c | 1 - keyboards/crkbd/keymaps/md40/readme.md | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/keyboards/crkbd/keymaps/md40/keymap.c b/keyboards/crkbd/keymaps/md40/keymap.c index 85d9dc669f9a..39ae0bb4e0ba 100644 --- a/keyboards/crkbd/keymaps/md40/keymap.c +++ b/keyboards/crkbd/keymaps/md40/keymap.c @@ -8,7 +8,6 @@ enum layers { _QWERTY, - _CODE, _FN, }; diff --git a/keyboards/crkbd/keymaps/md40/readme.md b/keyboards/crkbd/keymaps/md40/readme.md index 28a02223d5d5..9734c6f48e9c 100644 --- a/keyboards/crkbd/keymaps/md40/readme.md +++ b/keyboards/crkbd/keymaps/md40/readme.md @@ -12,12 +12,8 @@ Supports crkbd only. ## Base Layer -![Base Layer](https://raw.githubusercontent.com/shano/shano.github.io/main/images/base.png) - - - - +![Base Layer](https://i.imgur.com/hXLP6us.png) ## Fn Layer -![Base Layer](https://raw.githubusercontent.com/shano/shano.github.io/main/images/fn.png) +![Base Layer](https://i.imgur.com/Sozd1p8.png) From a861b78acaaf992a17ba4ff3c934054d0b8f8c3c Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Tue, 28 Feb 2023 20:01:48 +0000 Subject: [PATCH 08/11] Update keyboards/crkbd/keymaps/md40/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/md40/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/md40/rules.mk b/keyboards/crkbd/keymaps/md40/rules.mk index 4b88e6aeea4b..e7aeca72f9c9 100644 --- a/keyboards/crkbd/keymaps/md40/rules.mk +++ b/keyboards/crkbd/keymaps/md40/rules.mk @@ -4,6 +4,6 @@ # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys(+4700) +MOUSEKEY_ENABLE = no # Mouse keys NKRO_ENABLE = no # Enable N-Key Rollover BOOTLOADER = caterina From 7940da4052b613e7fac52fadc63a0f2011e4ea20 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Fri, 17 Mar 2023 12:42:03 +0000 Subject: [PATCH 09/11] Update keyboards/crkbd/keymaps/md40/readme.md Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/md40/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/md40/readme.md b/keyboards/crkbd/keymaps/md40/readme.md index 9734c6f48e9c..78b8f26d4896 100644 --- a/keyboards/crkbd/keymaps/md40/readme.md +++ b/keyboards/crkbd/keymaps/md40/readme.md @@ -12,7 +12,7 @@ Supports crkbd only. ## Base Layer -![Base Layer](https://i.imgur.com/hXLP6us.png) +![Base Layer](https://i.imgur.com/hXLP6ush.png) ## Fn Layer From 1eba4752cde6f7c79cbe18a7cbf364d14da33e86 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Fri, 17 Mar 2023 12:42:12 +0000 Subject: [PATCH 10/11] Update keyboards/crkbd/keymaps/md40/readme.md Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/md40/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/md40/readme.md b/keyboards/crkbd/keymaps/md40/readme.md index 78b8f26d4896..ee1e14a0165a 100644 --- a/keyboards/crkbd/keymaps/md40/readme.md +++ b/keyboards/crkbd/keymaps/md40/readme.md @@ -16,4 +16,4 @@ Supports crkbd only. ## Fn Layer -![Base Layer](https://i.imgur.com/Sozd1p8.png) +![Base Layer](https://i.imgur.com/Sozd1p8h.png) From ee3db5e80e361b7e766fa8a25279e845d4a90d40 Mon Sep 17 00:00:00 2001 From: Shane Dowling Date: Fri, 17 Mar 2023 12:42:20 +0000 Subject: [PATCH 11/11] Update keyboards/crkbd/keymaps/md40/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/crkbd/keymaps/md40/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/crkbd/keymaps/md40/rules.mk b/keyboards/crkbd/keymaps/md40/rules.mk index e7aeca72f9c9..86f4f1e11c01 100644 --- a/keyboards/crkbd/keymaps/md40/rules.mk +++ b/keyboards/crkbd/keymaps/md40/rules.mk @@ -6,4 +6,3 @@ BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys NKRO_ENABLE = no # Enable N-Key Rollover -BOOTLOADER = caterina