diff options
Diffstat (limited to 'keyboards/crkbd')
66 files changed, 161 insertions, 184 deletions
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h index df17352d9c..709cf4acb0 100644 --- a/keyboards/crkbd/config.h +++ b/keyboards/crkbd/config.h @@ -18,12 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 8 -#define MATRIX_COLS 6 #define MATRIX_ROW_PINS \ { D4, C6, D7, E6 } @@ -32,20 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { F4, F5, F6, F7, B1, B3 } // #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* 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 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json index e96ac633a0..778b33c565 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "community_layouts": ["split_3x5_3", "split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { "layout": [ diff --git a/keyboards/crkbd/keymaps/ajarov/config.h b/keyboards/crkbd/keymaps/ajarov/config.h index 4c408112bd..d993e8e659 100644 --- a/keyboards/crkbd/keymaps/ajarov/config.h +++ b/keyboards/crkbd/keymaps/ajarov/config.h @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/antosha417/config.h b/keyboards/crkbd/keymaps/antosha417/config.h index 4b6e86fd6b..bfe2b143d2 100644 --- a/keyboards/crkbd/keymaps/antosha417/config.h +++ b/keyboards/crkbd/keymaps/antosha417/config.h @@ -10,7 +10,7 @@ #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h index 7a3bb76b38..95e7ddb329 100644 --- a/keyboards/crkbd/keymaps/ardakilic/config.h +++ b/keyboards/crkbd/keymaps/ardakilic/config.h @@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c index 6de8a5495c..98a9fb50f3 100644 --- a/keyboards/crkbd/keymaps/ardakilic/keymap.c +++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c @@ -68,7 +68,7 @@ enum { }; // clang-format off -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [TR_C] = 0x00c7, [TR_C_L] = 0x00e7, [TR_I] = 0x0130, @@ -89,7 +89,7 @@ const uint32_t PROGMEM unicode_map[] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * BASE LAYER - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * LOWER LAYER - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | > | ! | ' | ^ | + | % | | & | / | ( | ) | = | Bksp | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| @@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * RAISE LAYER - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | Tab | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| @@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * SPACE LAYER - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | | CMD+1 | CMD+2 | CMD+3 | CMD+4 | CMD+5 | | CMD+6 | CMD+7 | CMD+8 | CMD+9 | CMD+0 | LCKOSX| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| @@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * NUMPAD LAYER * KC_PDOT is comma on the Turkish layout ¯\_(ツ)_/¯ - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | | | | | | | | = | Num7 | Num8 | Num9 | - | Bksp | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| @@ -203,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * SODA LAYER * KC_PDOT is comma on the Turkish layout ¯\_(ツ)_/¯ - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | | | Up | | | | | | | | | | | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| @@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ADJUST LAYER - [_TPL] = LAYOUT_wrapper( \ + [_TPL] = LAYOUT_wrapper( //,-----------------------------------------------------. ,----------------------------------------------------. | QK_BOOT | EEPRST | | | | | | | | | | | | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------| diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h index 095879a190..f4b8c08a3f 100644 --- a/keyboards/crkbd/keymaps/armand1m/config.h +++ b/keyboards/crkbd/keymaps/armand1m/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // #define PERMISSIVE_HOLD #define TAPPING_TERM 300 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h index b112aed743..f700899883 100644 --- a/keyboards/crkbd/keymaps/benrestech/config.h +++ b/keyboards/crkbd/keymaps/benrestech/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 175 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h index cadb397834..188f717aba 100644 --- a/keyboards/crkbd/keymaps/bermeo/config.h +++ b/keyboards/crkbd/keymaps/bermeo/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 // #define RETRO_TAPPING // #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/blipson/config.h b/keyboards/crkbd/keymaps/blipson/config.h index 1994795836..ca69ac3873 100644 --- a/keyboards/crkbd/keymaps/blipson/config.h +++ b/keyboards/crkbd/keymaps/blipson/config.h @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/colemad/config.h b/keyboards/crkbd/keymaps/colemad/config.h index 6d2050e148..b52c669ea9 100644 --- a/keyboards/crkbd/keymaps/colemad/config.h +++ b/keyboards/crkbd/keymaps/colemad/config.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/crkbd/keymaps/colemad/tap_dances.c b/keyboards/crkbd/keymaps/colemad/tap_dances.c index fc47cfd8d1..c0d83b94d0 100644 --- a/keyboards/crkbd/keymaps/colemad/tap_dances.c +++ b/keyboards/crkbd/keymaps/colemad/tap_dances.c @@ -2,6 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "tap_dances.h" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS) }; diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h index 52d4fdd93a..ca025830b4 100644 --- a/keyboards/crkbd/keymaps/crkdves/config.h +++ b/keyboards/crkbd/keymaps/crkdves/config.h @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // #define RETRO_TAPPING // #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h index 878f9a74e1..bf33cc90aa 100644 --- a/keyboards/crkbd/keymaps/crkqwes/config.h +++ b/keyboards/crkbd/keymaps/crkqwes/config.h @@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #undef USE_I2C #undef SSD1306OLED -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // #define RETRO_TAPPING // #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/curry/keymap.c b/keyboards/crkbd/keymaps/curry/keymap.c index cbfc0cb537..5157a22379 100644 --- a/keyboards/crkbd/keymaps/curry/keymap.c +++ b/keyboards/crkbd/keymaps/curry/keymap.c @@ -60,14 +60,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_wrapper( \ + [_RAISE] = LAYOUT_wrapper( _______, _________________RAISE_L1__________________, _________________RAISE_R1__________________, _______, _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS, _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______, _______, _______, _______, _______, _______, _______ ), - [_ADJUST] = LAYOUT_wrapper( \ + [_ADJUST] = LAYOUT_wrapper( KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST, VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR, MG_NKRO, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h index 8f4d73ca22..4e70141dad 100644 --- a/keyboards/crkbd/keymaps/default/config.h +++ b/keyboards/crkbd/keymaps/default/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/devdev/config.h b/keyboards/crkbd/keymaps/devdev/config.h index 14067d1e74..337a86df8e 100644 --- a/keyboards/crkbd/keymaps/devdev/config.h +++ b/keyboards/crkbd/keymaps/devdev/config.h @@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define CUSTOM_LAYER_READ //if you remove this it causes issues - needs better guarding -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c index 90cd186c06..2047320c4e 100644 --- a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c +++ b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c @@ -21,52 +21,52 @@ enum crkbd_layers { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_DVORAK] = LAYOUT_split_3x6_3( \ + [_DVORAK] = LAYOUT_split_3x6_3( //,-----------------------------------------------. ,-----------------------------------------------. - KC_TAB, KC_QUOT,KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,\ + KC_TAB, KC_QUOT,KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - ESC_CTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINUS,\ + ESC_CTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINUS, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - KC_LSFT,KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,SC_SENT,\ + KC_LSFT,KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,SC_SENT, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - KC_LGUI, LOWER, KC_SPC, KC_BSPC, RAISE,KC_RALT \ + KC_LGUI, LOWER, KC_SPC, KC_BSPC, RAISE,KC_RALT //`-----------------------' `----------------------' ), - [_LOWER] = LAYOUT_split_3x6_3( \ + [_LOWER] = LAYOUT_split_3x6_3( //,-----------------------------------------------. ,-----------------------------------------------. - KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RIGHT,KC_RPRN,\ + KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RIGHT,KC_RPRN, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,KC_VOLD,KC_VOLU,KC_MPRV,KC_MPLY,KC_MNXT, _______,KC_LEFT,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,\ + _______,KC_VOLD,KC_VOLU,KC_MPRV,KC_MPLY,KC_MNXT, _______,KC_LEFT,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______,KC_DOWN, KC_UP, _______, _______,_______,_______,KC_HOME, KC_END,_______,\ + _______,_______,_______,KC_DOWN, KC_UP, _______, _______,_______,_______,KC_HOME, KC_END,_______, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______, KC_DEL,_______,_______ \ + _______,_______,_______, KC_DEL,_______,_______ //`-----------------------' `----------------------' ), - [_RAISE] = LAYOUT_split_3x6_3( \ + [_RAISE] = LAYOUT_split_3x6_3( //,-----------------------------------------------. ,-----------------------------------------------. - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,KC_RIGHT, KC_0, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,KC_RIGHT, KC_0, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______, _______,KC_LEFT, KC_EQL,KC_LBRC,KC_RBRC,KC_BSLS,\ + _______,_______,_______,_______,_______,_______, _______,KC_LEFT, KC_EQL,KC_LBRC,KC_RBRC,KC_BSLS, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______,KC_DOWN, KC_UP, _______, _______,_______,_______,KC_PGUP,KC_PGDN,_______,\ + _______,_______,_______,KC_DOWN, KC_UP, _______, _______,_______,_______,KC_PGUP,KC_PGDN,_______, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______, KC_DEL ,_______,_______ \ + _______,_______,_______, KC_DEL ,_______,_______ //`-----------------------' `----------------------' ), - [_ADJUST] = LAYOUT_split_3x6_3( \ + [_ADJUST] = LAYOUT_split_3x6_3( //,-----------------------------------------------. ,-----------------------------------------------. - RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_M_T, _______,_______,_______,_______,KC_RIGHT,_______,\ + RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_M_T, _______,_______,_______,_______,KC_RIGHT,_______, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,_______,_______, _______,KC_LEFT,_______,_______,_______,_______,\ + RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,_______,_______, _______,KC_LEFT,_______,_______,_______,_______, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,KC_PSCR,_______,KC_DOWN, KC_UP, _______, _______,_______,_______,_______,_______,_______,\ + _______,KC_PSCR,_______,KC_DOWN, KC_UP, _______, _______,_______,_______,_______,_______,_______, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______, KC_DEL ,_______,_______ \ + _______,_______,_______, KC_DEL ,_______,_______ //`-----------------------' `----------------------' ) }; diff --git a/keyboards/crkbd/keymaps/edvorakjp/config.h b/keyboards/crkbd/keymaps/edvorakjp/config.h index 8787ba88d3..ee4e7388be 100644 --- a/keyboards/crkbd/keymaps/edvorakjp/config.h +++ b/keyboards/crkbd/keymaps/edvorakjp/config.h @@ -8,7 +8,7 @@ #define SWAP_SCLN -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/gotham/keymap.c b/keyboards/crkbd/keymaps/gotham/keymap.c index 4e8dd5e9b3..02cc3af68e 100644 --- a/keyboards/crkbd/keymaps/gotham/keymap.c +++ b/keyboards/crkbd/keymaps/gotham/keymap.c @@ -51,13 +51,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x6_3( //|-----------------------------------------------------| |-----------------------------------------------------| - XXXXXXX, CK_RST, CK_DOWN, CK_UP, CK_TOGG, RGB_TOG, MU_TOGG, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX,\ + XXXXXXX, CK_RST, CK_DOWN, CK_UP, CK_TOGG, RGB_TOG, MU_TOGG, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, MU_NEXT, KC_F11, KC_F4, KC_F5, KC_F6, QK_BOOT, \ + XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, MU_NEXT, KC_F11, KC_F4, KC_F5, KC_F6, QK_BOOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGBRST, AU_TOGG, KC_F10, KC_F1, KC_F2, KC_F3, _______,\ + XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGBRST, AU_TOGG, KC_F10, KC_F1, KC_F2, KC_F3, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, KC_VOLD, KC_VOLU \ + _______, _______, _______, _______, KC_VOLD, KC_VOLU //|--------------------------| |--------------------------| ) }; diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h index e569a59bc9..a926f67537 100644 --- a/keyboards/crkbd/keymaps/hvp/config.h +++ b/keyboards/crkbd/keymaps/hvp/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #define TAPPING_TERM 150 diff --git a/keyboards/crkbd/keymaps/jarred/config.h b/keyboards/crkbd/keymaps/jarred/config.h index c6c80469ed..c95deb1abb 100644 --- a/keyboards/crkbd/keymaps/jarred/config.h +++ b/keyboards/crkbd/keymaps/jarred/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/joe_scotto/config.h b/keyboards/crkbd/keymaps/joe_scotto/config.h index c76937eae4..113313ceb1 100644 --- a/keyboards/crkbd/keymaps/joe_scotto/config.h +++ b/keyboards/crkbd/keymaps/joe_scotto/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ // Rows are doubled-up @@ -34,9 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c index 9a75e9fa9a..f0f6f3f62f 100644 --- a/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c +++ b/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c @@ -63,7 +63,7 @@ void oled_render_keylog(void) { oled_write((const char *)&logged_char, false); } -void render_master_oled() { +void render_master_oled(void) { if (timer_elapsed32(oled_timer) > CUSTOM_OLED_TIMEOUT) { oled_off(); return; diff --git a/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c index 159413d083..c47fb2a07b 100644 --- a/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c +++ b/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c @@ -3,7 +3,7 @@ #include "jpe230.h" -void render_slave_oled() { +void render_slave_oled(void) { static const char PROGMEM crkbd_logo[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, diff --git a/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c index 67861e5b27..9e130dae38 100644 --- a/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c +++ b/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c @@ -12,7 +12,7 @@ __attribute__ ((weak)) void handle_oled_keypress(uint16_t keycode, keyrecord_t * __attribute__ ((weak)) oled_rotation_t rotate_master(oled_rotation_t rotation) {return rotation;} __attribute__ ((weak)) oled_rotation_t rotate_slave(oled_rotation_t rotation) {return rotation;} -void oled_timer_reset() { oled_timer = timer_read32(); } +void oled_timer_reset(void) { oled_timer = timer_read32(); } oled_rotation_t oled_init_user(oled_rotation_t rotation) { diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c index a2230e5ee1..ffd3edb792 100644 --- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c +++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c @@ -40,7 +40,7 @@ void oled_render_layer_state(void) { } -void render_master_oled() { +void render_master_oled(void) { if (timer_elapsed32(oled_timer) > CUSTOM_OLED_TIMEOUT) { oled_off(); return; diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c index ef38fd8c44..31166b3b43 100644 --- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c +++ b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c @@ -4,7 +4,7 @@ #include "jpe230.h" #include "ocean_dream.h" -void render_slave_oled() { +void render_slave_oled(void) { render_stars(); } diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h index fbe5277c40..3b875235a8 100644 --- a/keyboards/crkbd/keymaps/julian_turner/config.h +++ b/keyboards/crkbd/keymaps/julian_turner/config.h @@ -29,6 +29,6 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 //#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h index 74f8a0823b..33655b4c9d 100644 --- a/keyboards/crkbd/keymaps/kidbrazil/config.h +++ b/keyboards/crkbd/keymaps/kidbrazil/config.h @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #undef PRODUCT #define PRODUCT "CRKBD Loose Transistor Ed." diff --git a/keyboards/crkbd/keymaps/madhatter/config.h b/keyboards/crkbd/keymaps/madhatter/config.h index 599bbc27c3..afdaf1c1fd 100644 --- a/keyboards/crkbd/keymaps/madhatter/config.h +++ b/keyboards/crkbd/keymaps/madhatter/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/madhatter/keymap.c b/keyboards/crkbd/keymaps/madhatter/keymap.c index 59b4cc7a20..eb29bfe33e 100644 --- a/keyboards/crkbd/keymaps/madhatter/keymap.c +++ b/keyboards/crkbd/keymaps/madhatter/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. 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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,\ + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/crkbd/keymaps/mb_via/keymap.c b/keyboards/crkbd/keymaps/mb_via/keymap.c index 30a67de5c9..027e1449cc 100644 --- a/keyboards/crkbd/keymaps/mb_via/keymap.c +++ b/keyboards/crkbd/keymaps/mb_via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT //`--------------------------' `--------------------------' ), diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h index b09d858898..53b5f1b834 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/config.h +++ b/keyboards/crkbd/keymaps/nimishgautam/config.h @@ -19,7 +19,7 @@ #define EXTRA_SHORT_COMBOS //Tapping values -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c index e8a476cfc5..0c0a3e3544 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c +++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c @@ -375,7 +375,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void dance_left_finished (qk_tap_dance_state_t *state, void *user_data) { +void dance_left_finished (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { //1 tap, move to line left keymap_config.raw = eeconfig_read_keymap(); if(keymap_config.swap_lctl_lgui){ //Linux @@ -388,7 +388,7 @@ void dance_left_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void dance_right_finished (qk_tap_dance_state_t *state, void *user_data) { +void dance_right_finished (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { // 1 tap, move line right keymap_config.raw = eeconfig_read_keymap(); if(keymap_config.swap_lctl_lgui){ //Linux @@ -402,7 +402,7 @@ void dance_right_finished (qk_tap_dance_state_t *state, void *user_data) { } //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_MOVE_BEGIN_LINE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_left_finished, NULL), [TD_MOVE_END_LINE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_right_finished, NULL), [TD_PERIOD_COMMA] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COMMA), diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h index 174c678769..fa3711ce8f 100644 --- a/keyboards/crkbd/keymaps/ninjonas/config.h +++ b/keyboards/crkbd/keymaps/ninjonas/config.h @@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c index e29fda6deb..66b89f3a98 100644 --- a/keyboards/crkbd/keymaps/ninjonas/keymap.c +++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`---------------------' `---------------------' ), - [_RAISE] = LAYOUT_wrapper( \ + [_RAISE] = LAYOUT_wrapper( //,----------------------------------------------------. ,----------------------------------------------------. _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`---------------------' `---------------------' ), - [_ADJUST] = LAYOUT_wrapper( \ + [_ADJUST] = LAYOUT_wrapper( //,----------------------------------------------------. ,----------------------------------------------------. _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`---------------------' `---------------------' ), - [_NUMPAD] = LAYOUT_wrapper( \ + [_NUMPAD] = LAYOUT_wrapper( //,----------------------------------------------------. ,----------------------------------------------------. _______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________, //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`---------------------' `---------------------' ), /* - [_TEMPLATE] = LAYOUT_wrapper( \ + [_TEMPLATE] = LAYOUT_wrapper( //,----------------------------------------------------. ,----------------------------------------------------. XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| diff --git a/keyboards/crkbd/keymaps/oled_sample/config.h b/keyboards/crkbd/keymaps/oled_sample/config.h index cd24f74744..14718b26d1 100644 --- a/keyboards/crkbd/keymaps/oled_sample/config.h +++ b/keyboards/crkbd/keymaps/oled_sample/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/ollyhayes/config.h b/keyboards/crkbd/keymaps/ollyhayes/config.h index 4c51005181..9ad1ce2c58 100644 --- a/keyboards/crkbd/keymaps/ollyhayes/config.h +++ b/keyboards/crkbd/keymaps/ollyhayes/config.h @@ -18,7 +18,7 @@ #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #define NO_ACTION_ONESHOT diff --git a/keyboards/crkbd/keymaps/oo/config.h b/keyboards/crkbd/keymaps/oo/config.h index 8dc71430a1..814d227d7d 100644 --- a/keyboards/crkbd/keymaps/oo/config.h +++ b/keyboards/crkbd/keymaps/oo/config.h @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SPLIT_USB_DETECT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" diff --git a/keyboards/crkbd/keymaps/rarick/config.h b/keyboards/crkbd/keymaps/rarick/config.h index 3dc4003f75..4a033596a8 100644 --- a/keyboards/crkbd/keymaps/rarick/config.h +++ b/keyboards/crkbd/keymaps/rarick/config.h @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/rjhilgefort/config.h b/keyboards/crkbd/keymaps/rjhilgefort/config.h index 41d709d3a5..a7eb8b2a4f 100644 --- a/keyboards/crkbd/keymaps/rjhilgefort/config.h +++ b/keyboards/crkbd/keymaps/rjhilgefort/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // 200 is default #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index d77fc16e34..aeeae2cbd8 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -83,87 +83,87 @@ user_config_t user_config; #define KC_EUR ALGR(KC_5) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_COLEMAKDHM] = LAYOUT_split_3x6_3( \ + [_COLEMAKDHM] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, BSP_DEL,\ + KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, BSP_DEL, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - TAB_NUM, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,\ + TAB_NUM, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - LCTL_BR, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, RCTL_BR,\ + LCTL_BR, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, RCTL_BR, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LALT, T_SYM, SFT_SPC, SFT_ENT, T_NAV, KC_RGUI \ + KC_LALT, T_SYM, SFT_SPC, SFT_ENT, T_NAV, KC_RGUI //`--------------------------' `--------------------------' ), - [_GAMING] = LAYOUT_split_3x6_3( \ + [_GAMING] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL,\ + KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, EXT_SF, KC_SPC, _______, _______, _______ \ + _______, EXT_SF, KC_SPC, _______, _______, _______ //`--------------------------' `--------------------------' ), - [_GAMING_EXT] = LAYOUT_split_3x6_3( \ + [_GAMING_EXT] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_GRV, KC_1, KC_2, _______, KC_3, KC_4, _______, _______, _______, _______, _______, KC_DEL,\ + KC_GRV, KC_1, KC_2, _______, KC_3, KC_4, _______, _______, _______, _______, _______, KC_DEL, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LBRC, KC_RBRC, _______, _______, _______, KC_BSLS, _______, _______, _______, _______, _______, _______,\ + KC_LBRC, KC_RBRC, _______, _______, _______, KC_BSLS, _______, _______, _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______, _______, _______,\ + KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, KC_ENT, _______, _______ \ + _______, _______, _______, KC_ENT, _______, _______ //`--------------------------' `--------------------------' ), - [_NUMPAD] = LAYOUT_split_3x6_3( \ + [_NUMPAD] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, KC_P7, KC_P8, KC_P9, XXXXXXX, _______,\ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, KC_P7, KC_P8, KC_P9, XXXXXXX, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PPLS,\ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PPLS, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, KC_EQL, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PAST,\ + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, KC_EQL, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PAST, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, KC_P0, KC_DOT \ + _______, _______, _______, _______, KC_P0, KC_DOT //`--------------------------' `--------------------------' ), - [_SYM] = LAYOUT_split_3x6_3( \ + [_SYM] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,\ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_MINS, KC_PLUS,\ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_MINS, KC_PLUS, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - LCT_PRN, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, XXXXXXX, KC_EQL, KC_PIPE, KC_LT, KC_GT, KC_BSLS, RCT_PRN,\ + LCT_PRN, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, XXXXXXX, KC_EQL, KC_PIPE, KC_LT, KC_GT, KC_BSLS, RCT_PRN, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, S_SYM, _______, _______, _______, _______ \ + _______, S_SYM, _______, _______, _______, _______ //`--------------------------' `--------------------------' ), - [_NAV] = LAYOUT_split_3x6_3( \ + [_NAV] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, KC_BSPC,\ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_TILD, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,\ + KC_TILD, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - LCT_PRN, KC_F11, KC_F12, KC_INS, KC_PSCR, KC_CAPS, WIN_CLS, TAB_BCK, TAB_CLS, TAB_FWD, XXXXXXX, RCT_PRN,\ + LCT_PRN, KC_F11, KC_F12, KC_INS, KC_PSCR, KC_CAPS, WIN_CLS, TAB_BCK, TAB_CLS, TAB_FWD, XXXXXXX, RCT_PRN, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+---------| - _______, _______, _______, _______, S_NAV, _______ \ + _______, _______, _______, _______, S_NAV, _______ //`--------------------------' `--------------------------' ), - [_UTIL] = LAYOUT_split_3x6_3( \ + [_UTIL] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK, RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,\ + QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK, RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_RST, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY, GAMING, RGB_UND, RGB_DUO, RGB_SCR, RGB_SPI, RGB_SAD, RGB_SAI,\ + RGB_RST, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY, GAMING, RGB_UND, RGB_DUO, RGB_SCR, RGB_SPI, RGB_SAD, RGB_SAI, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - EE_CLR, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, RGB_TOG, RGB_SOL, RGB_CYC, RGB_SPD, RGB_VAD, RGB_VAI,\ + EE_CLR, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, RGB_TOG, RGB_SOL, RGB_CYC, RGB_SPD, RGB_VAD, RGB_VAI, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______ //`--------------------------' `--------------------------' ) }; diff --git a/keyboards/crkbd/keymaps/rs/config.h b/keyboards/crkbd/keymaps/rs/config.h index 85b9b95a23..bbdb0d8106 100644 --- a/keyboards/crkbd/keymaps/rs/config.h +++ b/keyboards/crkbd/keymaps/rs/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h index b1896bea90..0ff3549ba9 100644 --- a/keyboards/crkbd/keymaps/sharkby7e/config.h +++ b/keyboards/crkbd/keymaps/sharkby7e/config.h @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/sharkby7e/keymap.c b/keyboards/crkbd/keymaps/sharkby7e/keymap.c index 9f483a27a4..f6d740d6d4 100644 --- a/keyboards/crkbd/keymaps/sharkby7e/keymap.c +++ b/keyboards/crkbd/keymaps/sharkby7e/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \----------+-------+-------+---------------+---------------+---------| |--------+---------------+---------------+--------+---------+---------/ XXXXXXX, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, // \----------+-------+-------+---------------+---------------+---------| |--------+---------------+---------------+--------+---------+---------/ - KC_ESC, MO(1), KC_LSPO, KC_SPC, MO(2), KC_TAB + KC_ESC, MO(1), SC_LSPO, KC_SPC, MO(2), KC_TAB // \---------------+---------------+---------| |--------+---------------+---------------/ ), diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h index 8bceb729d8..57a253428b 100644 --- a/keyboards/crkbd/keymaps/snowe/config.h +++ b/keyboards/crkbd/keymaps/snowe/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT @@ -57,7 +57,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // fix for me putting alt under A and being a fast typist #define IGNORE_MOD_TAP_INTERRUPT -//#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY #define LAYER_STATE_8BIT #define SPLIT_WPM_ENABLE diff --git a/keyboards/crkbd/keymaps/snowe/keymap.c b/keyboards/crkbd/keymaps/snowe/keymap.c index 685491903e..c605089bfb 100644 --- a/keyboards/crkbd/keymaps/snowe/keymap.c +++ b/keyboards/crkbd/keymaps/snowe/keymap.c @@ -141,14 +141,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `-----------------------' '-----------------------' */ - [_UPPER] = LAYOUT_wrapper( \ + [_UPPER] = LAYOUT_wrapper( KC_GRV, _________________RAISE_L1__________________, _________________RAISE_R1__________________, _______, _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS, _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______, _______, _______, _______, _______, _______, _______ ), - [_ADJUST] = LAYOUT_wrapper( \ + [_ADJUST] = LAYOUT_wrapper( _______, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR, _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY, @@ -198,12 +198,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // } //} // -// bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +// bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { +// if (keycode == ALT_T(KC_A) || keycode == SH_BKSP) { +// return false; +// } // switch (keycode) { -// case ALT_T(KC_A): -// case SH_BKSP: +// case QK_MOD_TAP ... QK_MOD_TAP_MAX: // return true; // default: // return false; // } -//}
\ No newline at end of file +//} diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h index 7cd9ecaed9..6cd090f9fd 100644 --- a/keyboards/crkbd/keymaps/soundmonster/config.h +++ b/keyboards/crkbd/keymaps/soundmonster/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #define RETRO_TAPPING #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/config.h b/keyboards/crkbd/keymaps/thumb_ctrl/config.h index 6e54150c17..4191a14524 100755 --- a/keyboards/crkbd/keymaps/thumb_ctrl/config.h +++ b/keyboards/crkbd/keymaps/thumb_ctrl/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c b/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c index 1cf6fdf092..dbfe3c5b3d 100644 --- a/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c +++ b/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H #include "tap_dances.h" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), [TD_TAB_CTRLTAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LCTL(KC_TAB)), [TD_GRV_CTRLGRV] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, LGUI(KC_GRV)), diff --git a/keyboards/crkbd/keymaps/toinux/config.h b/keyboards/crkbd/keymaps/toinux/config.h index 2ee5a4e182..c033076a5a 100644 --- a/keyboards/crkbd/keymaps/toinux/config.h +++ b/keyboards/crkbd/keymaps/toinux/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/vayashiko/config.h b/keyboards/crkbd/keymaps/vayashiko/config.h index 85a5412851..01a1210c81 100644 --- a/keyboards/crkbd/keymaps/vayashiko/config.h +++ b/keyboards/crkbd/keymaps/vayashiko/config.h @@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/via/keymap.c b/keyboards/crkbd/keymaps/via/keymap.c index 33ca8026f8..3e93d5bbcf 100644 --- a/keyboards/crkbd/keymaps/via/keymap.c +++ b/keyboards/crkbd/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT + KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT //`--------------------------' `--------------------------' ), diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h index 4a370ef43c..8ff7589a9d 100644 --- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h +++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h @@ -5,7 +5,7 @@ #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h index 257c9df97b..cddd09e5b6 100644 --- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h +++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h @@ -12,7 +12,7 @@ /* Select hand configuration */ #define MASTER_RIGHT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/vxid/config.h b/keyboards/crkbd/keymaps/vxid/config.h index 5b18de236e..1960e13194 100644 --- a/keyboards/crkbd/keymaps/vxid/config.h +++ b/keyboards/crkbd/keymaps/vxid/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_RIGHT // #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 100 #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/vxid/keymap.c b/keyboards/crkbd/keymaps/vxid/keymap.c index 191ad3cbfe..643a9eb425 100644 --- a/keyboards/crkbd/keymaps/vxid/keymap.c +++ b/keyboards/crkbd/keymaps/vxid/keymap.c @@ -23,39 +23,39 @@ enum custom_keycodes { #define KC_RAISE RAISE const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT( //,-----------------------------------------. ,-----------------------------------------. - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_DEL, KC_Y, KC_U, KC_I, KC_O, KC_P,\ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_DEL, KC_Y, KC_U, KC_I, KC_O, KC_P, //|------+------+------+------+------+------| |------+------+------+------+------+------| - KC_A, KC_S, KC_D, KC_F, KC_G, KC_SPC, KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN,\ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_SPC, KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, //|------+------+------+------+------+------| |------+------+------+------+------+------| - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,\ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - KC_LALT, KC_LGUI, KC_LCTL, KC_LSFT, KC_RAISE, KC_LOWER \ + KC_LALT, KC_LGUI, KC_LCTL, KC_LSFT, KC_RAISE, KC_LOWER //`--------------------' `--------------------' ), - [_LOWER] = LAYOUT( \ + [_LOWER] = LAYOUT( //,-----------------------------------------. ,------------------------------------------. - KC_1, KC_2, KC_3, KC_4, KC_5, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, //|------+------+------+------+------+------| |-------+------+------+------+------+------| - KC_6, KC_7, KC_8, KC_9, KC_0, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\ + KC_6, KC_7, KC_8, KC_9, KC_0, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, //|------+------+------+------+------+------| |-------+------+------+------+------+------| - KC_EQL, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\ + KC_EQL, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, //|------+------+------+------+------+------+------| |------+-------+------+------+------+------+------| - KC_LALT, KC_LGUI, KC_LCTL, KC_LSFT, KC_RAISE, KC_LOWER \ + KC_LALT, KC_LGUI, KC_LCTL, KC_LSFT, KC_RAISE, KC_LOWER //`--------------------' `--------------------' ), - [_RAISE] = LAYOUT( \ + [_RAISE] = LAYOUT( //,-----------------------------------------. ,------------------------------------------. - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LPRN, KC_RPRN, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\ + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LPRN, KC_RPRN, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, //|------+------+------+------+------+------| |-------+------+------+------+------+------| - KC_CIRC, KC_AMPR, KC_ASTR, KC_QUOT, KC_DQUO, KC_LCBR, KC_RCBR, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_XXXXX,\ + KC_CIRC, KC_AMPR, KC_ASTR, KC_QUOT, KC_DQUO, KC_LCBR, KC_RCBR, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_XXXXX, //|------+------+------+------+------+------| |-------+------+------+------+------+------| - KC_BSLS, KC_TILD, KC_GRV, KC_UNDS, KC_PIPE, KC_LBRC, KC_RBRC, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\ + KC_BSLS, KC_TILD, KC_GRV, KC_UNDS, KC_PIPE, KC_LBRC, KC_RBRC, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, //|------+------+------+------+------+------+------| |------+-------+------+------+------+------+------| - KC_LALT, KC_LGUI, KC_LCTL, KC_LSFT, KC_RAISE, KC_LOWER \ + KC_LALT, KC_LGUI, KC_LCTL, KC_LSFT, KC_RAISE, KC_LOWER //`--------------------' `--------------------' ) }; diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h index 47a18105bd..2ccbb229b8 100644 --- a/keyboards/crkbd/keymaps/xyverz/config.h +++ b/keyboards/crkbd/keymaps/xyverz/config.h @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT #define EE_HANDS -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h index 450b62cd8f..2219e0d228 100644 --- a/keyboards/crkbd/r2g/config.h +++ b/keyboards/crkbd/r2g/config.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define SOFT_SERIAL_PIN D2 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json new file mode 100644 index 0000000000..8c878dfcc8 --- /dev/null +++ b/keyboards/crkbd/r2g/info.json @@ -0,0 +1,6 @@ +{ + "split": { + "soft_serial_pin": "D2" + }, + "bootloader": "atmel-dfu" +} diff --git a/keyboards/crkbd/r2g/rules.mk b/keyboards/crkbd/r2g/rules.mk index a3ee1b46b3..7cf008d003 100644 --- a/keyboards/crkbd/r2g/rules.mk +++ b/keyboards/crkbd/r2g/rules.mk @@ -1,9 +1,6 @@ -BOOTLOADER = atmel-dfu OLED_ENABLE = yes OLED_DRIVER = SSD1306 LTO_ENABLE = yes RGBLIGHT_ENABLE = yes - SPLIT_KEYBOARD = yes - diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index c764f1a40e..1614ebc53b 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define SOFT_SERIAL_PIN D2 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json new file mode 100644 index 0000000000..931c20aa4d --- /dev/null +++ b/keyboards/crkbd/rev1/info.json @@ -0,0 +1,6 @@ +{ + "split": { + "soft_serial_pin": "D2" + }, + "bootloader": "caterina" +} diff --git a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h index d4d7a264d3..fcf6befb16 100644 --- a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h +++ b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/config.h @@ -11,7 +11,7 @@ #define MASTER_RIGHT // #define EE_HANDS -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define TAPPING_TERM 100 // #define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk index 2e91f24848..8feaf50a07 100644 --- a/keyboards/crkbd/rules.mk +++ b/keyboards/crkbd/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # @@ -27,5 +21,3 @@ DEFAULT_FOLDER = crkbd/rev1 RGBLIGHT_SUPPORTED = yes RGB_MATRIX_SUPPORTED = yes - -LAYOUTS = split_3x5_3 split_3x6_3 |