From 34d8c7bf9c7a8a220a35e83eb56819258e265bec Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 27 May 2021 21:30:47 -0700 Subject: [PATCH] Fix keyboards/keymaps for boolean encoder callback changes (#12985) --- .../amigopunk/keymaps/default/keymap.c | 2 +- .../keyprez/corgi/keymaps/default/keymap.c | 3 +- .../mercutio/keymaps/jonavin/keymap.c | 3 +- .../murphpad/keymaps/default/keymap.c | 18 +- .../mechwild/murphpad/keymaps/via/keymap.c | 28 +-- keyboards/minimacro5/keymaps/devdev/keymap.c | 40 ++-- keyboards/planck/thk/keymaps/thk/keymap.c | 3 +- keyboards/sofle/keymaps/devdev/keymap.c | 181 +++++++++--------- keyboards/sofle/keymaps/rgb_default/keymap.c | 181 +++++++++--------- 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 70c6e7725aea..cdfe97402433 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] = { #ifdef ENCODER_ENABLE bool encoder_update_user(uint8_t index, bool clockwise) { if (index != 0) - return; + return false; tap_code(clockwise ? KC_VOLU : KC_VOLD); return true; diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c index 01f56320b084..a1f816449174 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] = { ), }; -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { tap_code(clockwise ? KC_VOLU : KC_VOLD); + return true; } diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c index fbbe2660ca1d..f5dddcfac841 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] = { #ifdef ENCODER_ENABLE // Encoder Functionality uint8_t selected_layer = 0; - void encoder_update_user(uint8_t index, bool clockwise) { + bool encoder_update_user(uint8_t index, bool clockwise) { #ifdef OLED_DRIVER_ENABLE oled_clear(); oled_render(); @@ -81,6 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { } } } + return true; } #endif diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c index da9b28f29655..685cc9108d16 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] = { KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, - + KC_F5, KC_F6, KC_F7 ), [_FN1] = LAYOUT( - _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SPI, RGB_HUI, _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, - + _______, _______, _______ ), @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ ), @@ -67,14 +67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ ) }; #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { switch (index) { case 0: if (clockwise) { @@ -84,7 +84,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } break; } - + return true; } #endif @@ -109,7 +109,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } void oled_task_user(void) { - render_logo(); + render_logo(); oled_set_cursor(0,6); oled_write_ln_P(PSTR("Layer"), false); @@ -137,4 +137,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); } -#endif \ No newline at end of file +#endif diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c index 630b47f8cb05..bd74d2184f11 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] = { KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, - + _______, _______, _______ - + ), [_FN1] = LAYOUT( _______, _______, _______, _______, @@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, - + _______, _______, _______ - + ), [_FN2] = LAYOUT( _______, _______, _______, _______, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ - - ), + + ), [_FN3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, @@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ - - ) + + ) }; #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { switch (index) { case 0: if (clockwise) { @@ -82,7 +82,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } break; } - + return true; } #endif @@ -107,7 +107,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } void oled_task_user(void) { - render_logo(); + render_logo(); oled_set_cursor(0,6); oled_write_ln_P(PSTR("Layer"), false); @@ -135,4 +135,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); } -#endif \ No newline at end of file +#endif diff --git a/keyboards/minimacro5/keymaps/devdev/keymap.c b/keyboards/minimacro5/keymaps/devdev/keymap.c index dc5a9b0de807..d7f998fa3ad4 100644 --- a/keyboards/minimacro5/keymaps/devdev/keymap.c +++ b/keyboards/minimacro5/keymaps/devdev/keymap.c @@ -1,18 +1,18 @@ /* Copyright 2020 Dane Evans - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ // MINI MACRO 5 #include QMK_KEYBOARD_H @@ -31,11 +31,11 @@ enum tap_dances{ TD_TO_MEDIA, TD_TO_MAIN, TD_RESET_SLIDER - + }; -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder*/ switch(biton32(layer_state)){ case _MAIN: @@ -75,6 +75,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { break; } } + return true; } // @@ -95,8 +96,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest }; layer_state_t layer_state_set_user(layer_state_t state) { - - if (layer_state_cmp(state, _MAIN)) // this one not working + + if (layer_state_cmp(state, _MAIN)) // this one not working rgblight_sethsv_at(HSV_GREEN, 0); if (layer_state_cmp(state, _MEDIA)) rgblight_sethsv_at(HSV_RED, 0); @@ -121,6 +122,3 @@ qk_tap_dance_action_t tap_dance_actions[] = { [TD_TO_MAIN] = ACTION_TAP_DANCE_LAYER_MOVE(KC_MUTE, _MAIN), [TD_RESET_SLIDER] = ACTION_TAP_DANCE_LAYER_MOVE(KC_0, _MAIN) }; - - - diff --git a/keyboards/planck/thk/keymaps/thk/keymap.c b/keyboards/planck/thk/keymaps/thk/keymap.c index 44cd3337035c..948393b532b6 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) { bool encoder_mode = false; -void encoder_update(bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ if (clockwise) { #ifdef MOUSEKEY_ENABLE @@ -210,6 +210,7 @@ void encoder_update(bool clockwise) { } } } + return true; } void 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 7d100abb65cf..681e7dd6a488 100644 --- a/keyboards/sofle/keymaps/devdev/keymap.c +++ b/keyboards/sofle/keymaps/devdev/keymap.c @@ -1,19 +1,19 @@ /* Copyright 2021 Dane Evans - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ // SOFLE RGB #include @@ -21,16 +21,16 @@ #define INDICATOR_BRIGHTNESS 30 -#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override +#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override #define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override) -// Light combinations +// Light combinations #define SET_INDICATORS(hsv) \ {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ - {35+0, 1, hsv} + {35+0, 1, hsv} #define SET_UNDERGLOW(hsv) \ {1, 5, hsv}, \ - {35+1, 5,hsv} + {35+1, 5,hsv} #define SET_NUMPAD(hsv) \ {35+15, 5, hsv},\ {35+22, 3, hsv},\ @@ -44,14 +44,14 @@ {35+ 30, 2, hsv} #define SET_INNER_COL(hsv) \ {33, 4, hsv}, \ - {35+ 33, 4, hsv} + {35+ 33, 4, hsv} #define SET_OUTER_COL(hsv) \ {7, 4, hsv}, \ {35+ 7, 4, hsv} #define SET_THUMB_CLUSTER(hsv) \ {25, 2, hsv}, \ - {35+ 25, 2, hsv} + {35+ 25, 2, hsv} #define SET_LAYER_ID(hsv) \ {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ @@ -60,14 +60,14 @@ {7, 4, hsv}, \ {35+ 7, 4, hsv}, \ {25, 2, hsv}, \ - {35+ 25, 2, hsv} + {35+ 25, 2, hsv} enum sofle_layers { _DEFAULTS = 0, _QWERTY = 0, _COLEMAK, - _COLEMAKDH, + _COLEMAKDH, _LOWER, _RAISE, _ADJUST, @@ -104,15 +104,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* @@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* @@ -162,15 +162,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAKDH] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS, //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* LOWER @@ -190,15 +190,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* RAISE * ,----------------------------------------. ,-----------------------------------------. @@ -217,17 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), -/* ADJUST +/* ADJUST * ,-----------------------------------------. ,-----------------------------------------. * | | | | | | | | | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| @@ -244,15 +244,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* NUMPAD * ,-----------------------------------------. ,-----------------------------------------. @@ -271,15 +271,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMPAD] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* SWITCH @@ -296,51 +296,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ - // layer switcher + // layer switcher [_SWITCH] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| - TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ - - ), -}; + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + + ), +}; #ifdef RGBLIGHT_ENABLE char layer_state_str[70]; // Now define the array of layers. Later layers take precedence // QWERTY, -// Light on inner column and underglow +// Light on inner column and underglow const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_RED) - + ); const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_PINK) ); // _NUM, -// Light on outer column and underglow +// Light on outer column and underglow const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_TEAL) - + ); // _SYMBOL, -// Light on inner column and underglow +// Light on inner column and underglow const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_BLUE) - + ); // _COMMAND, -// Light on inner column and underglow +// Light on inner column and underglow const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_PURPLE) ); @@ -356,18 +356,18 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS {35+25, 2, HSV_ORANGE} ); // _SWITCHER // light up top row -const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( - SET_LAYER_ID(HSV_GREEN), +const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( + SET_LAYER_ID(HSV_GREEN), SET_NUMROW(HSV_GREEN) ); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - layer_qwerty_lights, + layer_qwerty_lights, layer_num_lights,// overrides layer 1 layer_symbol_lights, - layer_command_lights, - layer_numpad_lights, + layer_command_lights, + layer_numpad_lights, layer_switcher_lights, // Overrides other layers layer_colemakdh_lights ); @@ -376,7 +376,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH)); - + rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER)); rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE)); 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) { void keyboard_post_init_user(void) { // Enable the LED layers rgblight_layers = my_rgb_layers; - - rgblight_mode(10);// haven't found a way to set this in a more useful way + + rgblight_mode(10);// haven't found a way to set this in a more useful way } #endif @@ -411,9 +411,9 @@ static void print_status_narrow(void) { oled_write_ln_P(PSTR("Dane\nEvans"), false); oled_write_ln_P(PSTR(""), false); - + //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state) - + switch (get_highest_layer(default_layer_state)) { case _QWERTY: @@ -424,8 +424,8 @@ static void print_status_narrow(void) { break; case _COLEMAKDH: oled_write_ln_P(PSTR("CmkDH"), false); - break; - + break; + default: oled_write_ln_P(PSTR("Undef"), false); } @@ -486,12 +486,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { set_single_persistent_default_layer(_COLEMAK); } - return false; + return false; case KC_COLEMAKDH: if (record->event.pressed) { set_single_persistent_default_layer(_COLEMAKDH); } - return false; + return false; case KC_LOWER: if (record->event.pressed) { layer_on(_LOWER); @@ -531,7 +531,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { if (clockwise) { tap_code(KC_VOLU); @@ -566,6 +566,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { break; } } + return true; } #endif diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c index 6b7486c1b49e..bd0993c99490 100644 --- a/keyboards/sofle/keymaps/rgb_default/keymap.c +++ b/keyboards/sofle/keymaps/rgb_default/keymap.c @@ -1,19 +1,19 @@ /* Copyright 2021 Dane Evans - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ // SOFLE RGB #include @@ -21,16 +21,16 @@ #define INDICATOR_BRIGHTNESS 30 -#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override +#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override #define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override) -// Light combinations +// Light combinations #define SET_INDICATORS(hsv) \ {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ - {35+0, 1, hsv} + {35+0, 1, hsv} #define SET_UNDERGLOW(hsv) \ {1, 6, hsv}, \ - {35+1, 6,hsv} + {35+1, 6,hsv} #define SET_NUMPAD(hsv) \ {35+15, 5, hsv},\ {35+22, 3, hsv},\ @@ -44,14 +44,14 @@ {35+ 30, 2, hsv} #define SET_INNER_COL(hsv) \ {33, 4, hsv}, \ - {35+ 33, 4, hsv} + {35+ 33, 4, hsv} #define SET_OUTER_COL(hsv) \ {7, 4, hsv}, \ {35+ 7, 4, hsv} #define SET_THUMB_CLUSTER(hsv) \ {25, 2, hsv}, \ - {35+ 25, 2, hsv} + {35+ 25, 2, hsv} #define SET_LAYER_ID(hsv) \ {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ @@ -60,14 +60,14 @@ {7, 4, hsv}, \ {35+ 7, 4, hsv}, \ {25, 2, hsv}, \ - {35+ 25, 2, hsv} + {35+ 25, 2, hsv} enum sofle_layers { _DEFAULTS = 0, _QWERTY = 0, _COLEMAK, - _COLEMAKDH, + _COLEMAKDH, _LOWER, _RAISE, _ADJUST, @@ -104,15 +104,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* @@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* @@ -162,15 +162,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAKDH] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. 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, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* LOWER @@ -190,15 +190,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* RAISE * ,----------------------------------------. ,-----------------------------------------. @@ -217,17 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), -/* ADJUST +/* ADJUST * ,-----------------------------------------. ,-----------------------------------------. * | | | | | | | | | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| @@ -244,15 +244,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* NUMPAD * ,-----------------------------------------. ,-----------------------------------------. @@ -271,15 +271,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMPAD] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ ), /* SWITCH @@ -296,51 +296,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ - // layer switcher + // layer switcher [_SWITCH] = LAYOUT( //,------------------------------------------------. ,---------------------------------------------------. _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, - //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 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, - //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO - // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ - - ), -}; + //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ + + ), +}; #ifdef RGBLIGHT_ENABLE char layer_state_str[70]; // Now define the array of layers. Later layers take precedence // QWERTY, -// Light on inner column and underglow +// Light on inner column and underglow const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_RED) - + ); const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_PINK) ); // _NUM, -// Light on outer column and underglow +// Light on outer column and underglow const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_TEAL) - + ); // _SYMBOL, -// Light on inner column and underglow +// Light on inner column and underglow const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_BLUE) - + ); // _COMMAND, -// Light on inner column and underglow +// Light on inner column and underglow const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( SET_LAYER_ID(HSV_PURPLE) ); @@ -356,18 +356,18 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS {35+25, 2, HSV_ORANGE} ); // _SWITCHER // light up top row -const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( - SET_LAYER_ID(HSV_GREEN), +const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( + SET_LAYER_ID(HSV_GREEN), SET_NUMROW(HSV_GREEN) ); const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - layer_qwerty_lights, + layer_qwerty_lights, layer_num_lights,// overrides layer 1 layer_symbol_lights, - layer_command_lights, - layer_numpad_lights, + layer_command_lights, + layer_numpad_lights, layer_switcher_lights, // Overrides other layers layer_colemakdh_lights ); @@ -376,7 +376,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH)); - + rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER)); rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE)); 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) { void keyboard_post_init_user(void) { // Enable the LED layers rgblight_layers = my_rgb_layers; - - rgblight_mode(10);// haven't found a way to set this in a more useful way + + rgblight_mode(10);// haven't found a way to set this in a more useful way } #endif @@ -411,9 +411,9 @@ static void print_status_narrow(void) { oled_write_ln_P(PSTR("Dane\nEvans"), false); oled_write_ln_P(PSTR(""), false); - + //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state) - + switch (get_highest_layer(default_layer_state)) { case _QWERTY: @@ -424,8 +424,8 @@ static void print_status_narrow(void) { break; case _COLEMAKDH: oled_write_ln_P(PSTR("CmkDH"), false); - break; - + break; + default: oled_write_ln_P(PSTR("Undef"), false); } @@ -486,12 +486,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { set_single_persistent_default_layer(_COLEMAK); } - return false; + return false; case KC_COLEMAKDH: if (record->event.pressed) { set_single_persistent_default_layer(_COLEMAKDH); } - return false; + return false; case KC_LOWER: if (record->event.pressed) { layer_on(_LOWER); @@ -531,7 +531,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { if (clockwise) { tap_code(KC_VOLU); @@ -566,6 +566,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { break; } } + return true; } #endif