forked from forks/qmk_firmware
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
d77b5ad0e8
|
@ -44,6 +44,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
#define ENCODERS_PAD_A { D6 }
|
||||
#define ENCODERS_PAD_B { D7 }
|
||||
#define ENCODER_RESOLUTION 2
|
||||
|
||||
/*
|
||||
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
|
||||
*/
|
||||
|
|
|
@ -16,9 +16,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#define ENCODERS_PAD_A { D6 }
|
||||
#define ENCODERS_PAD_B { D7 }
|
||||
#define ENCODER_RESOLUTION 2
|
||||
#define COMBO_COUNT 2
|
||||
#define COMBO_TERM 50
|
||||
#define TAPPING_FORCE_HOLD
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
ENCODER_ENABLE = yes
|
||||
COMBO_ENABLE = yes
|
|
@ -16,3 +16,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover
|
|||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
ENCODER_ENABLE = yes
|
||||
|
|
|
@ -47,6 +47,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
#define ENCODERS_PAD_A { B3, D1 }
|
||||
#define ENCODERS_PAD_B { B2, D2 }
|
||||
#define ENCODER_RESOLUTION 2
|
||||
|
||||
/*
|
||||
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
|
||||
*/
|
||||
|
|
|
@ -16,9 +16,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#define ENCODERS_PAD_A { B3, D1 }
|
||||
#define ENCODERS_PAD_B { B2, D2 }
|
||||
#define ENCODER_RESOLUTION 2
|
||||
#define COMBO_COUNT 2
|
||||
#define COMBO_TERM 50
|
||||
#define TAPPING_FORCE_HOLD
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
ENCODER_ENABLE = yes
|
||||
COMBO_ENABLE = yes
|
|
@ -16,3 +16,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover
|
|||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
ENCODER_ENABLE = yes
|
||||
|
|
Loading…
Reference in a new issue