Move `TAPPING_TOGGLE` to data driven (#21360)

This commit is contained in:
Ryan 2023-06-24 17:10:22 +10:00 committed by GitHub
parent 658b6aa3a6
commit 8093b13365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 70 additions and 101 deletions

View File

@ -43,8 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -10,6 +10,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "halfkay", "bootloader": "halfkay",
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT_6x7": { "LAYOUT_6x7": {
"layout": [ "layout": [

View File

@ -22,8 +22,6 @@
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define TAPPING_TOGGLE 2
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 51 #define RGB_MATRIX_LED_COUNT 51
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYPRESSES // reacts to keypresses

View File

@ -21,6 +21,9 @@
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u2", "processor": "atmega32u2",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"tapping": {
"toggle": 2
},
"layouts": { "layouts": {
"LAYOUT_ortho_4x12": { "LAYOUT_ortho_4x12": {
"layout": [ "layout": [

View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define TAPPING_TOGGLE 3
#undef LOCKING_SUPPORT_ENABLE #undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE #undef LOCKING_RESYNC_ENABLE
#define LAYER_STATE_8BIT #define LAYER_STATE_8BIT

View File

@ -16,5 +16,8 @@
"on_state": 0 "on_state": 0
}, },
"processor": "atmega16u4", "processor": "atmega16u4",
"bootloader": "atmel-dfu" "bootloader": "atmel-dfu",
"tapping": {
"toggle": 3
}
} }

View File

@ -1,20 +0,0 @@
/*
Copyright 2020 imchipwood
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 <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Reduce tapdance required taps from 5 to 2 */
#define TAPPING_TOGGLE 2

View File

@ -6,5 +6,8 @@
"usb": { "usb": {
"vid": "0xDEAF", "vid": "0xDEAF",
"pid": "0x0913" "pid": "0x0913"
},
"tapping": {
"toggle": 2
} }
} }

View File

@ -1,17 +0,0 @@
/*
Copyright 2020 imchipwood
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 <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Reduce tapdance required taps from 5 to 2 */
#define TAPPING_TOGGLE 2

View File

@ -44,8 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED
#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX
#define TAPPING_TOGGLE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -18,6 +18,9 @@
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "halfkay", "bootloader": "halfkay",
"debounce": 30, "debounce": 30,
"tapping": {
"toggle": 1
},
"community_layouts": ["ergodox"], "community_layouts": ["ergodox"],
"layouts": { "layouts": {
"LAYOUT_ergodox": { "LAYOUT_ergodox": {

View File

@ -31,8 +31,3 @@
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
//지정된 횟수로 눌러야 토글됨
#define TAPPING_TOGGLE 3

View File

@ -25,6 +25,9 @@
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "caterina", "bootloader": "caterina",
"debounce": 3, "debounce": 3,
"tapping": {
"toggle": 3
},
"layout_aliases": { "layout_aliases": {
"LAYOUT_fungo_split_num": "LAYOUT" "LAYOUT_fungo_split_num": "LAYOUT"
}, },

View File

@ -32,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_TIME_TO_MAX 60
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

View File

@ -10,6 +10,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_TIME_TO_MAX 60
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 2
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

View File

@ -11,6 +11,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"tapping": {
"toggle": 2
},
"layout_aliases": { "layout_aliases": {
"LAYOUT_georgi": "LAYOUT" "LAYOUT_georgi": "LAYOUT"
}, },

View File

@ -41,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_TIME_TO_MAX 60
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

View File

@ -13,6 +13,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"tapping": {
"toggle": 1
},
"layout_aliases": { "layout_aliases": {
"LAYOUT_gergo": "LAYOUT" "LAYOUT_gergo": "LAYOUT"
}, },

View File

@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* key combination for command */ /* key combination for command */
#define IS_COMMAND() ( \ #define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \

View File

@ -11,6 +11,9 @@
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "halfkay", "bootloader": "halfkay",
"debounce": 15, "debounce": 15,
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT_dactyl": { "LAYOUT_dactyl": {
"layout": [ "layout": [

View File

@ -24,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #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 */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

View File

@ -18,6 +18,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "caterina", "bootloader": "caterina",
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT_6x6": { "LAYOUT_6x6": {
"layout": [ "layout": [

View File

@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_MAX_SPEED 2 #define MOUSEKEY_MAX_SPEED 2
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* key combination for command */ /* key combination for command */
#define IS_COMMAND() ( \ #define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \

View File

@ -9,6 +9,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "halfkay", "bootloader": "halfkay",
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -7,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define NO_ACTION_ONESHOT #define NO_ACTION_ONESHOT
#define TAPPING_TOGGLE 3
#define RGBLIGHT_HUE_STEP 1 #define RGBLIGHT_HUE_STEP 1
#define RGBLIGHT_SAT_STEP 1 #define RGBLIGHT_SAT_STEP 1

View File

@ -21,6 +21,9 @@
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"tapping": {
"toggle": 3
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -37,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define TAPPING_TOGGLE 2

View File

@ -18,6 +18,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "caterina", "bootloader": "caterina",
"tapping": {
"toggle": 2
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* key combination for command */ /* key combination for command */
#define IS_COMMAND() ( \ #define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \

View File

@ -11,6 +11,9 @@
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "caterina", "bootloader": "caterina",
"debounce": 0, "debounce": 0,
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT_pterodactyl": { "LAYOUT_pterodactyl": {
"layout": [ "layout": [

View File

@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
//define tapping-toggle count
#define TAPPING_TOGGLE 1
//define maximum duration of hold required to register a tap vs hold default is 200 //define maximum duration of hold required to register a tap vs hold default is 200
#define TAPPING_TERM 150 //reduce time required to register a held key #define TAPPING_TERM 150 //reduce time required to register a held key

View File

@ -15,6 +15,9 @@
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "halfkay", "bootloader": "halfkay",
"tapping": {
"toggle": 1
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -11,8 +11,6 @@
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -12,6 +12,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"tapping": {
"toggle": 1
},
"community_layouts": ["ergodox"], "community_layouts": ["ergodox"],
"layouts": { "layouts": {
"LAYOUT_ergodox": { "LAYOUT_ergodox": {

View File

@ -23,8 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#define TAPPING_TOGGLE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -17,6 +17,9 @@
"processor": "MK20DX256", "processor": "MK20DX256",
"bootloader": "kiibohd", "bootloader": "kiibohd",
"board": "IC_TEENSY_3_1", "board": "IC_TEENSY_3_1",
"tapping": {
"toggle": 1
},
"community_layouts": ["ergodox"], "community_layouts": ["ergodox"],
"layouts": { "layouts": {
"LAYOUT_ergodox": { "LAYOUT_ergodox": {

View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define TAPPING_TOGGLE 2
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define WS2812_SPI SPID1 #define WS2812_SPI SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 #define WS2812_SPI_MOSI_PAL_MODE 5

View File

@ -23,6 +23,9 @@
"processor": "STM32F303", "processor": "STM32F303",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"board": "QMK_PROTON_C", "board": "QMK_PROTON_C",
"tapping": {
"toggle": 2
},
"layout_aliases": { "layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x13" "LAYOUT": "LAYOUT_ortho_4x13"
}, },

View File

@ -1,20 +0,0 @@
/*
Copyright 2021 rookiebwoy
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 <http://www.gnu.org/licenses/>.
*/
#pragma once
/* Reduce tapdance required taps from 5 to 2 */
#define TAPPING_TOGGLE 2

View File

@ -21,6 +21,9 @@
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "caterina", "bootloader": "caterina",
"tapping": {
"toggle": 2
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -110,8 +110,6 @@
#define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define TAPPING_TOGGLE 1
#define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0 #define MOUSEKEY_DELAY 0
#define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_TIME_TO_MAX 60

View File

@ -21,6 +21,9 @@
}, },
"processor": "STM32F303", "processor": "STM32F303",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"tapping": {
"toggle": 1
},
"community_layouts": ["ortho_4x12", "planck_mit"], "community_layouts": ["ortho_4x12", "planck_mit"],
"layout_aliases": { "layout_aliases": {
"LAYOUT_planck_grid": "LAYOUT_ortho_4x12", "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",

View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define TAPPING_TOGGLE 3
#define DIP_SWITCH_PINS { D0, D1, D4, D6 } #define DIP_SWITCH_PINS { D0, D1, D4, D6 }
// THK uses D5 for audio // THK uses D5 for audio

View File

@ -21,6 +21,9 @@
}, },
"processor": "atmega32a", "processor": "atmega32a",
"bootloader": "usbasploader", "bootloader": "usbasploader",
"tapping": {
"toggle": 3
},
"layout_aliases": { "layout_aliases": {
"LAYOUT_planck_grid": "LAYOUT_ortho_4x12", "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
"LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"

View File

@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define TAPPING_TOGGLE 3
/* RGB underglow */ /* RGB underglow */
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD

View File

@ -32,6 +32,9 @@
}, },
"processor": "atmega32a", "processor": "atmega32a",
"bootloader": "bootloadhid", "bootloader": "bootloadhid",
"tapping": {
"toggle": 3
},
"layouts": { "layouts": {
"LAYOUT_default": { "LAYOUT_default": {
"layout": [ "layout": [