From 9b46fabe084cd3e15104f88ef5d1f87f215de3c6 Mon Sep 17 00:00:00 2001
From: XScorpion2 <rcalt2vt@gmail.com>
Date: Mon, 13 May 2019 09:58:15 -0500
Subject: Xulkal Keymap Changes (#5861)
---
users/xulkal/config.h | 17 ++++++++++++++---
users/xulkal/layouts.h | 4 ++--
users/xulkal/process_records.c | 15 ++++++++++-----
3 files changed, 26 insertions(+), 10 deletions(-)
(limited to 'users/xulkal')
diff --git a/users/xulkal/config.h b/users/xulkal/config.h
index 2899017b03..ecd01f7946 100644
--- a/users/xulkal/config.h
+++ b/users/xulkal/config.h
@@ -1,8 +1,6 @@
#pragma once
-#ifndef TAPPING_FORCE_HOLD
-#define TAPPING_FORCE_HOLD
-#endif // TAPPING_FORCE_HOLD
+#undef TAPPING_FORCE_HOLD
#undef TAPPING_TERM
#define TAPPING_TERM 175
@@ -12,6 +10,17 @@
#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS
#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_EQL
+// Running out of firmware space
+#if defined(__AVR__)
+#undef RGB_MATRIX_KEYPRESSES
+#undef RGB_MATRIX_KEYRELEASES
+#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#else
+#define RGB_MATRIX_KEYPRESSES
+#undef RGB_MATRIX_KEYRELEASES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
+
// 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
@@ -20,8 +29,10 @@
#define DISABLE_RGB_MATRIX_SOLID_SPLASH
// Don't like or feel to identical to other effects
+#if defined(__AVR__)
#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
+#endif
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index 61637bfe3b..5180992a88 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -50,7 +50,7 @@
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | PREV | VOL- | VOL+ | NEXT | PLAY |
+ * | | | | | | | | | PREV | VOL+ | VOL- | NEXT | PLAY |
* `-----------------------------------------' `-----------------------------------------'
*/
@@ -64,7 +64,7 @@
#define __________________RAISE_R2_________________ _______, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, _______
#define __________________RAISE_R3_________________ _______, KC_DEL, KC_END, KC_PGDN, KC_SLCK, _______
#define __________________RAISE_R4_________________ _______, _______, _______, _______, _______, _______
-#define __________________RAISE_R5_________________ _______, KC_MPRV, KC_MPRV, KC_VOLD, KC_MNXT, KC_MPLY
+#define __________________RAISE_R5_________________ _______, KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT, KC_MPLY
/* LOWER Layout
* ,-----------------------------------------. ,-----------------------------------------.
diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c
index 531f99eb06..7c2b5e133f 100644
--- a/users/xulkal/process_records.c
+++ b/users/xulkal/process_records.c
@@ -16,13 +16,13 @@ extern void eeconfig_update_rgb_matrix_default(void);
#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ static uint16_t reset_timer;
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
set_single_persistent_default_layer(_QWERTY);
}
return false;
- break;
case GAME:
#ifndef GAMELAYER_DISABLE
if (record->event.pressed) {
@@ -30,7 +30,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
#endif
return false;
- break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
@@ -44,7 +43,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
}
return false;
- break;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
@@ -58,7 +56,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
}
return false;
- break;
case RGBRST:
#if defined(RGBLIGHT_ENABLE)
if (record->event.pressed) {
@@ -71,7 +68,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
#endif
return false;
- break;
+ case RESET:
+ if (record->event.pressed) {
+ reset_timer = timer_read();
+ } else {
+ if (timer_elapsed(reset_timer) >= 500) {
+ reset_keyboard();
+ }
+ }
+ return false;
}
return process_record_keymap(keycode, record) &&
--
cgit v1.2.3