summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny <nooges@users.noreply.github.com>2017-09-25 13:21:27 -0400
committerJack Humbert <jack.humb@gmail.com>2017-09-25 13:21:27 -0400
commit5dab2ef12a5a7f244b9f381df7773cd6e46b35a5 (patch)
treec453f65f7c445ce6012788fe7ebf030e3fb78d19
parenta67c930e9e7b44c6fa7f73516f8410da8de6cb15 (diff)
Update Viterbi default layout (#1753)
* Implement sticky modifiers * Change underglow based on sticky mod status * Set RGB lights based on which mods are stickied * Add controls for dimming RGB LEDs * Only update RGB lights if modifiers have changed * Use all LEDs to show modifier state * Create default keymap for Viterbi
-rw-r--r--keyboards/viterbi/keymaps/default/keymap.c232
-rw-r--r--keyboards/viterbi/keymaps/dwallace/keymap.c159
2 files changed, 236 insertions, 155 deletions
diff --git a/keyboards/viterbi/keymaps/default/keymap.c b/keyboards/viterbi/keymaps/default/keymap.c
index 4b9e605dc1..b5215f9299 100644
--- a/keyboards/viterbi/keymaps/default/keymap.c
+++ b/keyboards/viterbi/keymaps/default/keymap.c
@@ -9,160 +9,120 @@ extern keymap_config_t keymap_config;
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
+#define _LOWER 1
+#define _RAISE 2
#define _ADJUST 16
enum custom_keycodes {
QWERTY = SAFE_RANGE,
- COLEMAK,
- DVORAK,
LOWER,
RAISE,
ADJUST,
};
// Fillers to make layering more clear
+#define KC_ KC_TRNS
#define _______ KC_TRNS
#define XXXXXXX KC_NO
+#define KC_AJST ADJUST
+#define KC_LOWR LOWER
+#define KC_RASE RAISE
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab | Q | W | E | R | T | Y | U | I | O | P | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
+/* QWERTY
+ * ,------------------------------------------------. ,------------------------------------------------.
+ * | Ins | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | Del |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | - | Tab | Q | W | E | R | T | | Y | U | I | O | P | [ | ] |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | = | Esc | A | S | D | F | G | | H | J | K | L | ; | " |Enter |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | Pg Up| Shift| Z | X | C | V | B | | N | M | , | . | / | Home | End |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | Pg Dn|Adjust| Ctrl | Alt | GUI |Lower |Space | |Space |Raise | Left | Down | Up | Right| \ |
+ * `------------------------------------------------' `------------------------------------------------'
*/
-[_QWERTY] = KEYMAP( \
- KC_GRV, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC, \
- KC_TAB, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_DEL, \
- KC_ESC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_QUOT, \
- KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , KC_ENT, \
- ADJUST, ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ \
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc | A | R | S | T | D | H | N | E | I | O | " |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = KEYMAP( \
- KC_GRV, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, \
- KC_TAB, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, _______, \
- KC_ESC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, _______, \
- KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , _______, \
- ADJUST, ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ \
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab | " | , | . | P | Y | F | G | C | R | L | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc | A | O | E | U | I | D | H | T | N | S | / |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = KEYMAP( \
- KC_GRV, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, \
- KC_TAB, KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, _______, \
- KC_ESC, KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, _______, \
- KC_LSFT, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , _______, \
- ADJUST, ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ \
-),
+ [_QWERTY] = KC_KEYMAP(
+ //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
+ INS, GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC,DEL ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ MINS,TAB , Q , W , E , R , T , Y , U , I , O , P ,LBRC,RBRC,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ EQL, ESC , A , S , D , F , G , H , J , K , L ,SCLN,QUOT,ENT ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ PGUP,LSFT, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,HOME,END ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ PGDN,AJST,LCTL,LALT,LGUI,LOWR,SPC , SPC ,RASE,LEFT,DOWN, UP ,RGHT,BSLS
+ //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
+ ),
/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
+ * ,------------------------------------------------. ,------------------------------------------------.
+ * | | ~ | F1 | F3 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | _ | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | { | } |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | + | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | | | |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | | | | | | | | | | | Next | Vol- | Vol+ | Play | |
+ * `------------------------------------------------' `------------------------------------------------'
*/
-[_LOWER] = KEYMAP( \
- _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______, \
- _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, _______, \
- _______, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, \
- _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______ \
-),
+ [_LOWER] = KC_KEYMAP(
+ //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
+ ,TILD, F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ UNDS, ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,LCBR,RCBR,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,PLUS,LCBR,RCBR, , ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ , , F7 , F8 , F9 ,F10 ,F11 , F12 , , , , , , ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ , , , , , , , , ,MNXT,VOLD,VOLU,MPLY,MUTE
+ //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
+ ),
/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = KEYMAP( \
- _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, \
- _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, \
- _______, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, \
- _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______ \
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn| | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | | | | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | |
- * `-----------------------------------------------------------------------------------'
+ * ,------------------------------------------------. ,------------------------------------------------.
+ * | | ~ | F1 | F3 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | _ | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | { | } |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | + | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | | |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | | | F7 | F8 | F9 | F10 | F11 | | F12 |ISO # |ISO / | | | | |
+ * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
+ * | | | | | | | | | | | Next | Vol- | Vol+ | Play | |
+ * `------------------------------------------------' `------------------------------------------------'
*/
-[_ADJUST] = KEYMAP( \
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \
- _______, _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, _______, \
- _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-)
-
+ [_RAISE] = KC_KEYMAP(
+ //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
+ ,TILD, F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ UNDS, , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,LCBR,RCBR,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,PLUS,LBRC,RBRC, , ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ , , F7 , F8 , F9 ,F10 ,F11 , F12 ,NUHS,NUBS, , , , ,
+ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
+ , , , , , , , , ,MNXT,VOLD,VOLU,MPLY,MUTE
+ //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
+ ),
+
+ [_ADJUST] = KEYMAP(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \
+ _______, _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, _______, \
+ _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ )
};
#ifdef AUDIO_ENABLE
float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_dvorak[][2] = SONG(DVORAK_SOUND);
-float tone_colemak[][2] = SONG(COLEMAK_SOUND);
#endif
void persistent_default_layer_set(uint16_t default_layer) {
@@ -181,24 +141,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
- case COLEMAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_NOTE_ARRAY(tone_colemak, false, 0);
- #endif
- persistent_default_layer_set(1UL<<_COLEMAK);
- }
- return false;
- break;
- case DVORAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
- #endif
- persistent_default_layer_set(1UL<<_DVORAK);
- }
- return false;
- break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/viterbi/keymaps/dwallace/keymap.c b/keyboards/viterbi/keymaps/dwallace/keymap.c
index 38d63ffaa9..d8f2479d59 100644
--- a/keyboards/viterbi/keymaps/dwallace/keymap.c
+++ b/keyboards/viterbi/keymaps/dwallace/keymap.c
@@ -1,6 +1,9 @@
#include "viterbi.h"
#include "action_layer.h"
#include "eeconfig.h"
+#ifdef RGBLIGHT_ENABLE
+#include "rgblight.h"
+#endif
extern keymap_config_t keymap_config;
@@ -9,7 +12,14 @@ extern keymap_config_t keymap_config;
enum custom_keycodes {
QWERTY = SAFE_RANGE,
- FN,
+ STK_SHIFT,
+ STK_CTRL,
+ STK_ALT,
+ STK_GUI,
+ STK_META,
+ STK_CLEAR,
+ RGB_LEVEL_UP,
+ RGB_LEVEL_DOWN,
};
#define KC_ KC_TRNS
@@ -20,13 +30,15 @@ enum custom_keycodes {
#define KC_FN1 MO(_FN)
#define KC_LCAG LCAG(KC_NO)
#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RVAD RGB_VAD
-#define KC_RVAI RGB_VAI
-#define KC_CLRM KC_NO // TODO: Clear sticky modifiers
+#define KC_RGUP RGB_LEVEL_UP
+#define KC_RGDN RGB_LEVEL_DOWN
#define KC_RST RESET
-
-// TODO: Make modifiers sticky
+#define KC_SSFT STK_SHIFT
+#define KC_SCTL STK_CTRL
+#define KC_SALT STK_ALT
+#define KC_SGUI STK_GUI
+#define KC_SMTA STK_META
+#define KC_SCLR STK_CLEAR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -38,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
ESC , A , S , D , F , G ,RBRC, H , J , K , L ,SCLN,QUOT,ENT ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- LSFT, Z , X , C , V , B ,SWIN, N , M ,COMM,DOT , UP ,SLSH,RSFT,
+ SSFT, Z , X , C , V , B ,SWIN, N , M ,COMM,DOT , UP ,SLSH,RSFT,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- LCTL,LCAG,LALT,LGUI,SPC ,CLRM,SAPP, FN1 ,SPC ,RGUI,LEFT,DOWN,RGHT,PGDN
+ SCTL,SMTA,SALT,SGUI,SPC ,SCLR,SAPP, FN1 ,SPC ,RGUI,LEFT,DOWN,RGHT,PGDN
//`----+----+----+----+----+----+----' `----+----+----+----+----+----+----'
),
@@ -50,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , , ,RST , , , , , , , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , , , RTOG,RMOD,RVAD,RVAI, , , ,
+ , , , , , , , RTOG, ,RGDN,RGUP, , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , , , , , , ,MUTE,VOLD,VOLU, , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -69,6 +81,76 @@ void persistent_default_layer_set(uint16_t default_layer) {
default_layer_set(default_layer);
}
+bool modifier_already_applied = false;
+uint8_t physically_held_modifiers = 0;
+uint8_t last_mods = 0xFF;
+uint8_t rgb_dimming = 0;
+#define SET_LED_RGB(val, led_num) setrgb(((val >> 16) & 0xFF) >> rgb_dimming, ((val >> 8) & 0xFF) >> rgb_dimming, (val & 0xFF) >> rgb_dimming, (LED_TYPE *)&led[led_num])
+
+void update_underglow_level(void) {
+ if (get_mods() == last_mods)
+ return;
+
+ last_mods = get_mods();
+
+ if (get_mods() == 0) {
+ uint8_t level = 0x10 >> rgb_dimming;
+ rgblight_setrgb(level, level, level);
+ return;
+ }
+
+ uint32_t mod_colors[4] = {0};
+ uint8_t mod_count = 0;
+ rgblight_setrgb(0x00, 0x00, 0x00);
+
+ if (get_mods() & MOD_BIT(KC_LSFT))
+ mod_colors[mod_count++] = 0xFF0000;
+ if (get_mods() & MOD_BIT(KC_LCTL))
+ mod_colors[mod_count++] = 0x00FF00;
+ if (get_mods() & MOD_BIT(KC_LALT))
+ mod_colors[mod_count++] = 0x0000FF;
+ if (get_mods() & MOD_BIT(KC_LGUI))
+ mod_colors[mod_count++] = 0xFFFF00;
+
+ uint8_t led_num = 0;
+ for (int m = 0; m < mod_count; m++) {
+ for (; led_num < RGBLED_NUM*(m+1)/mod_count; led_num++) {
+ SET_LED_RGB(mod_colors[m], led_num);
+ }
+ }
+ rgblight_set();
+}
+
+void add_sticky_modifier(uint16_t keycode) {
+ add_mods(MOD_BIT(keycode));
+ register_code(keycode);
+ modifier_already_applied = false;
+}
+
+void clear_sticky_modifiers(void) {
+ unregister_code(KC_LSFT);
+ unregister_code(KC_LCTL);
+ unregister_code(KC_LALT);
+ unregister_code(KC_LGUI);
+ update_underglow_level();
+}
+
+void handle_sticky_modifier_event(uint16_t keycode, bool pressed) {
+ if (pressed) {
+ add_sticky_modifier(keycode);
+ physically_held_modifiers |= MOD_BIT(keycode);
+ } else {
+ del_mods(MOD_BIT(keycode));
+ physically_held_modifiers &= ~MOD_BIT(keycode);
+ if (modifier_already_applied) {
+ clear_sticky_modifiers();
+ } else {
+ add_sticky_modifier(keycode);
+ }
+ }
+ update_underglow_level();
+}
+
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
@@ -80,6 +162,63 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
+ case STK_SHIFT:
+ handle_sticky_modifier_event(KC_LSFT, record->event.pressed);
+ return false;
+ break;
+ case STK_CTRL:
+ handle_sticky_modifier_event(KC_LCTL, record->event.pressed);
+ return false;
+ break;
+ case STK_ALT:
+ handle_sticky_modifier_event(KC_LALT, record->event.pressed);
+ return false;
+ break;
+ case STK_GUI:
+ handle_sticky_modifier_event(KC_LGUI, record->event.pressed);
+ return false;
+ break;
+ case STK_META:
+ handle_sticky_modifier_event(KC_LCTL, record->event.pressed);
+ handle_sticky_modifier_event(KC_LALT, record->event.pressed);
+ handle_sticky_modifier_event(KC_LGUI, record->event.pressed);
+ return false;
+ break;
+ case STK_CLEAR:
+ if (record->event.pressed) {
+ clear_sticky_modifiers();
+ }
+ return false;
+ break;
+ case RGB_LEVEL_DOWN:
+ if (record->event.pressed && rgb_dimming < 8) {
+ rgb_dimming++;
+ }
+ return false;
+ break;
+ case RGB_LEVEL_UP:
+ if (record->event.pressed && rgb_dimming > 0) {
+ rgb_dimming--;
+ }
+ return false;
+ break;
+ }
+ if (!record->event.pressed && IS_KEY(keycode)) {
+ modifier_already_applied = true;
+ if (physically_held_modifiers == 0)
+ clear_sticky_modifiers();
}
return true;
}
+
+void matrix_init_user(void) {
+ #ifdef RGBLIGHT_ENABLE
+ rgblight_enable();
+ #endif //RGBLIGHT_ENABLE
+}
+
+void matrix_scan_user(void) {
+ #ifdef RGBLIGHT_ENABLE
+ update_underglow_level();
+ #endif //RGBLIGHT_ENABLE
+}