7 Commits
2.1.0 ... 4.0.0

4 changed files with 105 additions and 75 deletions

View File

@ -24,29 +24,76 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT // #define MASTER_RIGHT
// #define EE_HANDS // #define EE_HANDS
//#define TAPPING_FORCE_HOLD // #define TAPPING_FORCE_HOLD
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#define TAPPING_TOGGLE 2 #define TAPPING_TOGGLE 2
#define RGBLIGHT_LAYERS #ifdef RGB_MATRIX_ENABLE
// #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF # define SPLIT_LED_STATE_ENABLE
// #define SPLIT_LAYER_STATE_ENABLE # define SPLIT_LAYER_STATE_ENABLE
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
#ifdef RGBLIGHT_ENABLE /* Enable the animations you want/need. You may need to enable only a small number of these because *
#define RGBLIGHT_EFFECT_BREATHING * they take up a lot of space. Enable and confirm that you can still successfully compile your firmware. */
#define RGBLIGHT_EFFECT_RAINBOW_MOOD // RGB Matrix Animation modes. Explicitly enabled
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL // For full list of effects, see:
#define RGBLIGHT_EFFECT_SNAKE // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
#define RGBLIGHT_EFFECT_KNIGHT # undef ENABLE_RGB_MATRIX_ALPHAS_MODS
#define RGBLIGHT_EFFECT_CHRISTMAS # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
#define RGBLIGHT_EFFECT_STATIC_GRADIENT # undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
// #define RGBLIGHT_EFFECT_RGB_TEST # undef ENABLE_RGB_MATRIX_BREATHING
// #define RGBLIGHT_EFFECT_ALTERNATING # undef ENABLE_RGB_MATRIX_BAND_SAT
// #define RGBLIGHT_EFFECT_TWINKLE # undef ENABLE_RGB_MATRIX_BAND_VAL
#define RGBLIGHT_LIMIT_VAL 120 # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
#define RGBLIGHT_HUE_STEP 10 # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
#define RGBLIGHT_SAT_STEP 17 # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
#define RGBLIGHT_VAL_STEP 17 # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
# undef ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# undef ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# undef ENABLE_RGB_MATRIX_HUE_BREATHING
# undef ENABLE_RGB_MATRIX_HUE_PENDULUM
# undef ENABLE_RGB_MATRIX_HUE_WAVE
# undef ENABLE_RGB_MATRIX_PIXEL_RAIN
# undef ENABLE_RGB_MATRIX_PIXEL_FLOW
# undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# undef ENABLE_RGB_MATRIX_SPLASH
# undef ENABLE_RGB_MATRIX_MULTISPLASH
# undef ENABLE_RGB_MATRIX_SOLID_SPLASH
# undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif #endif
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"

View File

@ -38,7 +38,7 @@ enum {
TD_BSLS TD_BSLS
}; };
bool isWindows = true; bool isWindows = false; // Change to make default config Windows
void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) { void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) { if (state->count == 1) {
@ -161,9 +161,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------. ,-----------------------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_SW, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_P, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
TT(4), XXXXXXX, KC_SPC, KC_SPC, RGB_TOG, XXXXXXX TT(4), XXXXXXX, KC_SPC, KC_SPC, RGB_TOG, XXXXXXX
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
@ -279,55 +279,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif // OLED_ENABLE #endif // OLED_ENABLE
// RGB LAYER CONFIGURATION // RGB LAYER CONFIGURATION
// LENGHTH OF LEDS void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
const int firstLed = 1; for (uint8_t i = led_min; i <= led_max; i++) {
const int lastLed = 53; switch(get_highest_layer(layer_state|default_layer_state)) {
case 1:
// Light LEDs when caps lock is active. Hard to ignore! if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( rgb_matrix_set_color(i, RGB_CHARTREUSE);
{ lastLed, 1, HSV_RED }, // Light last LEDs only }
{ firstLed, 1, HSV_RED } // Light first LEDs only break;
); case 2:
// Light LEDs layer 1 is active if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS( rgb_matrix_set_color(i, RGB_ORANGE);
{firstLed, lastLed, HSV_CYAN } }
); break;
// Light LEDs layer 2 is active case 3:
const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS( if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
{firstLed, lastLed, HSV_YELLOW } rgb_matrix_set_color(i, RGB_CYAN);
); }
// Light LEDs layer 3 is active break;
const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS( case 4:
{firstLed, lastLed, HSV_SPRINGGREEN} if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
); rgb_matrix_set_color(i, RGB_AZURE);
}
// Now define the array of layers. Later layers take precedence break;
const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( default:
my_capslock_layer, // Overrides caps lock and Windos layer if (isWindows == true){ // Change to false if main config is Mac
my_layer1_layer, // Overrides other layers rgb_matrix_set_color(26, RGB_WHITE);
my_layer2_layer, // Overrides other layers }
my_layer3_layer // Overrides other layers if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
); rgb_matrix_set_color(53, RGB_WHITE);
}
void keyboard_post_init_user(void) { break;
// Enable the LED layers }
rgblight_layers = my_rgb_layers; }
} }
// enabling disabling layers
bool led_update_user(led_t led_state) {
rgblight_set_layer_state(0, led_state.caps_lock);
return true;
}
layer_state_t default_layer_state_set_user(layer_state_t state) {
rgblight_set_layer_state(0, layer_state_cmp(state, 0));
return state;
}
layer_state_t layer_state_set_user(layer_state_t state) {
rgblight_set_layer_state(1, layer_state_cmp(state, 1));
rgblight_set_layer_state(2, layer_state_cmp(state, 2));
rgblight_set_layer_state(3, layer_state_cmp(state, 3));
return state;
}

View File

@ -1,5 +1,6 @@
MOUSEKEY_ENABLE = no # Mouse keys MOUSEKEY_ENABLE = no # Mouse keys
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
RGB_MATRIX_ENABLE = yes
#VIA_ENABLE = yes # Enable VIA #VIA_ENABLE = yes # Enable VIA
OLED_ENABLE = yes OLED_ENABLE = yes
OLED_DRIVER = SSD1306 OLED_DRIVER = SSD1306

View File

@ -1 +1 @@
2.1.0 4.0.0