aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gmmk
diff options
context:
space:
mode:
authorAndre Brait <andrebrait@gmail.com>2022-01-19 21:53:21 +0100
committerGitHub <noreply@github.com>2022-01-19 20:53:21 +0000
commit6156e6da8d1af60da5c0b64ca7b45908984d1660 (patch)
treeea2766fb19e56791d75258d547e5937c8759897b /keyboards/gmmk
parent91e50209e74f870d2195753402ab6816d1e378be (diff)
downloadqmk_firmware-6156e6da8d1af60da5c0b64ca7b45908984d1660.tar.gz
qmk_firmware-6156e6da8d1af60da5c0b64ca7b45908984d1660.zip
Small code improvements, fix KVM switch issues with GMMK Pro on andrebrait's keymap (#15943)
* Add LED table * Make constants constant * Disable Mousekey to fix issues with KVM Fixes #15939 * Update GMMK/pro/ansi/andrebrait README
Diffstat (limited to 'keyboards/gmmk')
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c21
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md1
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk1
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 b80164043..74a45b703 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() {
214 #if RGB_CONFIRMATION_BLINKING_TIME > 0 214 #if RGB_CONFIRMATION_BLINKING_TIME > 0
215 if (effect_started_time > 0) { 215 if (effect_started_time > 0) {
216 /* Render blinking EFFECTS */ 216 /* Render blinking EFFECTS */
217 uint16_t deltaTime = sync_timer_elapsed(effect_started_time); 217 const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
218 if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) { 218 if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
219 uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01; 219 const uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
220 uint8_t val_r = led_state * r_effect; 220 const uint8_t val_r = led_state * r_effect;
221 uint8_t val_g = led_state * g_effect; 221 const uint8_t val_g = led_state * g_effect;
222 uint8_t val_b = led_state * b_effect; 222 const uint8_t val_b = led_state * b_effect;
223 rgb_matrix_set_color_all(val_r, val_g, val_b); 223 rgb_matrix_set_color_all(val_r, val_g, val_b);
224 if (host_keyboard_led_state().caps_lock) { 224 if (host_keyboard_led_state().caps_lock) {
225 set_rgb_caps_leds(); 225 set_rgb_caps_leds();
@@ -264,6 +264,17 @@ static void start_effects() {
264} 264}
265#endif // RGB_CONFIRMATION_BLINKING_TIME > 0 265#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
266 266
267// RGB led number layout, function of the key
268
269// 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
270// 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
271// 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
272// 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
273// 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
274// 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
275// 87, led 07 88, led 18
276// 91, led 08 92, led 19
277
267static void set_rgb_caps_leds() { 278static void set_rgb_caps_leds() {
268 rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1 279 rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
269 rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1 280 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 e7f9978ce..5cb49bd83 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
5 5
6The differences are as follows: 6The differences are as follows:
7 7
8- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
8- Short DEBOUNCE time (5 ms) 9- Short DEBOUNCE time (5 ms)
9- Per-key debounce algorithm (sym_defer_pk) 10- Per-key debounce algorithm (sym_defer_pk)
10- RGB turns off after 20 minutes of inactivity 11- 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 650c79fbd..6024d42f1 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
@@ -1,3 +1,4 @@
1# Enable additional features. 1# Enable additional features.
2 2
3DEBOUNCE_TYPE = sym_defer_pk 3DEBOUNCE_TYPE = sym_defer_pk
4MOUSEKEY_ENABLE = no