From dc00942be158b7ec70ed94f13e78703005888c0f Mon Sep 17 00:00:00 2001 From: XScorpion2 Date: Tue, 5 May 2020 07:54:26 -0500 Subject: Xulkal Changes (#9004) * Xulkal Changes * Fixing alt keymap --- keyboards/helix/rev2/keymaps/xulkal/config.h | 38 ++++++++++++++++++++++++++++ keyboards/helix/rev2/keymaps/xulkal/keymap.c | 8 +++--- keyboards/rgbkb/sol/keymaps/xulkal/config.h | 2 ++ keyboards/rgbkb/sol/keymaps/xulkal/rules.mk | 3 ++- users/xulkal/config.h | 7 ++--- users/xulkal/layouts.h | 2 +- users/xulkal/process_records.c | 2 +- 7 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 keyboards/helix/rev2/keymaps/xulkal/config.h diff --git a/keyboards/helix/rev2/keymaps/xulkal/config.h b/keyboards/helix/rev2/keymaps/xulkal/config.h new file mode 100644 index 0000000000..e2b325450a --- /dev/null +++ b/keyboards/helix/rev2/keymaps/xulkal/config.h @@ -0,0 +1,38 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +// place overrides here + +// If you need more program area, try select and reduce rgblight modes to use. + +// Selection of RGBLIGHT MODE to use. +#if defined(LED_ANIMATIONS) +# 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 +#endif diff --git a/keyboards/helix/rev2/keymaps/xulkal/keymap.c b/keyboards/helix/rev2/keymaps/xulkal/keymap.c index 3fad64deac..fecdf4cbd2 100644 --- a/keyboards/helix/rev2/keymaps/xulkal/keymap.c +++ b/keyboards/helix/rev2/keymaps/xulkal/keymap.c @@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, \ _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, \ _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, \ - _________________QWERTY_L4_________________, RGB_TOG, RGBRST, _________________QWERTY_R4_________________, \ - _________________QWERTY_L5_________________, RGB_RMOD, RGB_MOD, _________________QWERTY_R5_________________ \ + _________________QWERTY_L4_________________, KC_MINS, KC_EQL, _________________QWERTY_R4_________________, \ + _________________QWERTY_L5_________________, KC_LBRC, KC_RBRC, _________________QWERTY_R5_________________ \ ), #ifndef GAMELAYER_DISABLE @@ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___________________GAME_L1_________________, ___________________GAME_R1_________________, \ ___________________GAME_L2_________________, ___________________GAME_R2_________________, \ ___________________GAME_L3_________________, ___________________GAME_R3_________________, \ - ___________________GAME_L4_________________, RGB_TOG, RGBRST, ___________________GAME_R4_________________, \ - ___________________GAME_L5_________________, RGB_RMOD, RGB_MOD, ___________________GAME_R5_________________ \ + ___________________GAME_L4_________________, KC_MINS, KC_EQL, ___________________GAME_R4_________________, \ + ___________________GAME_L5_________________, KC_LBRC, KC_RBRC, ___________________GAME_R5_________________ \ ), #endif diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/config.h b/keyboards/rgbkb/sol/keymaps/xulkal/config.h index a5c35cfae8..ab75c5419c 100644 --- a/keyboards/rgbkb/sol/keymaps/xulkal/config.h +++ b/keyboards/rgbkb/sol/keymaps/xulkal/config.h @@ -29,3 +29,5 @@ along with this program. If not, see . #define RGB_MATRIX_VAL_STEP 8 #define RGB_MATRIX_SPD_STEP 8 #endif + +#define ENCODER_RESOLUTION 2 diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk index 6a14a99af5..da524e3dc9 100644 --- a/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk @@ -5,7 +5,8 @@ RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not ena RGBLIGHT_ANIMATIONS = no # LED animations LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) RGB_MATRIX_ENABLE = WS2812 # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -FULLHAND_ENABLE = yes # Enables the additional 24 Full Hand LEDs +FULLHAND_ENABLE = no # Enables the additional 24 Full Hand LEDs +SF_ENABLE = no # Enables the additional 38 Starfighter LEDs # Misc OLED_DRIVER_ENABLE = yes # Enable the OLED Driver diff --git a/users/xulkal/config.h b/users/xulkal/config.h index 4b05ea4ec4..e000b97acd 100644 --- a/users/xulkal/config.h +++ b/users/xulkal/config.h @@ -17,9 +17,10 @@ #undef RGB_MATRIX_KEYRELEASES #undef RGB_MATRIX_FRAMEBUFFER_EFFECTS #else -#define RGB_MATRIX_KEYPRESSES -#undef RGB_MATRIX_KEYRELEASES -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES +# undef RGB_MATRIX_KEYRELEASES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define ENABLE_TYPING_HEATMAP_DISTANCE_CHECK #endif // No need for the single versions when multi performance isn't a problem =D diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h index d4b7084186..63e73c32e6 100644 --- a/users/xulkal/layouts.h +++ b/users/xulkal/layouts.h @@ -68,7 +68,7 @@ /* LOWER Layout * ,-----------------------------------------. ,-----------------------------------------. - * | |RGBMD |RGBRMD|RGBTOG| | | | | | | | | | + * | |RGBMD |RGBRMD|RGBTOG| | | | | | | SLCK | NLCK | DEL | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | SPDI | SAI | VAI | HUI | RESET| | | | | 7 | 8 | 9 | | * |------+------+------+------+------+------| |------+------+------+------+------+------| diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c index ca2376145d..b6a4e5cfa1 100644 --- a/users/xulkal/process_records.c +++ b/users/xulkal/process_records.c @@ -37,7 +37,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) reset_keyboard(); } return false; -#ifdef RGB_MATRIX_TOG_LAYERS +#if defined(RGB_MATRIX_TOG_LAYERS) && defined(RGB_ENABLE) case RGB_TOG: if (record->event.pressed) { rgb_matrix_increase_flags(); -- cgit v1.2.1