gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-12 21:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2022-05-06 23:59:12 +00:00
commit df9f15737b
10 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/gboards/gergoplex/config.h
View File

@ -44,8 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { B1, B2, B3, D2, D3 } #define MATRIX_COL_PINS { B1, B2, B3, D2, D3 }
#define UNUSED_PINS #define UNUSED_PINS
#define IGNORE_MOD_TAP_INTERRUPT #define IGNORE_MOD_TAP_INTERRUPT
#define COMBO_ALLOW_ACTION_KEYS
#define COMBO_VARIABLE_LEN
#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))

4
keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
#define COMBO_ALLOW_ACTION_KEYS
#define COMBO_VARIABLE_LEN

1
keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk
View File

@ -10,6 +10,7 @@ DEBUG_MATRIX = no
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
#Combos! #Combos!
COMBO_ENABLE = yes
VPATH += keyboards/gboards/ VPATH += keyboards/gboards/
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)

4
keyboards/gboards/gergoplex/keymaps/default/config.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
#define COMBO_ALLOW_ACTION_KEYS
#define COMBO_VARIABLE_LEN

1
keyboards/gboards/gergoplex/keymaps/default/rules.mk
View File

@ -10,6 +10,7 @@ DEBUG_MATRIX = no
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
#Combos! #Combos!
COMBO_ENABLE = yes
VPATH += keyboards/gboards/ VPATH += keyboards/gboards/
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)

2
keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
View File

@ -25,3 +25,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#undef DEBOUNCE #undef DEBOUNCE
#define DEBOUNCE 25 #define DEBOUNCE 25
#define COMBO_ALLOW_ACTION_KEYS
#define COMBO_VARIABLE_LEN

1
keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
View File

@ -10,6 +10,7 @@ DEBUG_MATRIX = no
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
#Combos! #Combos!
COMBO_ENABLE = yes
VPATH += keyboards/gboards/ VPATH += keyboards/gboards/
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)

4
keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
#define COMBO_ALLOW_ACTION_KEYS
#define COMBO_VARIABLE_LEN

1
keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
View File

@ -10,6 +10,7 @@ DEBUG_MATRIX = no
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
#Combos! #Combos!
COMBO_ENABLE = yes
VPATH += keyboards/gboards/ VPATH += keyboards/gboards/
ifeq ($(strip $(DEBUG_MATRIX)), yes) ifeq ($(strip $(DEBUG_MATRIX)), yes)

1
keyboards/gboards/gergoplex/rules.mk
View File

@ -16,7 +16,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
COMBO_ENABLE = yes
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes
LAYOUTS = split_3x5_3 LAYOUTS = split_3x5_3