Merge remote-tracking branch 'origin/master' into develop
13 files changed, 348 insertions(+), 0 deletions(-) M docs/feature_rgb_matrix.md A keyboards/fc660c/keymaps/default_rgb/config.h A keyboards/fc660c/keymaps/default_rgb/keymap.c A keyboards/fc660c/keymaps/default_rgb/readme.md A keyboards/fc660c/keymaps/default_rgb/rules.mk A keyboards/fc660c/keymaps/via_rgb/config.h A keyboards/fc660c/keymaps/via_rgb/keymap.c A keyboards/fc660c/keymaps/via_rgb/readme.md A keyboards/fc660c/keymaps/via_rgb/rules.mk M keyboards/walletburner/cajal/keymaps/default/keymap.c M keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c A keyboards/walletburner/cajal/keymaps/via/keymap.c A keyboards/walletburner/cajal/keymaps/via/rules.mk
M docs/feature_rgb_matrix.md => docs/feature_rgb_matrix.md +20 -0
@@ 790,6 790,26 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { } ``` Layer indicator with only configured keys: ```c void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { if (get_highest_layer(layer_state) > 0) { uint8_t layer = get_highest_layer(layer_state); for (uint8_t row = 0; row < MATRIX_ROWS; ++row) { for (uint8_t col = 0; col < MATRIX_COLS; ++col) { uint8_t index = g_led_config.matrix_co[row][col]; if (index >= led_min && index <= led_max && index != NO_LED && keymap_key_to_keycode(layer, (keypos_t){col,row}) > KC_TRNS) { rgb_matrix_set_color(index, RGB_GREEN); } } } } } ``` #### Examples :id=indicator-examples This example sets the modifiers to be a specific color based on the layer state. You can use a switch case here, instead, if you would like. This uses HSV and then converts to RGB, because this allows the brightness to be limited (important when using the WS2812 driver).
A keyboards/fc660c/keymaps/default_rgb/config.h => keyboards/fc660c/keymaps/default_rgb/config.h +51 -0
@@ 0,0 1,51 @@ /* Copyright 2017 Balz Guenat * * 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 <http://www.gnu.org/licenses/>. */ #pragma once // place overrides here /*RGB*/ /*Repurpose Insert LED */ #define RGB_DI_PIN B5 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== all animations enable ==*/ //#define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ #define RGBLIGHT_EFFECT_PLAIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL //#define RGBLIGHT_EFFECT_SNAKE #define RGBLIGHT_EFFECT_KNIGHT //#define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_STATIC_GRADIENT //#define RGBLIGHT_EFFECT_RGB_TEST //#define RGBLIGHT_EFFECT_ALTERNATING /*== customize breathing effect ==*/ /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ //#define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 /*==== use exp() and sin() ====*/ //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 //#define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif \ No newline at end of file
A keyboards/fc660c/keymaps/default_rgb/keymap.c => keyboards/fc660c/keymaps/default_rgb/keymap.c +46 -0
@@ 0,0 1,46 @@ /* 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 <http://www.gnu.org/licenses/>. */ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT, KC_UP, KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RCTL,MO(1), KC_LEFT,KC_DOWN,KC_RGHT ), [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______, KC_PGUP, _______,_______,_______, _______, _______,MO(2), _______, KC_HOME,KC_PGDN,KC_END ), [2] = LAYOUT( RESET, EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_TOG, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_MOD, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAI, _______,_______,_______, _______, _______,_______,_______, RGB_HUI,_______,RGB_SAI ), [3] = LAYOUT( _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______, _______, _______,_______,_______, _______,_______,_______ ) };
A keyboards/fc660c/keymaps/default_rgb/readme.md => keyboards/fc660c/keymaps/default_rgb/readme.md +6 -0
@@ 0,0 1,6 @@ # Keymap with Insert LED remapped to RGB control Emulates original keymap, but replaces insert LED pin with RGB Underglow & respective configuration. Allows users to add underglow lighting. See [this keebtalk thread](https://www.keebtalk.com/t/adding-rgb-to-fc660c-with-hasu-controller/14484) for more information. 
A keyboards/fc660c/keymaps/default_rgb/rules.mk => keyboards/fc660c/keymaps/default_rgb/rules.mk +1 -0
A keyboards/fc660c/keymaps/via_rgb/config.h => keyboards/fc660c/keymaps/via_rgb/config.h +51 -0
@@ 0,0 1,51 @@ /* Copyright 2017 Balz Guenat * * 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 <http://www.gnu.org/licenses/>. */ #pragma once // place overrides here /*RGB*/ /*Repurpose Insert LED */ #define RGB_DI_PIN B5 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== all animations enable ==*/ //#define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ #define RGBLIGHT_EFFECT_PLAIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL //#define RGBLIGHT_EFFECT_SNAKE #define RGBLIGHT_EFFECT_KNIGHT //#define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_STATIC_GRADIENT //#define RGBLIGHT_EFFECT_RGB_TEST //#define RGBLIGHT_EFFECT_ALTERNATING /*== customize breathing effect ==*/ /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ //#define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 /*==== use exp() and sin() ====*/ //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 //#define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif \ No newline at end of file
A keyboards/fc660c/keymaps/via_rgb/keymap.c => keyboards/fc660c/keymaps/via_rgb/keymap.c +46 -0
@@ 0,0 1,46 @@ /* 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 <http://www.gnu.org/licenses/>. */ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT, KC_UP, KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RCTL,MO(1), KC_LEFT,KC_DOWN,KC_RGHT ), [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______, KC_PGUP, _______,_______,_______, _______, _______,MO(2), _______, KC_HOME,KC_PGDN,KC_END ), [2] = LAYOUT( RESET, EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_MOD, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAI, _______,_______,_______, _______, _______,_______,_______, RGB_HUI,_______,RGB_SAI ), [3] = LAYOUT( _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______, _______, _______,_______,_______, _______,_______,_______ ) };
A keyboards/fc660c/keymaps/via_rgb/readme.md => keyboards/fc660c/keymaps/via_rgb/readme.md +6 -0
@@ 0,0 1,6 @@ # Keymap with Insert LED remapped to RGB control Emulates original VIA keymap, but replaces insert LED pin with RGB Underglow & respective configuration. Allows users to add underglow lighting. See [this keebtalk thread](https://www.keebtalk.com/t/adding-rgb-to-fc660c-with-hasu-controller/14484) for more information. 
A keyboards/fc660c/keymaps/via_rgb/rules.mk => keyboards/fc660c/keymaps/via_rgb/rules.mk +4 -0
@@ 0,0 1,4 @@ VIA_ENABLE = yes LTO_ENABLE = yes RGBLIGHT_ENABLE = yes COMMAND_ENABLE = no \ No newline at end of file
M keyboards/walletburner/cajal/keymaps/default/keymap.c => keyboards/walletburner/cajal/keymaps/default/keymap.c +10 -0
@@ 47,6 47,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; //Initialize indicator LEDs void matrix_init_user(void) { setPinOutput(B5); writePinLow(B5); setPinOutput(B6); writePinLow(B6); setPinOutput(B7); writePinLow(B7); } layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 1:
M keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c => keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c +9 -0
@@ 47,6 47,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; //Initialize indicator LEDs void matrix_init_user(void) { setPinOutput(B5); writePinLow(B5); setPinOutput(B6); writePinLow(B6); setPinOutput(B7); writePinLow(B7); } layer_state_t layer_state_set_user(layer_state_t state) { writePinLow(B7);
A keyboards/walletburner/cajal/keymaps/via/keymap.c => keyboards/walletburner/cajal/keymaps/via/keymap.c +96 -0
@@ 0,0 1,96 @@ /* Copyright 2020 Worldspawn <mcmancuso@gmail.com> * * 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 <http://www.gnu.org/licenses/>. */ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_stagger( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, RGB_TOG, CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_LSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_stagger( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC, KC_BSLS, RGB_MOD, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_stagger( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_VAD, RGB_HUI ), [3] = LAYOUT_stagger( RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; //Initialize indicator LEDs void matrix_init_user(void) { setPinOutput(B5); writePinLow(B5); setPinOutput(B6); writePinLow(B6); setPinOutput(B7); writePinLow(B7); } layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 1: writePinHigh(B7); writePinLow(B6); break; case 2: writePinLow(B7); writePinHigh(B6); break; case 3: writePinHigh(B7); writePinHigh(B6); break; default: writePinLow(B7); writePinLow(B6); break; } return state; } bool led_update_user(led_t led_state) { writePin(B5, led_state.caps_lock); return false; } bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { if (clockwise) { tap_code(KC_VOLD); } else { tap_code(KC_VOLU); } } return true; }
A keyboards/walletburner/cajal/keymaps/via/rules.mk => keyboards/walletburner/cajal/keymaps/via/rules.mk +2 -0