aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-11-17 12:54:12 -0800
committerGitHub <noreply@github.com>2021-11-17 20:54:12 +0000
commit10e896630ce9283b42b8cdbf44ccb81538dc9851 (patch)
treecc6d582c8ed05f2e12eae47233daab0b96081077
parent254e26554b27aafc1d9676cec63263ede738bf57 (diff)
downloadqmk_firmware-10e896630ce9283b42b8cdbf44ccb81538dc9851.tar.gz
qmk_firmware-10e896630ce9283b42b8cdbf44ccb81538dc9851.zip
[Keyboard] Move encoder hacks into via keymaps for Work Louder boards (#15192)
Diffstat
-rw-r--r--keyboards/work_louder/loop/keymaps/via/keymap.c8
-rw-r--r--keyboards/work_louder/loop/keymaps/via/rules.mk2
-rw-r--r--keyboards/work_louder/loop/loop.h8
-rw-r--r--keyboards/work_louder/loop/rules.mk4
-rw-r--r--keyboards/work_louder/nano/keymaps/via/keymap.c7
-rw-r--r--keyboards/work_louder/nano/keymaps/via/rules.mk2
-rw-r--r--keyboards/work_louder/nano/nano.h7
-rw-r--r--keyboards/work_louder/nano/rules.mk4
-rw-r--r--keyboards/work_louder/work_board/keymaps/via/keymap.c13
-rw-r--r--keyboards/work_louder/work_board/keymaps/via/rules.mk2
-rw-r--r--keyboards/work_louder/work_board/rules.mk2
-rw-r--r--keyboards/work_louder/work_board/work_board.h26
12 files changed, 41 insertions, 44 deletions
diff --git a/keyboards/work_louder/loop/keymaps/via/keymap.c b/keyboards/work_louder/loop/keymaps/via/keymap.c
index c5769b991..22113e836 100644
--- a/keyboards/work_louder/loop/keymaps/via/keymap.c
+++ b/keyboards/work_louder/loop/keymaps/via/keymap.c
@@ -15,6 +15,14 @@
15 */ 15 */
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17 17
18#define LAYOUT_via( \
19 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
20 k00_a, k00_b, k01_a, k01_b, k02_a, k02_b \
21) { \
22 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
23 { k00_a, k00_b, k01_a, k01_b, k02_a, k02_b } \
24}
25
18// clang-format off 26// clang-format off
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT_via( 28 [0] = LAYOUT_via(
diff --git a/keyboards/work_louder/loop/keymaps/via/rules.mk b/keyboards/work_louder/loop/keymaps/via/rules.mk
index 36b7ba9cb..6098ef3ad 100644
--- a/keyboards/work_louder/loop/keymaps/via/rules.mk
+++ b/keyboards/work_louder/loop/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2LTO_ENABLE = yes 2LTO_ENABLE = yes
3
4SRC += encoder_actions.c
diff --git a/keyboards/work_louder/loop/loop.h b/keyboards/work_louder/loop/loop.h
index acad9d7b3..cfc58146d 100644
--- a/keyboards/work_louder/loop/loop.h
+++ b/keyboards/work_louder/loop/loop.h
@@ -33,11 +33,3 @@
33) { \ 33) { \
34 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b } \ 34 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b } \
35} 35}
36
37#define LAYOUT_via( \
38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
39 k00_a, k00_b, k01_a, k01_b, k02_a, k02_b \
40) { \
41 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
42 { k00_a, k00_b, k01_a, k01_b, k02_a, k02_b } \
43}
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index 7e3f75e17..135291a7e 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -20,7 +20,9 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22ENCODER_ENABLE = yes 22ENCODER_ENABLE = yes
23LTO_ENABLE = yes
24
23RGB_MATRIX_ENABLE = yes 25RGB_MATRIX_ENABLE = yes
24RGB_MATRIX_DRIVER = WS2812 26RGB_MATRIX_DRIVER = WS2812
25 27
26SRC += encoder_actions.c rgb_functions.c 28SRC += rgb_functions.c
diff --git a/keyboards/work_louder/nano/keymaps/via/keymap.c b/keyboards/work_louder/nano/keymaps/via/keymap.c
index 84a54a4aa..7461172e0 100644
--- a/keyboards/work_louder/nano/keymaps/via/keymap.c
+++ b/keyboards/work_louder/nano/keymaps/via/keymap.c
@@ -16,6 +16,13 @@
16#include QMK_KEYBOARD_H 16#include QMK_KEYBOARD_H
17 17
18 18
19#define LAYOUT_via( \
20 k00, k01, k02, \
21 k00_a, k00_b \
22) { \
23 { k00, k01, k02, k00_a, k00_b } \
24}
25
19 26
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 /* Base */ 28 /* Base */
diff --git a/keyboards/work_louder/nano/keymaps/via/rules.mk b/keyboards/work_louder/nano/keymaps/via/rules.mk
index 36b7ba9cb..6098ef3ad 100644
--- a/keyboards/work_louder/nano/keymaps/via/rules.mk
+++ b/keyboards/work_louder/nano/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2LTO_ENABLE = yes 2LTO_ENABLE = yes
3
4SRC += encoder_actions.c
diff --git a/keyboards/work_louder/nano/nano.h b/keyboards/work_louder/nano/nano.h
index 6f7463e6a..6230d75ab 100644
--- a/keyboards/work_louder/nano/nano.h
+++ b/keyboards/work_louder/nano/nano.h
@@ -33,10 +33,3 @@
33) { \ 33) { \
34 { k00, k01, k02 } \ 34 { k00, k01, k02 } \
35} 35}
36
37#define LAYOUT_via( \
38 k00, k01, k02, \
39 k00_a, k00_b \
40) { \
41 { k00, k01, k02, k00_a, k00_b } \
42}
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index 843d80fe6..a97f07042 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -20,7 +20,9 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22ENCODER_ENABLE = yes 22ENCODER_ENABLE = yes
23LTO_ENABLE = yes
24
23RGB_MATRIX_ENABLE = yes 25RGB_MATRIX_ENABLE = yes
24RGB_MATRIX_DRIVER = WS2812 26RGB_MATRIX_DRIVER = WS2812
25 27
26SRC += encoder_actions.c rgb_functions.c 28SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index 70027697b..5675adf2e 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -30,6 +30,19 @@ enum tap_dances {
30#define LOWER FN_MO13 30#define LOWER FN_MO13
31#define RAISE FN_MO23 31#define RAISE FN_MO23
32 32
33#define LAYOUT_via( \
34 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
35 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a, \
36 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b, \
37 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
38) \
39{ \
40 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
41 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a }, \
42 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b }, \
43 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
44}
45
33// clang-format off 46// clang-format off
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 47const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 [_QWERTY] = LAYOUT_via( 48 [_QWERTY] = LAYOUT_via(
diff --git a/keyboards/work_louder/work_board/keymaps/via/rules.mk b/keyboards/work_louder/work_board/keymaps/via/rules.mk
index 791d5ab50..7964f4279 100644
--- a/keyboards/work_louder/work_board/keymaps/via/rules.mk
+++ b/keyboards/work_louder/work_board/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
1VIA_ENABLE = yes 1VIA_ENABLE = yes
2TAP_DANCE_ENABLE = yes 2TAP_DANCE_ENABLE = yes
3
4SRC += encoder_actions.c
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
index 7ecf7db5d..a97f07042 100644
--- a/keyboards/work_louder/work_board/rules.mk
+++ b/keyboards/work_louder/work_board/rules.mk
@@ -25,4 +25,4 @@ LTO_ENABLE = yes
25RGB_MATRIX_ENABLE = yes 25RGB_MATRIX_ENABLE = yes
26RGB_MATRIX_DRIVER = WS2812 26RGB_MATRIX_DRIVER = WS2812
27 27
28SRC += encoder_actions.c rgb_functions.c 28SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/work_board.h b/keyboards/work_louder/work_board/work_board.h
index 25a881a19..f1bc74b70 100644
--- a/keyboards/work_louder/work_board/work_board.h
+++ b/keyboards/work_louder/work_board/work_board.h
@@ -55,29 +55,3 @@
55 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \ 55 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
56 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \ 56 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
57} 57}
58
59#define LAYOUT_2u_space_via( \
60 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
61 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a, \
62 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b, \
63 k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \
64) \
65{ \
66 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
67 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a }, \
68 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b }, \
69 { k30, k31, k32, k33, k34, k35, ___, k37, k38, k39, k3a, k3b, ___ } \
70}
71
72#define LAYOUT_via( \
73 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
74 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a, \
75 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b, \
76 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
77) \
78{ \
79 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
80 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k0c_a }, \
81 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k0c_b }, \
82 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
83}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 23:09:29 +0000