g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2021-11-17 20:54:48 +00:00
parent b47f3b1853 10e896630c
commit 121a2e0f07
12 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keyboards/work_louder/loop/keymaps/via/keymap.c
View File

@ -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(

2
keyboards/work_louder/loop/keymaps/via/rules.mk
View File

@ -1,2 +1,4 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
SRC += encoder_actions.c

8
keyboards/work_louder/loop/loop.h
View File

@ -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 } \
}

4
keyboards/work_louder/loop/rules.mk
View File

@ -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

7
keyboards/work_louder/nano/keymaps/via/keymap.c
View File

@ -16,6 +16,13 @@
#include QMK_KEYBOARD_H
#define LAYOUT_via( \
k00, k01, k02, \
k00_a, k00_b \
) { \
{ k00, k01, k02, k00_a, k00_b } \
}
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */

2
keyboards/work_louder/nano/keymaps/via/rules.mk
View File

@ -1,2 +1,4 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
SRC += encoder_actions.c

7
keyboards/work_louder/nano/nano.h
View File

@ -33,10 +33,3 @@
) { \
{ k00, k01, k02 } \
}
#define LAYOUT_via( \
k00, k01, k02, \
k00_a, k00_b \
) { \
{ k00, k01, k02, k00_a, k00_b } \
}

4
keyboards/work_louder/nano/rules.mk
View File

@ -20,7 +20,9 @@ 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
SRC += encoder_actions.c rgb_functions.c
SRC += rgb_functions.c

13
keyboards/work_louder/work_board/keymaps/via/keymap.c
View File

@ -30,6 +30,19 @@ enum tap_dances {
#define LOWER FN_MO13
#define RAISE FN_MO23
#define LAYOUT_via( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
) \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
}
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_via(

2
keyboards/work_louder/work_board/keymaps/via/rules.mk
View File

@ -1,2 +1,4 @@
VIA_ENABLE = yes
TAP_DANCE_ENABLE = yes
SRC += encoder_actions.c

2
keyboards/work_louder/work_board/rules.mk
View File

@ -25,4 +25,4 @@ LTO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
SRC += encoder_actions.c rgb_functions.c
SRC += rgb_functions.c

26
keyboards/work_louder/work_board/work_board.h
View File

@ -55,29 +55,3 @@
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
}
#define LAYOUT_2u_space_via( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b, \
k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \
) \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b }, \
{ k30, k31, k32, k33, k34, k35, ___, k37, k38, k39, k3a, k3b, ___ } \
}
#define LAYOUT_via( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
) \
{ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
}