aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-05-15 19:34:34 -0700
committerJack Humbert <jack.humb@gmail.com>2018-05-15 22:34:34 -0400
commit53a6501d71cabbe4c5c41652cf24fdc059609e5d (patch)
tree4662908d245fe7176307f99a994d1f8d8ef12158 /keyboards
parenta572323f94b533582edab4402867dc994cc8c75f (diff)
downloadqmk_firmware-53a6501d71cabbe4c5c41652cf24fdc059609e5d.tar.gz
qmk_firmware-53a6501d71cabbe4c5c41652cf24fdc059609e5d.zip
Yet another update to drashna keymaps and userspace (EEPROM, RGB indicators) (#2959)
* More Iris Tweaks * Mess with iris arrow keys * Massive layout overhaul to make everything more OLKB * Additional tweaks * Cleanup Userspace Remove unused layer code, and properly set userspace eeprom structure. * EEPROM stuff * Only use indicators if layer indication is enabled * Iris and Orthodox Tweaks (Status Indicators) * Additional tweaks to finish tri layer conversion * Disable ProMicro ligths globally * Add Pro Micro hacking info * Successfully get mod indication working on thumb clusters * Enable printing when console is enabled * Make Modifier Indicator lights more modular * Keymap cleanup * Tapping test changes * Cleanup and minor tweaks
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/iris/keymaps/drashna/config.h2
-rw-r--r--keyboards/iris/keymaps/drashna/keymap.c130
-rw-r--r--keyboards/iris/keymaps/drashna/rules.mk1
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c73
-rw-r--r--keyboards/orthodox/keymaps/drashna/rules.mk1
-rw-r--r--keyboards/viterbi/keymaps/drashna/keymap.c16
6 files changed, 131 insertions, 92 deletions
diff --git a/keyboards/iris/keymaps/drashna/config.h b/keyboards/iris/keymaps/drashna/config.h
index 2a451e7c7..bfdd0022b 100644
--- a/keyboards/iris/keymaps/drashna/config.h
+++ b/keyboards/iris/keymaps/drashna/config.h
@@ -41,6 +41,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 41#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
42#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2 42#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
43#define RGBLIGHT_EFFECT_BREATHE_CENTER 1 43#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
44
45#define RGBLIGHT_LIMIT_VAL 225
44#endif // RGBLIGHT_ENABLE 46#endif // RGBLIGHT_ENABLE
45 47
46#ifdef AUDIO_ENABLE 48#ifdef AUDIO_ENABLE
diff --git a/keyboards/iris/keymaps/drashna/keymap.c b/keyboards/iris/keymaps/drashna/keymap.c
index 64d074fc9..b24e5fe53 100644
--- a/keyboards/iris/keymaps/drashna/keymap.c
+++ b/keyboards/iris/keymaps/drashna/keymap.c
@@ -2,79 +2,94 @@
2#include QMK_KEYBOARD_H 2#include QMK_KEYBOARD_H
3#include "drashna.h" 3#include "drashna.h"
4 4
5#ifdef INDICATOR_LIGHTS
6extern userspace_config_t userspace_config;
5 7
6#define KC_ALAP ALT_T(KC_APP) 8uint8_t last_mod;
9uint8_t last_led;
10uint8_t last_osm;
11bool has_mods_changed = false;
12#endif
7 13
14#define KC_ALAP ALT_T(KC_APP)
15#define KC_OSLG OSM(MOD_LGUI)
8const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 16const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9 17
10 [_QWERTY] = LAYOUT_wrapper( 18 [_QWERTY] = LAYOUT_wrapper(
11 KC_GESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS, 19 KC_ESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS,
12 KC_TAB , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSLS, 20 KC_TAB , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSLS,
13 KC_C1R3, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, 21 KC_CCCV, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT,
14 KC_MLSF, _________________QWERTY_L3_________________, KC_ALAP, KC_LGUI, _________________QWERTY_R3_________________, KC_MRSF, 22 KC_MLSF, _________________QWERTY_L3_________________, KC_ALAP, KC_OSLG, _________________QWERTY_R3_________________, KC_MRSF,
15 LOWER, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE 23 LT(_LOWER,KC_GRV), KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE
16 ), 24 ),
17 [_COLEMAK] = LAYOUT_wrapper( 25 [_COLEMAK] = LAYOUT_wrapper(
18 KC_GESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS, 26 KC_ESC , ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS,
19 KC_TAB , _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSLS, 27 KC_TAB , _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSLS,
20 KC_C1R3, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_QUOT, 28 KC_CCCV, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_QUOT,
21 KC_MLSF, _________________COLEMAK_L3________________, KC_ALAP, KC_LGUI, _________________COLEMAK_R3________________, KC_MRSF, 29 KC_MLSF, _________________COLEMAK_L3________________, KC_ALAP, KC_OSLG, _________________COLEMAK_R3________________, KC_MRSF,
22 LOWER, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE 30 LT(_LOWER,KC_GRV), KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE
23 ), 31 ),
24 [_DVORAK] = LAYOUT_wrapper( 32 [_DVORAK] = LAYOUT_wrapper(
25 KC_GESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS, 33 KC_ESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS,
26 KC_TAB , _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSLS, 34 KC_TAB , _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSLS,
27 KC_C1R3, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_QUOT, 35 KC_CCCV, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_QUOT,
28 KC_MLSF, _________________DVORAK_L3_________________, KC_ALAP, KC_LGUI, _________________DVORAK_R3_________________, KC_MRSF, 36 KC_MLSF, _________________DVORAK_L3_________________, KC_ALAP, KC_OSLG, _________________DVORAK_R3_________________, KC_MRSF,
29 LOWER, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE 37 LT(_LOWER,KC_GRV), KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE
30 ), 38 ),
31 [_WORKMAN] = LAYOUT_wrapper( 39 [_WORKMAN] = LAYOUT_wrapper(
32 KC_GESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS, 40 KC_ESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS,
33 KC_TAB , _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, KC_BSLS, 41 KC_TAB , _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, KC_BSLS,
34 KC_C1R3, _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, KC_QUOT, 42 KC_CCCV, _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, KC_QUOT,
35 KC_MLSF, _________________WORKMAN_L3________________, KC_ALAP, KC_LGUI, _________________WORKMAN_R3________________, KC_MRSF, 43 KC_MLSF, _________________WORKMAN_L3________________, KC_ALAP, KC_OSLG, _________________WORKMAN_R3________________, KC_MRSF,
36 LOWER, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE 44 LT(_LOWER,KC_GRV), KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE
37 ), 45 ),
38 46
39 [_MODS] = LAYOUT( 47 [_MODS] = LAYOUT_wrapper(
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 51 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT,
44 _______, _______, _______, _______, _______, _______ 52 _______, _______, _______, _______, _______, _______
45 ), 53 ),
46 54
47 55
48 [_LOWER] = LAYOUT( 56 [_LOWER] = LAYOUT_wrapper(
49 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 57 _______, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 58 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_RBRC, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 59 _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
52 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LPRN, KC_RPRN, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, 60 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______,
53 _______, _______, KC_DEL, _______, _______, _______ 61 _______, _______, _______, _______, _______, _______
54 ), 62 ),
55 63
56 [_RAISE] = LAYOUT( 64 [_RAISE] = LAYOUT_wrapper(
57 KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 65 _______, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, _______,
58 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
59 _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_UNDS, KC_EQL , KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 67 _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
60 _______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_END, _______, _______, _______, _______, 68 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______,
61 _______, _______, _______, _______, _______, _______ 69 _______, _______, _______, _______, _______, _______
62 ), 70 ),
63 71
64 [_ADJUST] = LAYOUT( 72 [_ADJUST] = LAYOUT_wrapper(
65 KC_MAKE, KC_RST, EPRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, 73 KC_MAKE, _______, _______, _______, _______, _______, KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5, KC_RST,
66 RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, 74 VRSN, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, _______, _______, _______, _______, EPRM,
67 RGB_SMOD,RGB_HUI, CK_TOGG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, TG(_MODS), 75 _______, _______, CK_TOGG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, _______,
68 KC_RGB_T,RGB_SMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, 76 TG(_MODS),RGB_SMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T,_______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY,
69 _______, _______, _______, _______, _______, _______ 77 _______, _______, _______, _______, _______, _______
70 ) 78 )
71 79
72}; 80};
73 81
74 82
83void matrix_init_keymap(void) {
84#ifdef INDICATOR_LIGHTS
85 last_mod = get_mods();
86 last_led = host_keyboard_leds();
87 last_osm =get_oneshot_mods();
88#endif
89}
75 90
76#ifdef INDICATOR_LIGHT
77uint32_t layer_state_set_keymap (uint32_t state) { 91uint32_t layer_state_set_keymap (uint32_t state) {
92#ifdef INDICATOR_LIGHTS
78 uint8_t modifiders = get_mods(); 93 uint8_t modifiders = get_mods();
79 uint8_t led_usb_state = host_keyboard_leds(); 94 uint8_t led_usb_state = host_keyboard_leds();
80 uint8_t one_shot = get_oneshot_mods(); 95 uint8_t one_shot = get_oneshot_mods();
@@ -92,41 +107,49 @@ uint32_t layer_state_set_keymap (uint32_t state) {
92 rgblight_sethsv_at(120, 255, 255, 7); 107 rgblight_sethsv_at(120, 255, 255, 7);
93 rgblight_sethsv_at(120, 255, 255, 8); 108 rgblight_sethsv_at(120, 255, 255, 8);
94 } 109 }
110#endif
95 111
96 return state; 112 return state;
97} 113}
98 114
99 115
100void matrix_scan_keymap (void) { 116void matrix_scan_keymap (void) {
101 static uint8_t current_mods; 117
102 static uint8_t current_host_leds; 118#ifdef INDICATOR_LIGHTS
103 static uint8_t current_oneshot_mods; 119 uint8_t current_mod = get_mods();
104 static bool has_status_changed = true; 120 uint8_t current_led = host_keyboard_leds();
105 121 uint8_t current_osm =get_oneshot_mods();
106 if ( current_mods != get_mods() || current_host_leds != host_keyboard_leds() || current_oneshot_mods != get_oneshot_mods()) { 122
107 has_status_changed = true; 123 if (last_mod == current_mod) {
108 current_mods = get_mods(); 124 last_mod = current_mod;
109 current_host_leds = host_keyboard_leds(); 125 has_mods_changed = true;
110 current_oneshot_mods = get_oneshot_mods(); 126 }
127 if (last_led == current_led) {
128 last_led = current_led;
129 has_mods_changed = true;
111 } 130 }
112 if (has_status_changed) { 131 if (last_osm == current_osm) {
113 has_status_changed = false; 132 last_osm = current_osm;
133 has_mods_changed = true;
134 }
135
114 136
115 if (current_mods & MODS_SHIFT_MASK || current_host_leds & (1<<USB_LED_CAPS_LOCK) || current_oneshot_mods & MODS_SHIFT_MASK) { 137 if (userspace_config.rgb_layer_change && has_mods_changed && biton32(layer_state) == 0) {
138 if (current_mod & MODS_SHIFT_MASK || current_led & (1<<USB_LED_CAPS_LOCK) || current_osm & MODS_SHIFT_MASK) {
116 rgblight_sethsv_at(0, 255, 255, 5); 139 rgblight_sethsv_at(0, 255, 255, 5);
117 rgblight_sethsv_at(0, 255, 255, 10); 140 rgblight_sethsv_at(0, 255, 255, 10);
118 } else { 141 } else {
119 rgblight_sethsv_default_helper(5); 142 rgblight_sethsv_default_helper(5);
120 rgblight_sethsv_default_helper(10); 143 rgblight_sethsv_default_helper(10);
121 } 144 }
122 if (current_mods & MODS_CTRL_MASK || current_oneshot_mods & MODS_CTRL_MASK) { 145 if (current_mod & MODS_CTRL_MASK || current_osm & MODS_CTRL_MASK) {
123 rgblight_sethsv_at(51, 255, 255, 6); 146 rgblight_sethsv_at(51, 255, 255, 6);
124 rgblight_sethsv_at(51, 255, 255, 9); 147 rgblight_sethsv_at(51, 255, 255, 9);
125 } else { 148 } else {
126 rgblight_sethsv_default_helper(6); 149 rgblight_sethsv_default_helper(6);
127 rgblight_sethsv_default_helper(9); 150 rgblight_sethsv_default_helper(9);
128 } 151 }
129 if (current_mods & MODS_GUI_MASK || current_oneshot_mods & MODS_GUI_MASK) { 152 if (current_mod & MODS_GUI_MASK || current_osm & MODS_GUI_MASK) {
130 rgblight_sethsv_at(120, 255, 255, 7); 153 rgblight_sethsv_at(120, 255, 255, 7);
131 rgblight_sethsv_at(120, 255, 255, 8); 154 rgblight_sethsv_at(120, 255, 255, 8);
132 } else { 155 } else {
@@ -135,7 +158,6 @@ void matrix_scan_keymap (void) {
135 158
136 } 159 }
137 } 160 }
138}
139#endif 161#endif
140 162
141 163}
diff --git a/keyboards/iris/keymaps/drashna/rules.mk b/keyboards/iris/keymaps/drashna/rules.mk
index 8f19384f6..2608985c6 100644
--- a/keyboards/iris/keymaps/drashna/rules.mk
+++ b/keyboards/iris/keymaps/drashna/rules.mk
@@ -9,3 +9,4 @@ AUDIO_ENABLE = yes
9NKRO_ENABLE = yes 9NKRO_ENABLE = yes
10BACKLIGHT_ENABLE = no 10BACKLIGHT_ENABLE = no
11SWAP_HANDS_ENABLE = yes 11SWAP_HANDS_ENABLE = yes
12INDICATOR_LIGHTS = yes
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index 3c99e9cb8..bcc59268c 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -22,6 +22,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22#include QMK_KEYBOARD_H 22#include QMK_KEYBOARD_H
23#include "drashna.h" 23#include "drashna.h"
24 24
25#ifdef INDICATOR_LIGHTS
26extern userspace_config_t userspace_config;
27
28uint8_t last_mod;
29uint8_t last_led;
30uint8_t last_osm;
31bool has_mods_changed = false;
32#endif
25 33
26// Each layer gets a name for readability, which is then used in the keymap matrix below. 34// Each layer gets a name for readability, which is then used in the keymap matrix below.
27// The underscores don't mean anything - you can have a layer called STUFF or any other name. 35// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -33,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33#define XXXXXXX KC_NO 41#define XXXXXXX KC_NO
34 42
35 43
44
36const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 45const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
37 46
38[_QWERTY] = LAYOUT_wrapper(\ 47[_QWERTY] = LAYOUT_wrapper(\
@@ -65,27 +74,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
65 74
66[_LOWER] = LAYOUT_wrapper(\ 75[_LOWER] = LAYOUT_wrapper(\
67 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 76 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
68 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PGUP, KC_PGDN, KC_HOME, KC_END, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 77 _______, _________________FUNC_LEFT_________________, KC_PGUP, KC_PGDN, KC_HOME, KC_END, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
69 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, _______, _______ 78 _______, _________________FUNC_RIGHT________________, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______
70), 79),
71 80
72[_RAISE] = LAYOUT_wrapper(\ 81[_RAISE] = LAYOUT_wrapper(\
73 KC_GRV, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_BSPC, 82 KC_GRV, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_BSPC,
74 _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 83 _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
75 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, _______, _______ 84 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______
76), 85),
77 86
78[_ADJUST] = LAYOUT_wrapper(\ 87[_ADJUST] = LAYOUT_wrapper(\
79 KC_MAKE,KC_RESET, EPRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, 88 KC_MAKE, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5, KC_RESET,
80 RGB_SMOD,RGB_HUI, CK_TOGG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, TG(_MODS), 89 VRSN, _______, CK_TOGG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, EPRM,
81 KC_RGB_T,RGB_HUD, MU_ON, MU_OFF, MU_TOG, MU_MOD, _______, _______, _______, _______, _______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY 90 TG(_MODS),RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T,_______, _______, _______, _______, _______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY
82) 91)
83 92
84 93
85}; 94};
86 95
87#ifdef RGBLIGHT_ENABLE 96void matrix_init_keymap(void) {
97#ifdef INDICATOR_LIGHTS
98 last_mod = get_mods();
99 last_led = host_keyboard_leds();
100 last_osm =get_oneshot_mods();
101#endif
102}
103
88uint32_t layer_state_set_keymap (uint32_t state) { 104uint32_t layer_state_set_keymap (uint32_t state) {
105#ifdef INDICATOR_LIGHTS
89 uint8_t modifiders = get_mods(); 106 uint8_t modifiders = get_mods();
90 uint8_t led_usb_state = host_keyboard_leds(); 107 uint8_t led_usb_state = host_keyboard_leds();
91 uint8_t one_shot = get_oneshot_mods(); 108 uint8_t one_shot = get_oneshot_mods();
@@ -103,41 +120,49 @@ uint32_t layer_state_set_keymap (uint32_t state) {
103 rgblight_sethsv_at(120, 255, 255, 7); 120 rgblight_sethsv_at(120, 255, 255, 7);
104 rgblight_sethsv_at(120, 255, 255, 8); 121 rgblight_sethsv_at(120, 255, 255, 8);
105 } 122 }
123#endif
106 124
107 return state; 125 return state;
108} 126}
109 127
110 128
111void matrix_scan_keymap (void) { 129void matrix_scan_keymap (void) {
112 static uint8_t current_mods; 130
113 static uint8_t current_host_leds; 131#ifdef INDICATOR_LIGHTS
114 static uint8_t current_oneshot_mods; 132 uint8_t current_mod = get_mods();
115 static bool has_status_changed = true; 133 uint8_t current_led = host_keyboard_leds();
116 134 uint8_t current_osm =get_oneshot_mods();
117 if ( current_mods != get_mods() || current_host_leds != host_keyboard_leds() || current_oneshot_mods != get_oneshot_mods()) { 135
118 has_status_changed = true; 136 if (last_mod == current_mod) {
119 current_mods = get_mods(); 137 last_mod = current_mod;
120 current_host_leds = host_keyboard_leds(); 138 has_mods_changed = true;
121 current_oneshot_mods = get_oneshot_mods(); 139 }
140 if (last_led == current_led) {
141 last_led = current_led;
142 has_mods_changed = true;
122 } 143 }
123 if (has_status_changed) { 144 if (last_osm == current_osm) {
124 has_status_changed = false; 145 last_osm = current_osm;
146 has_mods_changed = true;
147 }
148
125 149
126 if (current_mods & MODS_SHIFT_MASK || current_host_leds & (1<<USB_LED_CAPS_LOCK) || current_oneshot_mods & MODS_SHIFT_MASK) { 150 if (userspace_config.rgb_layer_change && has_mods_changed && biton32(layer_state) == 0) {
151 if (current_mod & MODS_SHIFT_MASK || current_led & (1<<USB_LED_CAPS_LOCK) || current_osm & MODS_SHIFT_MASK) {
127 rgblight_sethsv_at(0, 255, 255, 5); 152 rgblight_sethsv_at(0, 255, 255, 5);
128 rgblight_sethsv_at(0, 255, 255, 10); 153 rgblight_sethsv_at(0, 255, 255, 10);
129 } else { 154 } else {
130 rgblight_sethsv_default_helper(5); 155 rgblight_sethsv_default_helper(5);
131 rgblight_sethsv_default_helper(10); 156 rgblight_sethsv_default_helper(10);
132 } 157 }
133 if (current_mods & MODS_CTRL_MASK || current_oneshot_mods & MODS_CTRL_MASK) { 158 if (current_mod & MODS_CTRL_MASK || current_osm & MODS_CTRL_MASK) {
134 rgblight_sethsv_at(51, 255, 255, 6); 159 rgblight_sethsv_at(51, 255, 255, 6);
135 rgblight_sethsv_at(51, 255, 255, 9); 160 rgblight_sethsv_at(51, 255, 255, 9);
136 } else { 161 } else {
137 rgblight_sethsv_default_helper(6); 162 rgblight_sethsv_default_helper(6);
138 rgblight_sethsv_default_helper(9); 163 rgblight_sethsv_default_helper(9);
139 } 164 }
140 if (current_mods & MODS_GUI_MASK || current_oneshot_mods & MODS_GUI_MASK) { 165 if (current_mod & MODS_GUI_MASK || current_osm & MODS_GUI_MASK) {
141 rgblight_sethsv_at(120, 255, 255, 7); 166 rgblight_sethsv_at(120, 255, 255, 7);
142 rgblight_sethsv_at(120, 255, 255, 8); 167 rgblight_sethsv_at(120, 255, 255, 8);
143 } else { 168 } else {
@@ -146,5 +171,7 @@ void matrix_scan_keymap (void) {
146 171
147 } 172 }
148 } 173 }
149}
150#endif 174#endif
175
176}
177
diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk
index 222a43640..7ea609ede 100644
--- a/keyboards/orthodox/keymaps/drashna/rules.mk
+++ b/keyboards/orthodox/keymaps/drashna/rules.mk
@@ -7,3 +7,4 @@ TAP_DANCE_ENABLE = no
7RGBLIGHT_ENABLE = yes 7RGBLIGHT_ENABLE = yes
8AUDIO_ENABLE = yes 8AUDIO_ENABLE = yes
9NKRO_ENABLE = yes 9NKRO_ENABLE = yes
10INDICATOR_LIGHTS = yes
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/viterbi/keymaps/drashna/keymap.c
index 09e8bc599..11ffe6ebd 100644
--- a/keyboards/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/viterbi/keymaps/drashna/keymap.c
@@ -17,7 +17,6 @@ extern keymap_config_t keymap_config;
17#define DIABLO TG(_DIABLO) 17#define DIABLO TG(_DIABLO)
18#define GAMEPAD TG(_GAMEPAD) 18#define GAMEPAD TG(_GAMEPAD)
19#define MEDIA TT(_MEDIA) 19#define MEDIA TT(_MEDIA)
20#define COVECUBE TG(_COVECUBE)
21 20
22 21
23//enum more_custom_keycodes { 22//enum more_custom_keycodes {
@@ -28,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28 27
29 [_NUMLOCK] = LAYOUT_ortho_5x7( 28 [_NUMLOCK] = LAYOUT_ortho_5x7(
30 LMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS, 29 LMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS,
31 MEDIA, KC_CALC, COVECUBE,KC_P7, KC_P8, KC_P9, KC_PAST, 30 MEDIA, KC_CALC, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PAST,
32 KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS, 31 KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS,
33 KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS, 32 KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS,
34 KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_COLN, KC_PENT 33 KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_COLN, KC_PENT
@@ -58,13 +57,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
58 KC_SALT, KC_MORESALT, KC_SALTHARD, KC_JUSTGAME, KC_AIM, XXXXXXX, KC_PENT 57 KC_SALT, KC_MORESALT, KC_SALTHARD, KC_JUSTGAME, KC_AIM, XXXXXXX, KC_PENT
59 ), 58 ),
60 59
61 [_COVECUBE] = LAYOUT_ortho_5x7(
62 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
63 XXXXXXX, XXXXXXX, COVECUBE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
64 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
65 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
66 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
67 ),
68 60
69 [_MEDIA] = LAYOUT_ortho_5x7( 61 [_MEDIA] = LAYOUT_ortho_5x7(
70 KC_MAKE, KC_RESET,MU_TOG, AU_ON, AU_OFF, CK_TOGG, RGB_SAD, 62 KC_MAKE, KC_RESET,MU_TOG, AU_ON, AU_OFF, CK_TOGG, RGB_SAD,
@@ -77,13 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
77 69
78}; 70};
79 71
80void matrix_init_keymap(void) {
81 DDRD &= ~(1<<5);
82 PORTD &= ~(1<<5);
83 72
84 DDRB &= ~(1<<0);
85 PORTB &= ~(1<<0);
86}
87 73
88bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 74bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
89 75
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 16:33:18 +0000