aboutsummaryrefslogtreecommitdiff
path: root/keyboards/rgbkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rgbkb')
-rw-r--r--keyboards/rgbkb/pan/keymaps/default/keymap.c31
-rw-r--r--keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c3
-rw-r--r--keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c3
-rw-r--r--keyboards/rgbkb/sol/keymaps/default/keymap.c5
-rw-r--r--keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c3
-rw-r--r--keyboards/rgbkb/sol/keymaps/xyverz/keymap.c7
-rw-r--r--keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c3
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/default/keymap.c3
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c3
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c3
10 files changed, 37 insertions, 27 deletions
diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c
index c041c0b57..f19d36256 100644
--- a/keyboards/rgbkb/pan/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c
@@ -1,18 +1,18 @@
1 /* Copyright 2020 RGBKB 1 /* Copyright 2020 RGBKB
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16// Each layer gets a name for readability, which is then used in the keymap matrix below. 16// Each layer gets a name for readability, which is then used in the keymap matrix below.
17// The underscores don't mean anything - you can have a layer called STUFF or any other name. 17// The underscores don't mean anything - you can have a layer called STUFF or any other name.
18// Layer names don't all need to be of the same length, obviously, and you can also skip them 18// Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -100,7 +100,7 @@ void oled_task_user(void) {
100} 100}
101#endif 101#endif
102 102
103void encoder_update_user(uint8_t index, bool clockwise) { 103bool encoder_update_user(uint8_t index, bool clockwise) {
104 if (index == 0) { // First encoder - right 104 if (index == 0) { // First encoder - right
105 if (clockwise) { 105 if (clockwise) {
106 tap_code(KC_VOLU); 106 tap_code(KC_VOLU);
@@ -114,4 +114,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
114 tap_code(KC_VOLD); 114 tap_code(KC_VOLD);
115 } 115 }
116 } 116 }
117 return true;
117} 118}
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
index 7f7863fdb..2ae07984d 100644
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
@@ -131,7 +131,7 @@ bool TOG_STATUS = false;
131int RGB_current_mode; 131int RGB_current_mode;
132 132
133#ifdef ENCODER_ENABLE 133#ifdef ENCODER_ENABLE
134void encoder_update_user(uint8_t index, bool clockwise) { 134bool encoder_update_user(uint8_t index, bool clockwise) {
135 if (index == 0) { /* First encoder */ 135 if (index == 0) { /* First encoder */
136 if (clockwise) { 136 if (clockwise) {
137 tap_code(KC_VOLU); 137 tap_code(KC_VOLU);
@@ -145,6 +145,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
145 tap_code(KC_DOWN); 145 tap_code(KC_DOWN);
146 } 146 }
147 } 147 }
148 return true;
148} 149}
149#endif 150#endif
150 151
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
index 860361e81..96e19bf86 100644
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
@@ -164,7 +164,7 @@ bool TOG_STATUS = false;
164int RGB_current_mode; 164int RGB_current_mode;
165 165
166#ifdef ENCODER_ENABLE 166#ifdef ENCODER_ENABLE
167void encoder_update_user(uint8_t index, bool clockwise) { 167bool encoder_update_user(uint8_t index, bool clockwise) {
168 if (index == 0) { /* First encoder */ 168 if (index == 0) { /* First encoder */
169 if (clockwise) { 169 if (clockwise) {
170 tap_code(KC_VOLU); 170 tap_code(KC_VOLU);
@@ -178,6 +178,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
178 tap_code(KC_VOLD); 178 tap_code(KC_VOLD);
179 } 179 }
180 } 180 }
181 return true;
181} 182}
182#endif 183#endif
183 184
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index 04af5165e..0883cb775 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -223,9 +223,9 @@ const uint16_t PROGMEM encoders[][NUMBER_OF_ENCODERS * 2][2] = {
223 ) 223 )
224}; 224};
225 225
226void encoder_update_user(uint8_t index, bool clockwise) { 226bool encoder_update_user(uint8_t index, bool clockwise) {
227 if (!is_keyboard_master()) 227 if (!is_keyboard_master())
228 return; 228 return true;
229 229
230#ifdef RGB_OLED_MENU 230#ifdef RGB_OLED_MENU
231 if (index == RGB_OLED_MENU) { 231 if (index == RGB_OLED_MENU) {
@@ -244,6 +244,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
244 if (keycode != KC_TRANSPARENT) 244 if (keycode != KC_TRANSPARENT)
245 tap_code16(keycode); 245 tap_code16(keycode);
246 } 246 }
247 return true;
247} 248}
248#endif 249#endif
249 250
diff --git a/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
index b587ef2b3..1c8320ac6 100644
--- a/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
79}; 79};
80 80
81#ifdef ENCODER_ENABLE 81#ifdef ENCODER_ENABLE
82void encoder_update_user(uint8_t index, bool clockwise) { 82bool encoder_update_user(uint8_t index, bool clockwise) {
83 if (index == 0) { /* First encoder */ 83 if (index == 0) { /* First encoder */
84 if (clockwise) { 84 if (clockwise) {
85 tap_code(KC_VOLU); 85 tap_code(KC_VOLU);
@@ -93,5 +93,6 @@ void encoder_update_user(uint8_t index, bool clockwise) {
93 tap_code(KC_VOLD); 93 tap_code(KC_VOLD);
94 } 94 }
95 } 95 }
96 return true;
96} 97}
97#endif 98#endif
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index e38663dbb..ed98a951c 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 KC_BSPC, KC_DEL, KC_ENT, KC_SPC \ 59 KC_BSPC, KC_DEL, KC_ENT, KC_SPC \
60 60
61 ), 61 ),
62 62
63 [_QWERTY] = LAYOUT( \ 63 [_QWERTY] = LAYOUT( \
64 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ 64 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \
65 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_END, KC_PGDN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, \ 65 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_END, KC_PGDN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, \
@@ -253,7 +253,7 @@ const uint16_t PROGMEM encoders[][NUMBER_OF_ENCODERS * 2][2] = {
253 ) 253 )
254}; 254};
255 255
256void encoder_update_user(uint8_t index, bool clockwise) { 256bool encoder_update_user(uint8_t index, bool clockwise) {
257 if (!is_keyboard_master()) 257 if (!is_keyboard_master())
258 return; 258 return;
259 259
@@ -274,6 +274,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
274 if (keycode != KC_TRANSPARENT) 274 if (keycode != KC_TRANSPARENT)
275 tap_code16(keycode); 275 tap_code16(keycode);
276 } 276 }
277 return true;
277} 278}
278#endif 279#endif
279 280
@@ -358,4 +359,4 @@ void oled_task_user(void) {
358 } 359 }
359} 360}
360 361
361#endif \ No newline at end of file 362#endif
diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
index 2f0138c8e..f31da8bf5 100644
--- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 67
68}; 68};
69 69
70void encoder_update_user(uint8_t index, bool clockwise) { 70bool encoder_update_user(uint8_t index, bool clockwise) {
71 if (index == 0) { /* First encoder */ 71 if (index == 0) { /* First encoder */
72 if (clockwise) { 72 if (clockwise) {
73 tap_code(KC_PGDN); 73 tap_code(KC_PGDN);
@@ -81,6 +81,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
81 tap_code(KC_DOWN); 81 tap_code(KC_DOWN);
82 } 82 }
83 } 83 }
84 return true;
84} 85}
85 86
86bool process_record_user(uint16_t keycode, keyrecord_t *record) { 87bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c
index f236e20a4..fa2b9a57b 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
112 ) 112 )
113}; 113};
114 114
115void encoder_update_user(uint8_t index, bool clockwise) { 115bool encoder_update_user(uint8_t index, bool clockwise) {
116 if (index == 0) { /* First encoder */ 116 if (index == 0) { /* First encoder */
117 if (clockwise) { 117 if (clockwise) {
118 tap_code(KC_PGDN); 118 tap_code(KC_PGDN);
@@ -126,6 +126,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
126 tap_code(KC_DOWN); 126 tap_code(KC_DOWN);
127 } 127 }
128 } 128 }
129 return true;
129} 130}
130 131
131bool process_record_user(uint16_t keycode, keyrecord_t *record) { 132bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
index d313bec8b..972fa4b05 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
112 ) 112 )
113}; 113};
114 114
115void encoder_update_user(uint8_t index, bool clockwise) { 115bool encoder_update_user(uint8_t index, bool clockwise) {
116 if (index == 0) { /* First encoder */ 116 if (index == 0) { /* First encoder */
117 if (clockwise) { 117 if (clockwise) {
118 tap_code(KC_PGDN); 118 tap_code(KC_PGDN);
@@ -126,6 +126,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
126 tap_code(KC_DOWN); 126 tap_code(KC_DOWN);
127 } 127 }
128 } 128 }
129 return true;
129} 130}
130 131
131bool process_record_user(uint16_t keycode, keyrecord_t *record) { 132bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
index 29702b614..c4bcbcfbe 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 ) 67 )
68}; 68};
69 69
70void encoder_update_user(uint8_t index, bool clockwise) { 70bool encoder_update_user(uint8_t index, bool clockwise) {
71 if (index == 0) { /* First encoder */ 71 if (index == 0) { /* First encoder */
72 if (clockwise) { 72 if (clockwise) {
73 tap_code(KC_PGDN); 73 tap_code(KC_PGDN);
@@ -81,4 +81,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
81 tap_code(KC_DOWN); 81 tap_code(KC_DOWN);
82 } 82 }
83 } 83 }
84 return true;
84} 85}