[Keymap] Xulkal keymap tweeks (#5746)

* Minor keymap tweeks and more oled data

* Update keymap.c
This commit is contained in:
XScorpion2 2019-04-30 22:55:01 -05:00 committed by Drashna Jaelre
parent 8725197ad6
commit e95283b545
3 changed files with 41 additions and 5 deletions

View File

@ -92,15 +92,29 @@ static void render_logo(void) {
oled_write_P(sol_logo, false); oled_write_P(sol_logo, false);
} }
extern rgb_config_t rgb_matrix_config;
static void render_status(void) { static void render_status(void) {
// Render to mode icon // Render to mode icon
static const char PROGMEM mode_logo[2][4] = { static const char PROGMEM mode_logo[2][3] = {
{0x97,0x98,0x0a,0}, {0x97,0x98,0},
{0xb7,0xb8,0x0a,0} }; {0xb7,0xb8,0} };
oled_write_P(mode_logo[0], false); oled_write_P(mode_logo[0], false);
#if defined(RGB_MATRIX_ENABLE)
static char buffer[20] = {0};
snprintf(buffer, sizeof(buffer), " h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
oled_write(buffer, false);
#endif
oled_write_P(mode_logo[1], false); oled_write_P(mode_logo[1], false);
#if defined(RGB_MATRIX_ENABLE)
snprintf(buffer, sizeof(buffer), " s%3d m%3d\n", rgb_matrix_config.speed, rgb_matrix_config.mode);
oled_write(buffer, false);
#endif
// Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
oled_write_P(PSTR("Layer: "), false); oled_write_P(PSTR("Layer: "), false);
switch (biton32(layer_state)) { switch (biton32(layer_state)) {

View File

@ -11,3 +11,17 @@
#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC
#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS
#define RCPO_KEYS KC_RCTL, KC_TRNS, KC_EQL #define RCPO_KEYS KC_RCTL, KC_TRNS, KC_EQL
// No need for the single versions when multi performance isn't a problem =D
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
#define DISABLE_RGB_MATRIX_SPLASH
#define DISABLE_RGB_MATRIX_SOLID_SPLASH
// Don't like or feel to identical to other effects
#define DISABLE_RGB_MATRIX_RAINBOW_BEACON
#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS

View File

@ -11,6 +11,10 @@ qk_tap_dance_action_t tap_dance_actions[] = {
}; };
#endif #endif
#if defined(RGB_MATRIX_ENABLE)
extern void eeconfig_update_rgb_matrix_default(void);
#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case QWERTY: case QWERTY:
@ -56,12 +60,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false; return false;
break; break;
case RGBRST: case RGBRST:
#ifdef RGBLIGHT_ENABLE #if defined(RGBLIGHT_ENABLE)
if (record->event.pressed) { if (record->event.pressed) {
eeconfig_update_rgblight_default(); eeconfig_update_rgblight_default();
rgblight_enable(); rgblight_enable();
} }
#endif #elif defined(RGB_MATRIX_ENABLE)
if (record->event.pressed) {
eeconfig_update_rgb_matrix_default();
}
#endif
return false; return false;
break; break;
} }