diff options
| author | QMK Bot <hello@qmk.fm> | 2022-01-19 20:54:25 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-01-19 20:54:25 +0000 |
| commit | 24324378a8ab070775d4e5361d6ce3f9f903c395 (patch) | |
| tree | 48e0ec0586c6ec64b6694a5bdd9c1c7de1d4c9aa | |
| parent | d840ef2b2855c7c6094e5881a4bc78a05297a488 (diff) | |
| parent | 6156e6da8d1af60da5c0b64ca7b45908984d1660 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c | 21 | ||||
| -rw-r--r-- | keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md | 1 | ||||
| -rw-r--r-- | keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk | 1 |
3 files changed, 18 insertions, 5 deletions
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c index b801640436..74a45b7036 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c +++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c @@ -214,12 +214,12 @@ void rgb_matrix_indicators_user() { #if RGB_CONFIRMATION_BLINKING_TIME > 0 if (effect_started_time > 0) { /* Render blinking EFFECTS */ - uint16_t deltaTime = sync_timer_elapsed(effect_started_time); + const uint16_t deltaTime = sync_timer_elapsed(effect_started_time); if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) { - uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01; - uint8_t val_r = led_state * r_effect; - uint8_t val_g = led_state * g_effect; - uint8_t val_b = led_state * b_effect; + const uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01; + const uint8_t val_r = led_state * r_effect; + const uint8_t val_g = led_state * g_effect; + const uint8_t val_b = led_state * b_effect; rgb_matrix_set_color_all(val_r, val_g, val_b); if (host_keyboard_led_state().caps_lock) { set_rgb_caps_leds(); @@ -264,6 +264,17 @@ static void start_effects() { } #endif // RGB_CONFIRMATION_BLINKING_TIME > 0 +// RGB led number layout, function of the key + +// 67, led 01 0, ESC 6, F1 12, F2 18, F3 23, F4 28, F5 34, F6 39, F7 44, F8 50, F9 56, F10 61, F11 66, F12 69, Prt Rotary(Mute) 68, led 12 +// 70, led 02 1, ~ 7, 1 13, 2 19, 3 24, 4 29, 5 35, 6 40, 7 45, 8 51, 9 57, 0 62, -_ 78, (=+) 85, BackSpc 72, Home 71, led 13 +// 73, led 03 2, Tab 8, Q 14, W 20. E 25, R 30, T 36, Y 41, U 46, I 52, O 58, P 63, [{ 89, ]} 93, \| 75, PgUp 74, led 14 +// 76, led 04 3, Caps 9, A 15, S 21, D 26, F 31, G 37, H 42, J 47, K 53, L 59, ;: 64, '" 96, Enter 86, PgDn 77, led 15 +// 80, led 05 4, Sh_L 10, Z 16, X 22, C 27, V 32, B 38, N 43, M 48, ,< 54, .< 60, /? 90, Sh_R 94, Up 82, End 81, led 16 +// 83, led 06 5, Ct_L 11,Win_L 17, Alt_L 33, SPACE 49, Alt_R 55, FN 65, Ct_R 95, Left 97, Down 79, Right 84, led 17 +// 87, led 07 88, led 18 +// 91, led 08 92, led 19 + static void set_rgb_caps_leds() { rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1 rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1 diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md index e7f9978cee..5cb49bd836 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md @@ -5,6 +5,7 @@ It basically reflects my needs for both Delete and Insert being readily availabl The differences are as follows: +- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway) - Short DEBOUNCE time (5 ms) - Per-key debounce algorithm (sym_defer_pk) - RGB turns off after 20 minutes of inactivity diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk index 650c79fbdc..6024d42f1d 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk +++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk @@ -1,3 +1,4 @@ # Enable additional features. DEBOUNCE_TYPE = sym_defer_pk +MOUSEKEY_ENABLE = no |