aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-05-27 21:30:47 -0700
committerGitHub <noreply@github.com>2021-05-27 21:30:47 -0700
commitb96304930528c891f30686911884c8551db601fb (patch)
tree6a7d7504650483023bf68fd6e23c68ac8fc84749
parent5386c4c7b293ae6473df3a81e40a072a42b085ad (diff)
downloadqmk_firmware-b96304930528c891f30686911884c8551db601fb.tar.gz
qmk_firmware-b96304930528c891f30686911884c8551db601fb.zip
Fix keyboards/keymaps for boolean encoder callback changes (#12985)
Diffstat
-rw-r--r--keyboards/handwired/amigopunk/keymaps/default/keymap.c2
-rw-r--r--keyboards/keyprez/corgi/keymaps/default/keymap.c3
-rwxr-xr-xkeyboards/mechwild/mercutio/keymaps/jonavin/keymap.c3
-rw-r--r--keyboards/mechwild/murphpad/keymaps/default/keymap.c18
-rw-r--r--keyboards/mechwild/murphpad/keymaps/via/keymap.c28
-rw-r--r--keyboards/minimacro5/keymaps/devdev/keymap.c40
-rw-r--r--keyboards/planck/thk/keymaps/thk/keymap.c3
-rw-r--r--keyboards/sofle/keymaps/devdev/keymap.c181
-rw-r--r--keyboards/sofle/keymaps/rgb_default/keymap.c181
9 files changed, 231 insertions, 228 deletions
diff --git a/keyboards/handwired/amigopunk/keymaps/default/keymap.c b/keyboards/handwired/amigopunk/keymaps/default/keymap.c
index 70c6e7725..cdfe97402 100644
--- a/keyboards/handwired/amigopunk/keymaps/default/keymap.c
+++ b/keyboards/handwired/amigopunk/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39#ifdef ENCODER_ENABLE 39#ifdef ENCODER_ENABLE
40bool encoder_update_user(uint8_t index, bool clockwise) { 40bool encoder_update_user(uint8_t index, bool clockwise) {
41 if (index != 0) 41 if (index != 0)
42 return; 42 return false;
43 43
44 tap_code(clockwise ? KC_VOLU : KC_VOLD); 44 tap_code(clockwise ? KC_VOLU : KC_VOLD);
45 return true; 45 return true;
diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c
index 01f56320b..a1f816449 100644
--- a/keyboards/keyprez/corgi/keymaps/default/keymap.c
+++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c
@@ -107,6 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
107 ), 107 ),
108}; 108};
109 109
110void encoder_update_user(uint8_t index, bool clockwise) { 110bool encoder_update_user(uint8_t index, bool clockwise) {
111 tap_code(clockwise ? KC_VOLU : KC_VOLD); 111 tap_code(clockwise ? KC_VOLU : KC_VOLD);
112 return true;
112} 113}
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
index fbbe2660c..f5dddcfac 100755
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
58 58
59#ifdef ENCODER_ENABLE // Encoder Functionality 59#ifdef ENCODER_ENABLE // Encoder Functionality
60 uint8_t selected_layer = 0; 60 uint8_t selected_layer = 0;
61 void encoder_update_user(uint8_t index, bool clockwise) { 61 bool encoder_update_user(uint8_t index, bool clockwise) {
62 #ifdef OLED_DRIVER_ENABLE 62 #ifdef OLED_DRIVER_ENABLE
63 oled_clear(); 63 oled_clear();
64 oled_render(); 64 oled_render();
@@ -81,6 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
81 } 81 }
82 } 82 }
83 } 83 }
84 return true;
84 } 85 }
85#endif 86#endif
86 87
diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
index da9b28f29..685cc9108 100644
--- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
@@ -34,18 +34,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, 34 KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO,
35 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, 35 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT,
36 KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, 36 KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO,
37 37
38 KC_F5, KC_F6, KC_F7 38 KC_F5, KC_F6, KC_F7
39 39
40 ), 40 ),
41 [_FN1] = LAYOUT( 41 [_FN1] = LAYOUT(
42 _______, _______, _______, _______, 42 _______, _______, _______, _______,
43 _______, _______, _______, _______, 43 _______, _______, _______, _______,
44 RGB_HUD, RGB_SPI, RGB_HUI, _______, 44 RGB_HUD, RGB_SPI, RGB_HUI, _______,
45 _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, 45 _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO,
46 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, 46 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______,
47 _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, 47 _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO,
48 48
49 _______, _______, _______ 49 _______, _______, _______
50 50
51 ), 51 ),
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
56 _______, _______, _______, _______, KC_NO, 56 _______, _______, _______, _______, KC_NO,
57 _______, _______, _______, _______, _______, 57 _______, _______, _______, _______, _______,
58 _______, _______, _______, _______, KC_NO, 58 _______, _______, _______, _______, KC_NO,
59 59
60 _______, _______, _______ 60 _______, _______, _______
61 61
62 ), 62 ),
@@ -67,14 +67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 _______, _______, _______, _______, KC_NO, 67 _______, _______, _______, _______, KC_NO,
68 _______, _______, _______, _______, _______, 68 _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, KC_NO, 69 _______, _______, _______, _______, KC_NO,
70 70
71 _______, _______, _______ 71 _______, _______, _______
72 72
73 ) 73 )
74}; 74};
75 75
76#ifdef ENCODER_ENABLE 76#ifdef ENCODER_ENABLE
77void encoder_update_user(uint8_t index, bool clockwise) { 77bool encoder_update_user(uint8_t index, bool clockwise) {
78 switch (index) { 78 switch (index) {
79 case 0: 79 case 0:
80 if (clockwise) { 80 if (clockwise) {
@@ -84,7 +84,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
84 } 84 }
85 break; 85 break;
86 } 86 }
87 87 return true;
88} 88}
89#endif 89#endif
90 90
@@ -109,7 +109,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
109 } 109 }
110 110
111 void oled_task_user(void) { 111 void oled_task_user(void) {
112 render_logo(); 112 render_logo();
113 oled_set_cursor(0,6); 113 oled_set_cursor(0,6);
114 114
115 oled_write_ln_P(PSTR("Layer"), false); 115 oled_write_ln_P(PSTR("Layer"), false);
@@ -137,4 +137,4 @@ void encoder_update_user(uint8_t index, bool clockwise) {
137 oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); 137 oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
138 oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); 138 oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
139 } 139 }
140#endif \ No newline at end of file 140#endif
diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
index 630b47f8c..bd74d2184 100644
--- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
@@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, 32 KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO,
33 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, 33 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT,
34 KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, 34 KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO,
35 35
36 _______, _______, _______ 36 _______, _______, _______
37 37
38 ), 38 ),
39 [_FN1] = LAYOUT( 39 [_FN1] = LAYOUT(
40 _______, _______, _______, _______, 40 _______, _______, _______, _______,
@@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, 43 _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO,
44 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, 44 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______,
45 _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, 45 _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO,
46 46
47 _______, _______, _______ 47 _______, _______, _______
48 48
49 ), 49 ),
50 [_FN2] = LAYOUT( 50 [_FN2] = LAYOUT(
51 _______, _______, _______, _______, 51 _______, _______, _______, _______,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
54 _______, _______, _______, _______, KC_NO, 54 _______, _______, _______, _______, KC_NO,
55 _______, _______, _______, _______, _______, 55 _______, _______, _______, _______, _______,
56 _______, _______, _______, _______, KC_NO, 56 _______, _______, _______, _______, KC_NO,
57 57
58 _______, _______, _______ 58 _______, _______, _______
59 59
60 ), 60 ),
61 [_FN3] = LAYOUT( 61 [_FN3] = LAYOUT(
62 _______, _______, _______, _______, 62 _______, _______, _______, _______,
63 _______, _______, _______, _______, 63 _______, _______, _______, _______,
@@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
65 _______, _______, _______, _______, KC_NO, 65 _______, _______, _______, _______, KC_NO,
66 _______, _______, _______, _______, _______, 66 _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, KC_NO, 67 _______, _______, _______, _______, KC_NO,
68 68
69 _______, _______, _______ 69 _______, _______, _______
70 70
71 ) 71 )
72}; 72};
73 73
74#ifdef ENCODER_ENABLE 74#ifdef ENCODER_ENABLE
75void encoder_update_user(uint8_t index, bool clockwise) { 75bool encoder_update_user(uint8_t index, bool clockwise) {
76 switch (index) { 76 switch (index) {
77 case 0: 77 case 0:
78 if (clockwise) { 78 if (clockwise) {
@@ -82,7 +82,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
82 } 82 }
83 break; 83 break;
84 } 84 }
85 85 return true;
86} 86}
87#endif 87#endif
88 88
@@ -107,7 +107,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
107 } 107 }
108 108
109 void oled_task_user(void) { 109 void oled_task_user(void) {
110 render_logo(); 110 render_logo();
111 oled_set_cursor(0,6); 111 oled_set_cursor(0,6);
112 112
113 oled_write_ln_P(PSTR("Layer"), false); 113 oled_write_ln_P(PSTR("Layer"), false);
@@ -135,4 +135,4 @@ void encoder_update_user(uint8_t index, bool clockwise) {
135 oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); 135 oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
136 oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); 136 oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
137 } 137 }
138#endif \ No newline at end of file 138#endif
diff --git a/keyboards/minimacro5/keymaps/devdev/keymap.c b/keyboards/minimacro5/keymaps/devdev/keymap.c
index dc5a9b0de..d7f998fa3 100644
--- a/keyboards/minimacro5/keymaps/devdev/keymap.c
+++ b/keyboards/minimacro5/keymaps/devdev/keymap.c
@@ -1,18 +1,18 @@
1/* Copyright 2020 Dane Evans 1/* Copyright 2020 Dane Evans
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// MINI MACRO 5 16// MINI MACRO 5
17 17
18#include QMK_KEYBOARD_H 18#include QMK_KEYBOARD_H
@@ -31,11 +31,11 @@ enum tap_dances{
31 TD_TO_MEDIA, 31 TD_TO_MEDIA,
32 TD_TO_MAIN, 32 TD_TO_MAIN,
33 TD_RESET_SLIDER 33 TD_RESET_SLIDER
34 34
35}; 35};
36 36
37 37
38void encoder_update_user(uint8_t index, bool clockwise) { 38bool encoder_update_user(uint8_t index, bool clockwise) {
39 if (index == 0) { /* First encoder*/ 39 if (index == 0) { /* First encoder*/
40 switch(biton32(layer_state)){ 40 switch(biton32(layer_state)){
41 case _MAIN: 41 case _MAIN:
@@ -75,6 +75,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
75 break; 75 break;
76 } 76 }
77 } 77 }
78 return true;
78} 79}
79 80
80// 81//
@@ -95,8 +96,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest
95}; 96};
96 97
97layer_state_t layer_state_set_user(layer_state_t state) { 98layer_state_t layer_state_set_user(layer_state_t state) {
98 99
99 if (layer_state_cmp(state, _MAIN)) // this one not working 100 if (layer_state_cmp(state, _MAIN)) // this one not working
100 rgblight_sethsv_at(HSV_GREEN, 0); 101 rgblight_sethsv_at(HSV_GREEN, 0);
101 if (layer_state_cmp(state, _MEDIA)) 102 if (layer_state_cmp(state, _MEDIA))
102 rgblight_sethsv_at(HSV_RED, 0); 103 rgblight_sethsv_at(HSV_RED, 0);
@@ -121,6 +122,3 @@ qk_tap_dance_action_t tap_dance_actions[] = {
121 [TD_TO_MAIN] = ACTION_TAP_DANCE_LAYER_MOVE(KC_MUTE, _MAIN), 122 [TD_TO_MAIN] = ACTION_TAP_DANCE_LAYER_MOVE(KC_MUTE, _MAIN),
122 [TD_RESET_SLIDER] = ACTION_TAP_DANCE_LAYER_MOVE(KC_0, _MAIN) 123 [TD_RESET_SLIDER] = ACTION_TAP_DANCE_LAYER_MOVE(KC_0, _MAIN)
123}; 124};
124
125
126
diff --git a/keyboards/planck/thk/keymaps/thk/keymap.c b/keyboards/planck/thk/keymaps/thk/keymap.c
index 44cd33370..948393b53 100644
--- a/keyboards/planck/thk/keymaps/thk/keymap.c
+++ b/keyboards/planck/thk/keymaps/thk/keymap.c
@@ -180,7 +180,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
180 180
181bool encoder_mode = false; 181bool encoder_mode = false;
182 182
183void encoder_update(bool clockwise) { 183bool encoder_update_user(uint8_t index, bool clockwise) {
184 if (index == 0) { /* First encoder */ 184 if (index == 0) { /* First encoder */
185 if (clockwise) { 185 if (clockwise) {
186 #ifdef MOUSEKEY_ENABLE 186 #ifdef MOUSEKEY_ENABLE
@@ -210,6 +210,7 @@ void encoder_update(bool clockwise) {
210 } 210 }
211 } 211 }
212 } 212 }
213 return true;
213} 214}
214 215
215void dip_switch_update_user(uint8_t index, bool active) { 216void dip_switch_update_user(uint8_t index, bool active) {
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index 7d100abb6..681e7dd6a 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -1,19 +1,19 @@
1 1
2 /* Copyright 2021 Dane Evans 2 /* Copyright 2021 Dane Evans
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or 6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 // SOFLE RGB 17 // SOFLE RGB
18#include <stdio.h> 18#include <stdio.h>
19 19
@@ -21,16 +21,16 @@
21 21
22#define INDICATOR_BRIGHTNESS 30 22#define INDICATOR_BRIGHTNESS 30
23 23
24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override 24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override) 25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override)
26 26
27// Light combinations 27// Light combinations
28#define SET_INDICATORS(hsv) \ 28#define SET_INDICATORS(hsv) \
29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
30 {35+0, 1, hsv} 30 {35+0, 1, hsv}
31#define SET_UNDERGLOW(hsv) \ 31#define SET_UNDERGLOW(hsv) \
32 {1, 5, hsv}, \ 32 {1, 5, hsv}, \
33 {35+1, 5,hsv} 33 {35+1, 5,hsv}
34#define SET_NUMPAD(hsv) \ 34#define SET_NUMPAD(hsv) \
35 {35+15, 5, hsv},\ 35 {35+15, 5, hsv},\
36 {35+22, 3, hsv},\ 36 {35+22, 3, hsv},\
@@ -44,14 +44,14 @@
44 {35+ 30, 2, hsv} 44 {35+ 30, 2, hsv}
45#define SET_INNER_COL(hsv) \ 45#define SET_INNER_COL(hsv) \
46 {33, 4, hsv}, \ 46 {33, 4, hsv}, \
47 {35+ 33, 4, hsv} 47 {35+ 33, 4, hsv}
48 48
49#define SET_OUTER_COL(hsv) \ 49#define SET_OUTER_COL(hsv) \
50 {7, 4, hsv}, \ 50 {7, 4, hsv}, \
51 {35+ 7, 4, hsv} 51 {35+ 7, 4, hsv}
52#define SET_THUMB_CLUSTER(hsv) \ 52#define SET_THUMB_CLUSTER(hsv) \
53 {25, 2, hsv}, \ 53 {25, 2, hsv}, \
54 {35+ 25, 2, hsv} 54 {35+ 25, 2, hsv}
55#define SET_LAYER_ID(hsv) \ 55#define SET_LAYER_ID(hsv) \
56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
@@ -60,14 +60,14 @@
60 {7, 4, hsv}, \ 60 {7, 4, hsv}, \
61 {35+ 7, 4, hsv}, \ 61 {35+ 7, 4, hsv}, \
62 {25, 2, hsv}, \ 62 {25, 2, hsv}, \
63 {35+ 25, 2, hsv} 63 {35+ 25, 2, hsv}
64 64
65 65
66enum sofle_layers { 66enum sofle_layers {
67 _DEFAULTS = 0, 67 _DEFAULTS = 0,
68 _QWERTY = 0, 68 _QWERTY = 0,
69 _COLEMAK, 69 _COLEMAK,
70 _COLEMAKDH, 70 _COLEMAKDH,
71 _LOWER, 71 _LOWER,
72 _RAISE, 72 _RAISE,
73 _ADJUST, 73 _ADJUST,
@@ -104,15 +104,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 [_QWERTY] = LAYOUT( 104 [_QWERTY] = LAYOUT(
105 //,------------------------------------------------. ,---------------------------------------------------. 105 //,------------------------------------------------. ,---------------------------------------------------.
106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV, 106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV,
107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, 112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT 114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT
115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
116), 116),
117 117
118/* 118/*
@@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133[_COLEMAK] = LAYOUT( 133[_COLEMAK] = LAYOUT(
134 //,------------------------------------------------. ,---------------------------------------------------. 134 //,------------------------------------------------. ,---------------------------------------------------.
135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
145), 145),
146 146
147/* 147/*
@@ -162,15 +162,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
162[_COLEMAKDH] = LAYOUT( 162[_COLEMAKDH] = LAYOUT(
163 //,------------------------------------------------. ,---------------------------------------------------. 163 //,------------------------------------------------. ,---------------------------------------------------.
164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
174), 174),
175 175
176/* LOWER 176/* LOWER
@@ -190,15 +190,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
190[_LOWER] = LAYOUT( 190[_LOWER] = LAYOUT(
191 //,------------------------------------------------. ,---------------------------------------------------. 191 //,------------------------------------------------. ,---------------------------------------------------.
192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL, 196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL,
197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, 198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______,
199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
202), 202),
203/* RAISE 203/* RAISE
204 * ,----------------------------------------. ,-----------------------------------------. 204 * ,----------------------------------------. ,-----------------------------------------.
@@ -217,17 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
217[_RAISE] = LAYOUT( 217[_RAISE] = LAYOUT(
218 //,------------------------------------------------. ,---------------------------------------------------. 218 //,------------------------------------------------. ,---------------------------------------------------.
219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, 219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______,
220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, 223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, 225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
229), 229),
230/* ADJUST 230/* ADJUST
231 * ,-----------------------------------------. ,-----------------------------------------. 231 * ,-----------------------------------------. ,-----------------------------------------.
232 * | | | | | | | | | | | | | | 232 * | | | | | | | | | | | | | |
233 * |------+------+------+------+------+------| |------+------+------+------+------+------| 233 * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -244,15 +244,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
244 [_ADJUST] = LAYOUT( 244 [_ADJUST] = LAYOUT(
245 //,------------------------------------------------. ,---------------------------------------------------. 245 //,------------------------------------------------. ,---------------------------------------------------.
246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX, 250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX,
251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, 252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
256), 256),
257/* NUMPAD 257/* NUMPAD
258 * ,-----------------------------------------. ,-----------------------------------------. 258 * ,-----------------------------------------. ,-----------------------------------------.
@@ -271,15 +271,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
271[_NUMPAD] = LAYOUT( 271[_NUMPAD] = LAYOUT(
272 //,------------------------------------------------. ,---------------------------------------------------. 272 //,------------------------------------------------. ,---------------------------------------------------.
273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______, 275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______,
276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE, 277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE,
278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, 279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______,
280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ 281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______
282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
283), 283),
284 284
285/* SWITCH 285/* SWITCH
@@ -296,51 +296,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
296 * | | | | |/ / \ \ | | | | | 296 * | | | | |/ / \ \ | | | | |
297 * `----------------------------------' '------''---------------------------' 297 * `----------------------------------' '------''---------------------------'
298 */ 298 */
299 // layer switcher 299 // layer switcher
300[_SWITCH] = LAYOUT( 300[_SWITCH] = LAYOUT(
301 //,------------------------------------------------. ,---------------------------------------------------. 301 //,------------------------------------------------. ,---------------------------------------------------.
302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, 304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET,
305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, 306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST,
307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO 310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
312 312
313 ), 313 ),
314}; 314};
315 315
316#ifdef RGBLIGHT_ENABLE 316#ifdef RGBLIGHT_ENABLE
317char layer_state_str[70]; 317char layer_state_str[70];
318// Now define the array of layers. Later layers take precedence 318// Now define the array of layers. Later layers take precedence
319 319
320// QWERTY, 320// QWERTY,
321// Light on inner column and underglow 321// Light on inner column and underglow
322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( 322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS(
323 SET_LAYER_ID(HSV_RED) 323 SET_LAYER_ID(HSV_RED)
324 324
325); 325);
326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( 326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS(
327 SET_LAYER_ID(HSV_PINK) 327 SET_LAYER_ID(HSV_PINK)
328); 328);
329 329
330// _NUM, 330// _NUM,
331// Light on outer column and underglow 331// Light on outer column and underglow
332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( 332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS(
333 SET_LAYER_ID(HSV_TEAL) 333 SET_LAYER_ID(HSV_TEAL)
334 334
335); 335);
336// _SYMBOL, 336// _SYMBOL,
337// Light on inner column and underglow 337// Light on inner column and underglow
338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( 338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS(
339 SET_LAYER_ID(HSV_BLUE) 339 SET_LAYER_ID(HSV_BLUE)
340 340
341 ); 341 );
342// _COMMAND, 342// _COMMAND,
343// Light on inner column and underglow 343// Light on inner column and underglow
344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( 344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS(
345 SET_LAYER_ID(HSV_PURPLE) 345 SET_LAYER_ID(HSV_PURPLE)
346); 346);
@@ -356,18 +356,18 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS
356 {35+25, 2, HSV_ORANGE} 356 {35+25, 2, HSV_ORANGE}
357 ); 357 );
358// _SWITCHER // light up top row 358// _SWITCHER // light up top row
359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( 359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS(
360 SET_LAYER_ID(HSV_GREEN), 360 SET_LAYER_ID(HSV_GREEN),
361 SET_NUMROW(HSV_GREEN) 361 SET_NUMROW(HSV_GREEN)
362); 362);
363 363
364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
365 365
366 layer_qwerty_lights, 366 layer_qwerty_lights,
367 layer_num_lights,// overrides layer 1 367 layer_num_lights,// overrides layer 1
368 layer_symbol_lights, 368 layer_symbol_lights,
369 layer_command_lights, 369 layer_command_lights,
370 layer_numpad_lights, 370 layer_numpad_lights,
371 layer_switcher_lights, // Overrides other layers 371 layer_switcher_lights, // Overrides other layers
372 layer_colemakdh_lights 372 layer_colemakdh_lights
373); 373);
@@ -376,7 +376,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); 376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH)); 377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH));
378 378
379 379
380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER)); 380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER));
381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE)); 381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE));
382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST)); 382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST));
@@ -387,8 +387,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
387void keyboard_post_init_user(void) { 387void keyboard_post_init_user(void) {
388 // Enable the LED layers 388 // Enable the LED layers
389 rgblight_layers = my_rgb_layers; 389 rgblight_layers = my_rgb_layers;
390 390
391 rgblight_mode(10);// haven't found a way to set this in a more useful way 391 rgblight_mode(10);// haven't found a way to set this in a more useful way
392 392
393} 393}
394#endif 394#endif
@@ -411,9 +411,9 @@ static void print_status_narrow(void) {
411 oled_write_ln_P(PSTR("Dane\nEvans"), false); 411 oled_write_ln_P(PSTR("Dane\nEvans"), false);
412 412
413 oled_write_ln_P(PSTR(""), false); 413 oled_write_ln_P(PSTR(""), false);
414 414
415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state) 415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state)
416 416
417 417
418 switch (get_highest_layer(default_layer_state)) { 418 switch (get_highest_layer(default_layer_state)) {
419 case _QWERTY: 419 case _QWERTY:
@@ -424,8 +424,8 @@ static void print_status_narrow(void) {
424 break; 424 break;
425 case _COLEMAKDH: 425 case _COLEMAKDH:
426 oled_write_ln_P(PSTR("CmkDH"), false); 426 oled_write_ln_P(PSTR("CmkDH"), false);
427 break; 427 break;
428 428
429 default: 429 default:
430 oled_write_ln_P(PSTR("Undef"), false); 430 oled_write_ln_P(PSTR("Undef"), false);
431 } 431 }
@@ -486,12 +486,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
486 if (record->event.pressed) { 486 if (record->event.pressed) {
487 set_single_persistent_default_layer(_COLEMAK); 487 set_single_persistent_default_layer(_COLEMAK);
488 } 488 }
489 return false; 489 return false;
490 case KC_COLEMAKDH: 490 case KC_COLEMAKDH:
491 if (record->event.pressed) { 491 if (record->event.pressed) {
492 set_single_persistent_default_layer(_COLEMAKDH); 492 set_single_persistent_default_layer(_COLEMAKDH);
493 } 493 }
494 return false; 494 return false;
495 case KC_LOWER: 495 case KC_LOWER:
496 if (record->event.pressed) { 496 if (record->event.pressed) {
497 layer_on(_LOWER); 497 layer_on(_LOWER);
@@ -531,7 +531,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
531 531
532#ifdef ENCODER_ENABLE 532#ifdef ENCODER_ENABLE
533 533
534void encoder_update_user(uint8_t index, bool clockwise) { 534bool encoder_update_user(uint8_t index, bool clockwise) {
535 if (index == 0) { 535 if (index == 0) {
536 if (clockwise) { 536 if (clockwise) {
537 tap_code(KC_VOLU); 537 tap_code(KC_VOLU);
@@ -566,6 +566,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
566 break; 566 break;
567 } 567 }
568 } 568 }
569 return true;
569} 570}
570 571
571#endif 572#endif
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index 6b7486c1b..bd0993c99 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -1,19 +1,19 @@
1 1
2 /* Copyright 2021 Dane Evans 2 /* Copyright 2021 Dane Evans
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or 6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 // SOFLE RGB 17 // SOFLE RGB
18#include <stdio.h> 18#include <stdio.h>
19 19
@@ -21,16 +21,16 @@
21 21
22#define INDICATOR_BRIGHTNESS 30 22#define INDICATOR_BRIGHTNESS 30
23 23
24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override 24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override) 25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override)
26 26
27// Light combinations 27// Light combinations
28#define SET_INDICATORS(hsv) \ 28#define SET_INDICATORS(hsv) \
29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
30 {35+0, 1, hsv} 30 {35+0, 1, hsv}
31#define SET_UNDERGLOW(hsv) \ 31#define SET_UNDERGLOW(hsv) \
32 {1, 6, hsv}, \ 32 {1, 6, hsv}, \
33 {35+1, 6,hsv} 33 {35+1, 6,hsv}
34#define SET_NUMPAD(hsv) \ 34#define SET_NUMPAD(hsv) \
35 {35+15, 5, hsv},\ 35 {35+15, 5, hsv},\
36 {35+22, 3, hsv},\ 36 {35+22, 3, hsv},\
@@ -44,14 +44,14 @@
44 {35+ 30, 2, hsv} 44 {35+ 30, 2, hsv}
45#define SET_INNER_COL(hsv) \ 45#define SET_INNER_COL(hsv) \
46 {33, 4, hsv}, \ 46 {33, 4, hsv}, \
47 {35+ 33, 4, hsv} 47 {35+ 33, 4, hsv}
48 48
49#define SET_OUTER_COL(hsv) \ 49#define SET_OUTER_COL(hsv) \
50 {7, 4, hsv}, \ 50 {7, 4, hsv}, \
51 {35+ 7, 4, hsv} 51 {35+ 7, 4, hsv}
52#define SET_THUMB_CLUSTER(hsv) \ 52#define SET_THUMB_CLUSTER(hsv) \
53 {25, 2, hsv}, \ 53 {25, 2, hsv}, \
54 {35+ 25, 2, hsv} 54 {35+ 25, 2, hsv}
55#define SET_LAYER_ID(hsv) \ 55#define SET_LAYER_ID(hsv) \
56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
@@ -60,14 +60,14 @@
60 {7, 4, hsv}, \ 60 {7, 4, hsv}, \
61 {35+ 7, 4, hsv}, \ 61 {35+ 7, 4, hsv}, \
62 {25, 2, hsv}, \ 62 {25, 2, hsv}, \
63 {35+ 25, 2, hsv} 63 {35+ 25, 2, hsv}
64 64
65 65
66enum sofle_layers { 66enum sofle_layers {
67 _DEFAULTS = 0, 67 _DEFAULTS = 0,
68 _QWERTY = 0, 68 _QWERTY = 0,
69 _COLEMAK, 69 _COLEMAK,
70 _COLEMAKDH, 70 _COLEMAKDH,
71 _LOWER, 71 _LOWER,
72 _RAISE, 72 _RAISE,
73 _ADJUST, 73 _ADJUST,
@@ -104,15 +104,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 [_QWERTY] = LAYOUT( 104 [_QWERTY] = LAYOUT(
105 //,------------------------------------------------. ,---------------------------------------------------. 105 //,------------------------------------------------. ,---------------------------------------------------.
106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV, 106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV,
107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, 112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT 114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT
115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
116), 116),
117 117
118/* 118/*
@@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133[_COLEMAK] = LAYOUT( 133[_COLEMAK] = LAYOUT(
134 //,------------------------------------------------. ,---------------------------------------------------. 134 //,------------------------------------------------. ,---------------------------------------------------.
135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
145), 145),
146 146
147/* 147/*
@@ -162,15 +162,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
162[_COLEMAKDH] = LAYOUT( 162[_COLEMAKDH] = LAYOUT(
163 //,------------------------------------------------. ,---------------------------------------------------. 163 //,------------------------------------------------. ,---------------------------------------------------.
164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
174), 174),
175 175
176/* LOWER 176/* LOWER
@@ -190,15 +190,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
190[_LOWER] = LAYOUT( 190[_LOWER] = LAYOUT(
191 //,------------------------------------------------. ,---------------------------------------------------. 191 //,------------------------------------------------. ,---------------------------------------------------.
192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL, 196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL,
197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, 198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______,
199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
202), 202),
203/* RAISE 203/* RAISE
204 * ,----------------------------------------. ,-----------------------------------------. 204 * ,----------------------------------------. ,-----------------------------------------.
@@ -217,17 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
217[_RAISE] = LAYOUT( 217[_RAISE] = LAYOUT(
218 //,------------------------------------------------. ,---------------------------------------------------. 218 //,------------------------------------------------. ,---------------------------------------------------.
219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, 219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______,
220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, 223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, 225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
229), 229),
230/* ADJUST 230/* ADJUST
231 * ,-----------------------------------------. ,-----------------------------------------. 231 * ,-----------------------------------------. ,-----------------------------------------.
232 * | | | | | | | | | | | | | | 232 * | | | | | | | | | | | | | |
233 * |------+------+------+------+------+------| |------+------+------+------+------+------| 233 * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -244,15 +244,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
244 [_ADJUST] = LAYOUT( 244 [_ADJUST] = LAYOUT(
245 //,------------------------------------------------. ,---------------------------------------------------. 245 //,------------------------------------------------. ,---------------------------------------------------.
246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX, 250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX,
251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, 252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
256), 256),
257/* NUMPAD 257/* NUMPAD
258 * ,-----------------------------------------. ,-----------------------------------------. 258 * ,-----------------------------------------. ,-----------------------------------------.
@@ -271,15 +271,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
271[_NUMPAD] = LAYOUT( 271[_NUMPAD] = LAYOUT(
272 //,------------------------------------------------. ,---------------------------------------------------. 272 //,------------------------------------------------. ,---------------------------------------------------.
273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______, 275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______,
276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE, 277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE,
278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, 279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______,
280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ 281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______
282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
283), 283),
284 284
285/* SWITCH 285/* SWITCH
@@ -296,51 +296,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
296 * | | | | |/ / \ \ | | | | | 296 * | | | | |/ / \ \ | | | | |
297 * `----------------------------------' '------''---------------------------' 297 * `----------------------------------' '------''---------------------------'
298 */ 298 */
299 // layer switcher 299 // layer switcher
300[_SWITCH] = LAYOUT( 300[_SWITCH] = LAYOUT(
301 //,------------------------------------------------. ,---------------------------------------------------. 301 //,------------------------------------------------. ,---------------------------------------------------.
302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, 304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET,
305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, 306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST,
307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO 310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
312 312
313 ), 313 ),
314}; 314};
315 315
316#ifdef RGBLIGHT_ENABLE 316#ifdef RGBLIGHT_ENABLE
317char layer_state_str[70]; 317char layer_state_str[70];
318// Now define the array of layers. Later layers take precedence 318// Now define the array of layers. Later layers take precedence
319 319
320// QWERTY, 320// QWERTY,
321// Light on inner column and underglow 321// Light on inner column and underglow
322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( 322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS(
323 SET_LAYER_ID(HSV_RED) 323 SET_LAYER_ID(HSV_RED)
324 324
325); 325);
326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( 326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS(
327 SET_LAYER_ID(HSV_PINK) 327 SET_LAYER_ID(HSV_PINK)
328); 328);
329 329
330// _NUM, 330// _NUM,
331// Light on outer column and underglow 331// Light on outer column and underglow
332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( 332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS(
333 SET_LAYER_ID(HSV_TEAL) 333 SET_LAYER_ID(HSV_TEAL)
334 334
335); 335);
336// _SYMBOL, 336// _SYMBOL,
337// Light on inner column and underglow 337// Light on inner column and underglow
338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( 338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS(
339 SET_LAYER_ID(HSV_BLUE) 339 SET_LAYER_ID(HSV_BLUE)
340 340
341 ); 341 );
342// _COMMAND, 342// _COMMAND,
343// Light on inner column and underglow 343// Light on inner column and underglow
344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( 344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS(
345 SET_LAYER_ID(HSV_PURPLE) 345 SET_LAYER_ID(HSV_PURPLE)
346); 346);
@@ -356,18 +356,18 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS
356 {35+25, 2, HSV_ORANGE} 356 {35+25, 2, HSV_ORANGE}
357 ); 357 );
358// _SWITCHER // light up top row 358// _SWITCHER // light up top row
359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( 359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS(
360 SET_LAYER_ID(HSV_GREEN), 360 SET_LAYER_ID(HSV_GREEN),
361 SET_NUMROW(HSV_GREEN) 361 SET_NUMROW(HSV_GREEN)
362); 362);
363 363
364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
365 365
366 layer_qwerty_lights, 366 layer_qwerty_lights,
367 layer_num_lights,// overrides layer 1 367 layer_num_lights,// overrides layer 1
368 layer_symbol_lights, 368 layer_symbol_lights,
369 layer_command_lights, 369 layer_command_lights,
370 layer_numpad_lights, 370 layer_numpad_lights,
371 layer_switcher_lights, // Overrides other layers 371 layer_switcher_lights, // Overrides other layers
372 layer_colemakdh_lights 372 layer_colemakdh_lights
373); 373);
@@ -376,7 +376,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); 376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH)); 377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH));
378 378
379 379
380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER)); 380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER));
381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE)); 381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE));
382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST)); 382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST));
@@ -387,8 +387,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
387void keyboard_post_init_user(void) { 387void keyboard_post_init_user(void) {
388 // Enable the LED layers 388 // Enable the LED layers
389 rgblight_layers = my_rgb_layers; 389 rgblight_layers = my_rgb_layers;
390 390
391 rgblight_mode(10);// haven't found a way to set this in a more useful way 391 rgblight_mode(10);// haven't found a way to set this in a more useful way
392 392
393} 393}
394#endif 394#endif
@@ -411,9 +411,9 @@ static void print_status_narrow(void) {
411 oled_write_ln_P(PSTR("Dane\nEvans"), false); 411 oled_write_ln_P(PSTR("Dane\nEvans"), false);
412 412
413 oled_write_ln_P(PSTR(""), false); 413 oled_write_ln_P(PSTR(""), false);
414 414
415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state) 415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state)
416 416
417 417
418 switch (get_highest_layer(default_layer_state)) { 418 switch (get_highest_layer(default_layer_state)) {
419 case _QWERTY: 419 case _QWERTY:
@@ -424,8 +424,8 @@ static void print_status_narrow(void) {
424 break; 424 break;
425 case _COLEMAKDH: 425 case _COLEMAKDH:
426 oled_write_ln_P(PSTR("CmkDH"), false); 426 oled_write_ln_P(PSTR("CmkDH"), false);
427 break; 427 break;
428 428
429 default: 429 default:
430 oled_write_ln_P(PSTR("Undef"), false); 430 oled_write_ln_P(PSTR("Undef"), false);
431 } 431 }
@@ -486,12 +486,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
486 if (record->event.pressed) { 486 if (record->event.pressed) {
487 set_single_persistent_default_layer(_COLEMAK); 487 set_single_persistent_default_layer(_COLEMAK);
488 } 488 }
489 return false; 489 return false;
490 case KC_COLEMAKDH: 490 case KC_COLEMAKDH:
491 if (record->event.pressed) { 491 if (record->event.pressed) {
492 set_single_persistent_default_layer(_COLEMAKDH); 492 set_single_persistent_default_layer(_COLEMAKDH);
493 } 493 }
494 return false; 494 return false;
495 case KC_LOWER: 495 case KC_LOWER:
496 if (record->event.pressed) { 496 if (record->event.pressed) {
497 layer_on(_LOWER); 497 layer_on(_LOWER);
@@ -531,7 +531,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
531 531
532#ifdef ENCODER_ENABLE 532#ifdef ENCODER_ENABLE
533 533
534void encoder_update_user(uint8_t index, bool clockwise) { 534bool encoder_update_user(uint8_t index, bool clockwise) {
535 if (index == 0) { 535 if (index == 0) {
536 if (clockwise) { 536 if (clockwise) {
537 tap_code(KC_VOLU); 537 tap_code(KC_VOLU);
@@ -566,6 +566,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
566 break; 566 break;
567 } 567 }
568 } 568 }
569 return true;
569} 570}
570 571
571#endif 572#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 21:45:08 +0000