Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
121a2e0f07
12 changed files with 41 additions and 44 deletions
|
@ -15,6 +15,14 @@
|
|||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#define LAYOUT_via( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
|
||||
k00_a, k00_b, k01_a, k01_b, k02_a, k02_b \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
|
||||
{ k00_a, k00_b, k01_a, k01_b, k02_a, k02_b } \
|
||||
}
|
||||
|
||||
// clang-format off
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT_via(
|
||||
|
|
|
@ -1,2 +1,4 @@
|
|||
VIA_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
|
||||
SRC += encoder_actions.c
|
||||
|
|
|
@ -33,11 +33,3 @@
|
|||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b } \
|
||||
}
|
||||
|
||||
#define LAYOUT_via( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
|
||||
k00_a, k00_b, k01_a, k01_b, k02_a, k02_b \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
|
||||
{ k00_a, k00_b, k01_a, k01_b, k02_a, k02_b } \
|
||||
}
|
||||
|
|
|
@ -20,8 +20,10 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
|||
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
ENCODER_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
||||
RGB_MATRIX_DRIVER = WS2812
|
||||
LTO_ENABLE = yes
|
||||
|
||||
SRC += encoder_actions.c rgb_functions.c
|
||||
SRC += rgb_functions.c
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue