From 11625f7a791ca1b641f1f3894bff7475dcc41fed Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 16:41:42 -0400 Subject: [PATCH 01/26] Create stickandgum --- keyboards/gmmk/pro/ansi/keymaps/stickandgum | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum b/keyboards/gmmk/pro/ansi/keymaps/stickandgum new file mode 100644 index 000000000000..05430db9c67b --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum @@ -0,0 +1 @@ +Feature rich GMMK Pro keyboard functionality without adding too many functions From 751b834a3c29de4c66ca668c12beb883ab8745f4 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 16:52:53 -0400 Subject: [PATCH 02/26] Delete stickandgum --- keyboards/gmmk/pro/ansi/keymaps/stickandgum | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum b/keyboards/gmmk/pro/ansi/keymaps/stickandgum deleted file mode 100644 index 05430db9c67b..000000000000 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum +++ /dev/null @@ -1 +0,0 @@ -Feature rich GMMK Pro keyboard functionality without adding too many functions From 562cf4abbe483b6c845cc354215e6849921c4c7e Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 16:53:20 -0400 Subject: [PATCH 03/26] Create test.txt --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt new file mode 100644 index 000000000000..9daeafb9864c --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt @@ -0,0 +1 @@ +test From 1ea02fa65d8eea46e431296aa58a6a2714720e8b Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 16:57:56 -0400 Subject: [PATCH 04/26] Added keymap files and readme.md --- .../pro/ansi/keymaps/stickandgum/config.h | 76 +++++ .../pro/ansi/keymaps/stickandgum/keymap.c | 286 ++++++++++++++++++ .../pro/ansi/keymaps/stickandgum/readme.md | 62 ++++ .../pro/ansi/keymaps/stickandgum/rules.mk | 2 + 4 files changed, 426 insertions(+) create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h new file mode 100644 index 000000000000..c4cefbcfab44 --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -0,0 +1,76 @@ +/* StickAndGum github. */ + +/* Copyright 2021 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +// I like NKRO.. force it! - You can still toggle it if you want to disable. +#define FORCE_NKRO + + +// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best. +#ifdef RGB_MATRIX_ENABLE + // #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR + // Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state + #define RGB_DISABLE_WHEN_USB_SUSPENDED + + #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain + #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes + + // #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. + // #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. + // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! + #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). + // #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) + // #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) + // #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) + #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) + #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above + #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above + // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) + #define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow + // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right + #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom + #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. + #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. + #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right + // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. + #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard + #define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards + #define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. + #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) + #define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. + // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. + #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back + #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left + #define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right + // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! + // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue + // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades + #define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. + #define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. + #define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). + #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). +#endif + diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c new file mode 100644 index 000000000000..2c60abaf6515 --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c @@ -0,0 +1,286 @@ +/* GMMK Pro - QMK Keyboard! - StickAndGum */ + +#include QMK_KEYBOARD_H + +enum my_keycodes { + LED_TILDE = SAFE_RANGE, + LED_1, + LED_2, + LED_3, + LED_4, + LED_5, + LED_6, + LED_7, + LED_8, + LED_9, + LED_0, + LED_MINS, + LED_EQL, + QMKBEST +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) +// ~ 1 2 3 4 5 6 7 8 9 0 - (=) BackSpc Del +// Tab Q W E R T Y U I O P [ ] \ PgUp +// Caps A S D F G H J K L ; " Enter PgDn +// Sh_L Z X C V B N M , . ? Sh_R Up End +// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right + + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_DEL, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + _______, KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL, KC_WHOM, _______, _______, _______, _______, _______, KC_WAKE, KC_SLEP, KC_PAUS, _______, + LED_TILDE, LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, LED_MINS, LED_EQL, KC_INS, KC_SLCK, + _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_BRIU, + _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_SPI, _______, _______, _______, _______, QMKBEST, _______, _______, _______, KC_BRID, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_MPLY, KC_PWR, + _______, _______, _______, _______, KC_RALT, _______, KC_APP, KC_MPRV, KC_MSTP, KC_MNXT + ), + +}; + +#ifdef ENCODER_ENABLE +bool encoder_update_user(uint8_t index, bool clockwise) { + // https://beta.docs.qmk.fm/using-qmk/simple-keycodes/feature_advanced_keycodes#alt-escape-for-alt-tab-id-alt-escape-for-alt-tab + if (get_mods() & MOD_MASK_CTRL) { // If CTRL is held + uint8_t mod_state = get_mods(); // Store all modifiers that are held + unregister_mods(MOD_MASK_CTRL); // Immediately unregister the CRTL key (don't send CTRL-PgDn) - del_mods doesn't work here (not immediate) + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + set_mods(mod_state); // Add back in the CTRL key - so ctrl-key will work if ctrl was never released after paging. + } else if (get_mods() & MOD_MASK_SHIFT) { + uint8_t mod_state = get_mods(); + unregister_mods(MOD_MASK_SHIFT); + if (clockwise) { + #ifdef MOUSEKEY_ENABLE // If using the mouse scroll - make sure MOUSEKEY is enabled + tap_code(KC_MS_WH_DOWN); + #else + tap_code(KC_VOLU); + #endif + } else { + #ifdef MOUSEKEY_ENABLE + tap_code(KC_MS_WH_UP); + #else + tap_code(KC_VOLD); + #endif + } + set_mods(mod_state); + } else if (clockwise) { // All else volume. + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} +#endif //ENCODER_ENABLE + +#ifdef RGB_MATRIX_ENABLE +static void set_rgb_caps_leds_on(void); +static void set_rgb_scroll_leds_on(void); +static void set_rgb_caps_leds_off(void); +static void set_rgb_scroll_leds_off(void); + +// Called on powerup and is the last _init that is run. +void keyboard_post_init_user(void) { + + int mods[35] = {0,2,3,4,5,11,17,33,49,55,65,95,97,79,94,85,93,96,90,69,92,67,76,80,91,75,86,68,77,81,92,28,34,39,44}; + int j; + + /* output each array element's value */ + for (j = 0; j < 35; j++ ) { + g_led_config.flags[mods[j]] = LED_FLAG_MODIFIER; + } + + if (!rgb_matrix_is_enabled()) { + rgb_matrix_enable(); +#ifdef CONSOLE_ENABLE + uprintf("ERROR! RGB Matrix Enabled and wrote to EEPROM! -How was the RGB Matrix Disabled?"); +#endif + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +#ifdef CONSOLE_ENABLE + switch(rgb_matrix_get_flags()) { + case 0x08: + uprintf("FLAG: LED_FLAG_INDICATOR "); + break; + case 0x04: + uprintf("FLAG: LED_FLAG_KEYLIGHT "); + break; + case 0x02: + uprintf("FLAG: LED_FLAG_UNDERGLOW "); + break; + case 0x01: + uprintf("FLAG: LED_FLAG_MODIFIER "); + break; + case 0xFF: + uprintf("FLAG: LED_FLAG_ALL "); + break; + case 0x00: + uprintf("FLAG: LED_FLAG_NONE "); + break; + default: + uprintf("FLAG Other: %u ", rgb_matrix_get_flags()); + } + uprintf("Caps? %d Scroll? %d - MATRIX: %d\n", host_keyboard_led_state().caps_lock, host_keyboard_led_state().scroll_lock, rgb_matrix_is_enabled()); +#endif //CONSOLE_ENABLE + + switch (keycode) { + case RGB_TOG: + if (record->event.pressed) { + if (rgb_matrix_get_flags() == LED_FLAG_ALL) { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } else { + rgb_matrix_set_flags(LED_FLAG_ALL); + } + } + return false; + case LED_TILDE: + rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR); // Can use RGB_M_P built-in keycode instead. + break; + case LED_1: + rgb_matrix_mode(RGB_MATRIX_ALPHAS_MODS); + break; + case LED_2: + rgb_matrix_mode(RGB_MATRIX_GRADIENT_UP_DOWN); + break; + case LED_3: + rgb_matrix_mode(RGB_MATRIX_JELLYBEAN_RAINDROPS); + break; + case LED_4: + rgb_matrix_mode(RGB_MATRIX_BAND_SAT); + break; + case LED_5: + rgb_matrix_mode(RGB_MATRIX_BAND_VAL); + break; + case LED_6: + rgb_matrix_mode(RGB_MATRIX_BAND_SPIRAL_VAL); + break; + case LED_7: + rgb_matrix_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT); // Can use RGB_M_R built-in keycode instead. + break; + case LED_8: + rgb_matrix_mode(RGB_MATRIX_CYCLE_PINWHEEL); // Can use RGB_M_SW built-in keycode instead. + break; + case LED_9: + rgb_matrix_mode(RGB_MATRIX_BREATHING); // Can use RGB_M_B built-in keycode instead. + break; + #ifdef RGB_MATRIX_KEYPRESSES // Reactive effects require RGB_MATRIX_KEYPRESSES in config.h + case LED_0: + rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE_WIDE); + break; + #endif //RGB_MATRIX_KEYPRESSES + #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap and Rain require #define RGB_MATRIX_FRAMEBUFFER_EFFECTS in config.h + case LED_MINS: + rgb_matrix_mode(RGB_MATRIX_DIGITAL_RAIN); + break; + case LED_EQL: + rgb_matrix_mode(RGB_MATRIX_TYPING_HEATMAP); + break; + #endif //RGB_MATRIX_FRAMEBUFFER_EFFECTS + case QMKBEST: + if (record->event.pressed) { // when keycode QMKBEST is pressed + SEND_STRING("QMK rocks"); + } else { // when keycode QMKBEST key is released + SEND_STRING("!!"); + } + break; + } + return true; +} + +void rgb_matrix_indicators_user(void) { + if (host_keyboard_led_state().caps_lock) { + set_rgb_caps_leds_on(); + } else { + if (rgb_matrix_get_flags() == LED_FLAG_NONE){ + set_rgb_caps_leds_off(); + } + } + if (host_keyboard_led_state().scroll_lock) { + set_rgb_scroll_leds_on(); + } else { + if (rgb_matrix_get_flags() == LED_FLAG_NONE){ + set_rgb_scroll_leds_off(); + } + } +} + +// 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_on() { + rgb_matrix_set_color(0, 255, 0, 0); //Escape Key + rgb_matrix_set_color(3, 255, 0, 0); //capslock key + rgb_matrix_set_color(5, 255, 0, 0); //Left CTRL key + rgb_matrix_set_color(67, 255, 0, 0); //Left LED 01 + rgb_matrix_set_color(68, 255, 0, 0); //Right LED 12 + rgb_matrix_set_color(70, 255, 127, 0); //Left LED 02 + rgb_matrix_set_color(71, 255, 127, 0); //Right LED 13 + rgb_matrix_set_color(73, 255, 255, 0); //Left LED 03 + rgb_matrix_set_color(74, 255, 255, 0); //Right LED 14 + rgb_matrix_set_color(76, 0, 255, 0); //Left LED 04 + rgb_matrix_set_color(77, 0, 255, 0); //Right LED 15 + rgb_matrix_set_color(80, 0, 0, 255); //Left LED 05 + rgb_matrix_set_color(81, 0, 0, 255); //Right LED 16 + rgb_matrix_set_color(83, 46, 43, 95); //Left LED 06 + rgb_matrix_set_color(84, 46, 43, 95); //Right LED 17 + rgb_matrix_set_color(87, 139, 0, 255); //Left LED 07 + rgb_matrix_set_color(88, 139, 0, 255); //Right LED 18 + rgb_matrix_set_color(91, 255, 255, 255); //Left LED 08 + rgb_matrix_set_color(92, 255, 255, 255); //Right LED 19 +} + +static void set_rgb_caps_leds_off() { + rgb_matrix_set_color(0, 0, 0, 0); //Escape Key + rgb_matrix_set_color(3, 0, 0, 0); //capslock key + rgb_matrix_set_color(5, 0, 0, 0); //Left CTRL key + rgb_matrix_set_color(67, 0, 0, 0); //Left LED 01 + rgb_matrix_set_color(68, 0, 0, 0); //Right LED 12 + rgb_matrix_set_color(70, 0, 0, 0); //Left LED 02 + rgb_matrix_set_color(71, 0, 0, 0); //Right LED 13 + rgb_matrix_set_color(73, 0, 0, 0); //Left LED 03 + rgb_matrix_set_color(74, 0, 0, 0); //Right LED 14 + rgb_matrix_set_color(76, 0, 0, 0); //Left LED 04 + rgb_matrix_set_color(77, 0, 0, 0); //Right LED 15 + rgb_matrix_set_color(80, 0, 0, 0); //Left LED 05 + rgb_matrix_set_color(81, 0, 0, 0); //Right LED 16 + rgb_matrix_set_color(83, 0, 0, 0); //Left LED 06 + rgb_matrix_set_color(84, 0, 0, 0); //Right LED 17 + rgb_matrix_set_color(87, 0, 0, 0); //Left LED 07 + rgb_matrix_set_color(88, 0, 0, 0); //Right LED 18 + rgb_matrix_set_color(91, 0, 0, 0); //Left LED 08 + rgb_matrix_set_color(92, 0, 0, 0); //Right LED 19 +} + +static void set_rgb_scroll_leds_on() { + rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME) +} + +static void set_rgb_scroll_leds_off() { + rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME) +} + +#endif // RGB_MATRIX_ENABLE \ No newline at end of file diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md new file mode 100644 index 000000000000..b62b07d75b2f --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -0,0 +1,62 @@ +# Glorious GMMK Pro / ANSI - Enhanced Keyboard +# Tried to incorporate full featured GMMK Pro keyboard functionality without adding too many functions. Included Scroll Lock and Caps LEDs. NKRO On by default. +# Allow holding the Shift and Ctrl keys to scroll on the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications +# Trimmed down the amazing 41 current RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. +# Features are as follows: + +# BIG thank you to https://github.com/andrebrait, @drashna and @filterpaper and the entire discord community. + +* Keymap Creator: [StickAndGum](https://github.com/StickAndGum) +* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) +* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) + +Layout: +![GMMK Pro](https://i.imgur.com/q2M3uEU.jpg) + +- Rotary + - Default: Volume Up/Down + - Shift: Mouse Wheel Down/Up + - Ctrl: Page Down/Up + +Top/Default Layer: + - Print Screen -> Print Screen (Left of rotary) + - Delete -> Home (Under Rotary) + - Right Alt -> Delete (Right of Spacebar) + - All other keys defaults. + +- Fn Layer: + - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in. + - Fn + Backspace -> Insert + - Fn + Print -> Pause/Break + - Fn + Home -> Scroll Lock (Lights up white!) + - Fn + Del (right of space) -> Right-Alt key. + - Fn + RCtrl (right of Fn) -> Menu/App key. + - Fn + N -> Toggle NKRO (Defaults to Enabled) + - Fn + End -> Power Off Computer + - Fn + F12 -> Suspend Computer + - Fn + F11 -> Wake Computer (Necessary on MAC OS?) + - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down + - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser Home. + - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively. + +- RGB Information: + - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate) + - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators + - Scroll: Fn-Home (Under Rotary) white indicator. + - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT in my opinon)) + +- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. + - Fn + r -> Toggle RGB + - Fn + w,s -> Brightness Up, Down + - Fn + a,d -> Cycle Forward/Backward through rgb effects + - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) + - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) + - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT to Slow down) + - Fn + ~, 0-9 and - and = keys -> 13 RGB different effects arranged to my liking.. Fn-1 is my favorite. + - Fn + L -> My easter egg... "QMK rocks!" + +- Known issues: + - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't. Caps/Scroll lights do not turn off properly. Just change the effect to something else to fix this. + - If you find a fix for this, please let me know! + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk new file mode 100644 index 000000000000..640ec44b2eaa --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk @@ -0,0 +1,2 @@ +CONSOLE_ENABLE = no +MOUSEKEY_ENABLE = yes From 37c4545258a915f187277f2e05b74a88c23a1edb Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 17:05:06 -0400 Subject: [PATCH 05/26] Add files via upload --- .../pro/ansi/keymaps/stickandgum/readme.md | 54 ++++++++----------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index b62b07d75b2f..6fff3a6b9d28 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -1,34 +1,29 @@ -# Glorious GMMK Pro / ANSI - Enhanced Keyboard -# Tried to incorporate full featured GMMK Pro keyboard functionality without adding too many functions. Included Scroll Lock and Caps LEDs. NKRO On by default. -# Allow holding the Shift and Ctrl keys to scroll on the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications -# Trimmed down the amazing 41 current RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. -# Features are as follows: +# Tried to incorporate full keymap functionality without adding unnessary functions. Included Scroll Lock and Caps LEDs. NKRO On by default. +# Also, slimmed down the 41 current RGB effects down to about 13 or so reasonable effects that vary just enough for your entertainment. -# BIG thank you to https://github.com/andrebrait, @drashna and @filterpaper and the entire discord community. - -* Keymap Creator: [StickAndGum](https://github.com/StickAndGum) -* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) -* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) - -Layout: -![GMMK Pro](https://i.imgur.com/q2M3uEU.jpg) +Features are as follows: - Rotary - Default: Volume Up/Down - Shift: Mouse Wheel Down/Up - Ctrl: Page Down/Up -Top/Default Layer: - - Print Screen -> Print Screen (Left of rotary) +- RGB: + - Toggles via Fn-r (CAPS & SCROLL still Light/Indicate) + - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators + - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-2 looks GREAT in my opinon)) + - Scroll: Fn-Home (Under Rotary) White Indicator. + +- Top/Default Layer: + - Print Screen - Print Screen - Delete -> Home (Under Rotary) - Right Alt -> Delete (Right of Spacebar) - - All other keys defaults. - + - Fn Layer: - - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in. + - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - Fn + Backspace -> Insert - Fn + Print -> Pause/Break - - Fn + Home -> Scroll Lock (Lights up white!) + - Fn + Home -> Enable Scroll Lock - Fn + Del (right of space) -> Right-Alt key. - Fn + RCtrl (right of Fn) -> Menu/App key. - Fn + N -> Toggle NKRO (Defaults to Enabled) @@ -36,27 +31,20 @@ Top/Default Layer: - Fn + F12 -> Suspend Computer - Fn + F11 -> Wake Computer (Necessary on MAC OS?) - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down - - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser Home. - - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively. + - Fn + F1 - F5 -> Launch Calc, My Comp, Media Player, Mail Client, Browser + - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next -- RGB Information: - - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate) - - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators - - Scroll: Fn-Home (Under Rotary) white indicator. - - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT in my opinon)) - - RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. - Fn + r -> Toggle RGB - Fn + w,s -> Brightness Up, Down - Fn + a,d -> Cycle Forward/Backward through rgb effects - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) - - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT to Slow down) + - Fn + f -> Increase or Decrease Speed - Fn + ~, 0-9 and - and = keys -> 13 RGB different effects arranged to my liking.. Fn-1 is my favorite. - - Fn + L -> My easter egg... "QMK rocks!" - Known issues: - - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't. Caps/Scroll lights do not turn off properly. Just change the effect to something else to fix this. - - If you find a fix for this, please let me know! - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file + - Heatmap function is a bit buggy - Fn keys light and caps lights do not turn off. Just change the effect to get past this. + + + \ No newline at end of file From 13512462c89443c5bfae6e32a4de8898144a0c97 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 17:09:27 -0400 Subject: [PATCH 06/26] Delete test.txt --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt deleted file mode 100644 index 9daeafb9864c..000000000000 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/test.txt +++ /dev/null @@ -1 +0,0 @@ -test From f96ed7b28410bcc5d01090d6fe52ec3db2fe915f Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 17:09:54 -0400 Subject: [PATCH 07/26] Delete readme.md --- .../pro/ansi/keymaps/stickandgum/readme.md | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md deleted file mode 100644 index 6fff3a6b9d28..000000000000 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ /dev/null @@ -1,50 +0,0 @@ -# Tried to incorporate full keymap functionality without adding unnessary functions. Included Scroll Lock and Caps LEDs. NKRO On by default. -# Also, slimmed down the 41 current RGB effects down to about 13 or so reasonable effects that vary just enough for your entertainment. - -Features are as follows: - -- Rotary - - Default: Volume Up/Down - - Shift: Mouse Wheel Down/Up - - Ctrl: Page Down/Up - -- RGB: - - Toggles via Fn-r (CAPS & SCROLL still Light/Indicate) - - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators - - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-2 looks GREAT in my opinon)) - - Scroll: Fn-Home (Under Rotary) White Indicator. - -- Top/Default Layer: - - Print Screen - Print Screen - - Delete -> Home (Under Rotary) - - Right Alt -> Delete (Right of Spacebar) - -- Fn Layer: - - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - - Fn + Backspace -> Insert - - Fn + Print -> Pause/Break - - Fn + Home -> Enable Scroll Lock - - Fn + Del (right of space) -> Right-Alt key. - - Fn + RCtrl (right of Fn) -> Menu/App key. - - Fn + N -> Toggle NKRO (Defaults to Enabled) - - Fn + End -> Power Off Computer - - Fn + F12 -> Suspend Computer - - Fn + F11 -> Wake Computer (Necessary on MAC OS?) - - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down - - Fn + F1 - F5 -> Launch Calc, My Comp, Media Player, Mail Client, Browser - - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next - -- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. - - Fn + r -> Toggle RGB - - Fn + w,s -> Brightness Up, Down - - Fn + a,d -> Cycle Forward/Backward through rgb effects - - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) - - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) - - Fn + f -> Increase or Decrease Speed - - Fn + ~, 0-9 and - and = keys -> 13 RGB different effects arranged to my liking.. Fn-1 is my favorite. - -- Known issues: - - Heatmap function is a bit buggy - Fn keys light and caps lights do not turn off. Just change the effect to get past this. - - - \ No newline at end of file From b3d5a7ecc733881c5dce62cb0ce493dd0d844b88 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 17:10:42 -0400 Subject: [PATCH 08/26] Add files via upload --- .../pro/ansi/keymaps/stickandgum/readme.md | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md new file mode 100644 index 000000000000..362fec19b4ae --- /dev/null +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -0,0 +1,63 @@ +# Glorious GMMK Pro / ANSI - Enhanced Keyboard + +Tried to incorporate full featured GMMK Pro keyboard functionality without adding too many functions. Included Scroll Lock and Caps LEDs. NKRO On by default. +Allow holding the Shift and Ctrl keys to scroll on the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications +Trimmed down the amazing 41 current RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. +Features are as follows: + +BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper and the entire discord community. + +* Keymap Creator: [StickAndGum](https://github.com/StickAndGum) +* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) +* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) + +Layout: +![Coming soon](https://i.imgur.com/) + +- Rotary + - Default: Volume Up/Down + - Shift: Mouse Wheel Down/Up + - Ctrl: Page Down/Up + +Top/Default Layer: + - Print Screen -> Print Screen (Left of rotary) + - Delete -> Home (Under Rotary) + - Right Alt -> Delete (Right of Spacebar) + - All other keys defaults. + +- Fn Layer: + - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in. + - Fn + Backspace -> Insert + - Fn + Print -> Pause/Break + - Fn + Home -> Scroll Lock (Lights up white!) + - Fn + Del (right of space) -> Right-Alt key. + - Fn + RCtrl (right of Fn) -> Menu/App key. + - Fn + N -> Toggle NKRO (Defaults to Enabled) + - Fn + End -> Power Off Computer + - Fn + F12 -> Suspend Computer + - Fn + F11 -> Wake Computer (Necessary on MAC OS?) + - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down + - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser Home. + - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively. + +- RGB Information: + - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate) + - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators + - Scroll: Fn-Home (Under Rotary) white indicator. + - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT in my opinon)) + +- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. + - Fn + r -> Toggle RGB + - Fn + w,s -> Brightness Up, Down + - Fn + a,d -> Cycle Forward/Backward through rgb effects + - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) + - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) + - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT to Slow down) + - Fn + ~, 0-9 and - and = keys -> 13 RGB different effects arranged to my liking.. Fn-1 is my favorite. + - Fn + L -> My easter egg... "QMK rocks!" + +- Known issues: + - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't. Caps/Scroll lights do not turn off properly. Just change the effect to something else to fix this. + - If you find a fix for this, please let me know! + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file From f738208d2b809cf5cc0462f819021a6e7ca7648c Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 18:12:20 -0400 Subject: [PATCH 09/26] Add files via upload --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 362fec19b4ae..f50c85c68f00 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -12,7 +12,7 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) Layout: -![Coming soon](https://i.imgur.com/) +![Keyboard Layout](https://imgur.com/a/A34TeBP) - Rotary - Default: Volume Up/Down From a4cce411d6e7ef7a48463d6d43710f76326d844c Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 18:16:32 -0400 Subject: [PATCH 10/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index f50c85c68f00..34fe642c27a9 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -12,7 +12,7 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) Layout: -![Keyboard Layout](https://imgur.com/a/A34TeBP) +* Layout :[Keyboard Layout](https://imgur.com/a/A34TeBP) - Rotary - Default: Volume Up/Down @@ -57,7 +57,7 @@ Top/Default Layer: - Fn + L -> My easter egg... "QMK rocks!" - Known issues: - - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't. Caps/Scroll lights do not turn off properly. Just change the effect to something else to fix this. - - If you find a fix for this, please let me know! + - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't. Caps/Scroll lights do not turn off properly. Just change the effect to something else to fix this. + - If you find a fix for this, please let me know. -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 17fca1513b39ae4f1f51c6d9e645b75810467516 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 18:21:52 -0400 Subject: [PATCH 11/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 34fe642c27a9..17051fb31227 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -12,7 +12,7 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) Layout: -* Layout :[Keyboard Layout](https://imgur.com/a/A34TeBP) +* Layout :![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) - Rotary - Default: Volume Up/Down From 7899119c78f31f31321b0feed7a05f7a68919f5c Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 18:22:13 -0400 Subject: [PATCH 12/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 17051fb31227..663f425341b7 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -11,7 +11,6 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) * Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) -Layout: * Layout :![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) - Rotary From bc66e9572a01636545add2b4796d9c0de4b34bab Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 18:28:24 -0400 Subject: [PATCH 13/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 663f425341b7..2a4fe237970c 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -56,7 +56,7 @@ Top/Default Layer: - Fn + L -> My easter egg... "QMK rocks!" - Known issues: - - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't. Caps/Scroll lights do not turn off properly. Just change the effect to something else to fix this. - - If you find a fix for this, please let me know. + - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't and the Caps/Scroll lights don't turn off properly when using. Just change the effect to something else to fix this. + - If you find a fix for this, please let me know. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 53f2019d16bc41e2990503de80eca90c3136227a Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 18:33:48 -0400 Subject: [PATCH 14/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 2a4fe237970c..24efa9bd056f 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -43,7 +43,7 @@ Top/Default Layer: - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate) - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators - Scroll: Fn-Home (Under Rotary) white indicator. - - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT in my opinon)) + - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT IMHO) - RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. - Fn + r -> Toggle RGB From f2690997f78d5404940196f4ebe839c9298199f4 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 19:36:11 -0400 Subject: [PATCH 15/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 24efa9bd056f..f634f268f10a 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -13,7 +13,7 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Layout :![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) -- Rotary +Rotary: - Default: Volume Up/Down - Shift: Mouse Wheel Down/Up - Ctrl: Page Down/Up @@ -24,7 +24,7 @@ Top/Default Layer: - Right Alt -> Delete (Right of Spacebar) - All other keys defaults. -- Fn Layer: +Fn Layer: - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in. - Fn + Backspace -> Insert - Fn + Print -> Pause/Break @@ -51,8 +51,8 @@ Top/Default Layer: - Fn + a,d -> Cycle Forward/Backward through rgb effects - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) - - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT to Slow down) - - Fn + ~, 0-9 and - and = keys -> 13 RGB different effects arranged to my liking.. Fn-1 is my favorite. + - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT for slower) + - Fn + ~, 0-9, - = keys (2nd row keys) -> 13 RGB different effects arranged to my liking. Fn-1 is my favorite. - Fn + L -> My easter egg... "QMK rocks!" - Known issues: From eaa505d187a71de34e73f97d80480c9e6a5884f0 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 19:40:34 -0400 Subject: [PATCH 16/26] Update readme.md --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index f634f268f10a..dab27e3cd1f6 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -1,9 +1,8 @@ # Glorious GMMK Pro / ANSI - Enhanced Keyboard -Tried to incorporate full featured GMMK Pro keyboard functionality without adding too many functions. Included Scroll Lock and Caps LEDs. NKRO On by default. -Allow holding the Shift and Ctrl keys to scroll on the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications -Trimmed down the amazing 41 current RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. -Features are as follows: +Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO is on by default. +SHIFT and Ctrl keys for scrolling with the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications +Trimmed down the amazing 41 currently built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper and the entire discord community. @@ -13,6 +12,8 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Layout :![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) +Features are as follows: + Rotary: - Default: Volume Up/Down - Shift: Mouse Wheel Down/Up From 786c92688d6dcf7439e9c13def7088bc7bfd7e51 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 20:05:44 -0400 Subject: [PATCH 17/26] Update keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index c4cefbcfab44..fd77455be362 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -1,6 +1,4 @@ -/* StickAndGum github. */ - -/* Copyright 2021 +/* Copyright 2021 stickandgum * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 1fc39a3b59754a6bde82c1eb6b210ceb704a3a7b Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 20:06:26 -0400 Subject: [PATCH 18/26] Update keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index dab27e3cd1f6..7eb21d05e5a3 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -10,7 +10,8 @@ BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @dr * Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) * Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) -* Layout :![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) +* Layout: + ![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) Features are as follows: From 5d46a50487360b0e57e73f05b80b18d25770704b Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 20:15:07 -0400 Subject: [PATCH 19/26] Update keymap.c --- .../gmmk/pro/ansi/keymaps/stickandgum/keymap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c index 2c60abaf6515..762fe00df23f 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c @@ -1,4 +1,18 @@ -/* GMMK Pro - QMK Keyboard! - StickAndGum */ +/* Copyright 2021 stickandgum GMMK Pro ANSI Enhanced Keymap File + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include QMK_KEYBOARD_H @@ -283,4 +297,4 @@ static void set_rgb_scroll_leds_off() { rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME) } -#endif // RGB_MATRIX_ENABLE \ No newline at end of file +#endif // RGB_MATRIX_ENABLE From d3fe1796c2cb687af2e988ac057446aa6cb17844 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 20:26:36 -0400 Subject: [PATCH 20/26] Update keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- .../pro/ansi/keymaps/stickandgum/config.h | 54 +++++-------------- 1 file changed, 13 insertions(+), 41 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index fd77455be362..890179542043 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -29,46 +29,18 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes - // #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. - // #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. - // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! - #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). - // #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) - // #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) - // #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) - #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) - #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above - #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above - // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) - #define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow - // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right - #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom - #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. - #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. - #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right - // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. - #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard - #define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards - #define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. - #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) - #define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. - // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. - #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back - #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left - #define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right - // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! - // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue - // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades - #define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. - #define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. - #define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). - #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). + #define ENABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. + #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. + #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! + #define ENABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) + #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) + #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) + #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) + #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right + #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. + #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. + #define ENABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! + #define ENABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! + #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) #endif From f61e9d94060df078c849a095d0b535624f3275fa Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 20:40:03 -0400 Subject: [PATCH 21/26] Update config.h --- .../pro/ansi/keymaps/stickandgum/config.h | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index 890179542043..a10f884696c5 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -19,28 +19,57 @@ // I like NKRO.. force it! - You can still toggle it if you want to disable. #define FORCE_NKRO - // At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best. #ifdef RGB_MATRIX_ENABLE - // #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR - // Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state + +// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR + +// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes +// Now we need to ENABLE Modes by DEFAULT as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft #define ENABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! + // #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). #define ENABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) + // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above + // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) + // #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right + // #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. + // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. + // #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. + // #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard + // #define ENABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards + // #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. + // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) + // #define ENABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. + // #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back + // #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left + // #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right #define ENABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! #define ENABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades + // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades + // #define ENABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. + // #define ENABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. + // #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). + // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). #endif - From a8946c9de290085f32c798018ff91d90c5e0e657 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 21:42:18 -0400 Subject: [PATCH 22/26] Update config.h --- .../pro/ansi/keymaps/stickandgum/config.h | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index a10f884696c5..7d644451c3eb 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -30,46 +30,46 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes -// Now we need to ENABLE Modes by DEFAULT as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft - #define ENABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. - #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. - #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! - // #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). - #define ENABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) - #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) - #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) - // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) - // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above - // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above - #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) - // #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow - #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right - // #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom - // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. - // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. - // #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right - #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. - // #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard - // #define ENABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards - // #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. - // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) - // #define ENABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. - #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. - // #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back - // #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left - // #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right - #define ENABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! - #define ENABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades - // #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades - // #define ENABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. - // #define ENABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. - // #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). - // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). +// Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft + // #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. + // #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. + // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! + #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). + // #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) + // #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) + // #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) + #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) + #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above + #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above + // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) + #define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow + // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right + #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom + #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. + #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. + #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right + // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. + #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard + #define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards + #define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. + #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) + #define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. + // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. + #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back + #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left + #define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right + // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! + // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue + // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades + #define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. + #define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. + #define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). + #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). #endif From b5aee9cdf58305fe2e343e5cfe85a5ea84d45c47 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 22:17:02 -0400 Subject: [PATCH 23/26] Update config.h No, you're absolutely right - I was being selfish thinking only of modern PCs. This is about the community and may be used on an untold number of devices. Disabled is more appropriate. --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index 7d644451c3eb..cb48dfe8ed4b 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -16,8 +16,8 @@ #pragma once -// I like NKRO.. force it! - You can still toggle it if you want to disable. -#define FORCE_NKRO +// I like NKRO.. but let's not force it. @drashna pointed out some older hardware has issues - Toggle it via keycode if you like. +// #define FORCE_NKRO // At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best. #ifdef RGB_MATRIX_ENABLE From 06da7f25977959bb021f8b7f5a10dc657ed1cc6b Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 22:19:48 -0400 Subject: [PATCH 24/26] Update readme.md removed NKRO Enabled by default. --- keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 7eb21d05e5a3..a3ee419683c8 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -1,6 +1,6 @@ # Glorious GMMK Pro / ANSI - Enhanced Keyboard -Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO is on by default. +Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO can be toggled (Fn + N). SHIFT and Ctrl keys for scrolling with the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications Trimmed down the amazing 41 currently built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. @@ -33,7 +33,7 @@ Fn Layer: - Fn + Home -> Scroll Lock (Lights up white!) - Fn + Del (right of space) -> Right-Alt key. - Fn + RCtrl (right of Fn) -> Menu/App key. - - Fn + N -> Toggle NKRO (Defaults to Enabled) + - Fn + N -> Toggle NKRO - Fn + End -> Power Off Computer - Fn + F12 -> Suspend Computer - Fn + F11 -> Wake Computer (Necessary on MAC OS?) From 16f51c2f065aea328107148d6d486bff22cada54 Mon Sep 17 00:00:00 2001 From: stickandgum Date: Sun, 22 Aug 2021 23:19:43 -0400 Subject: [PATCH 25/26] Changed NKRO, minor other edits. --- .../gmmk/pro/ansi/keymaps/stickandgum/readme.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index a3ee419683c8..29179d8f8495 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -1,10 +1,9 @@ # Glorious GMMK Pro / ANSI - Enhanced Keyboard Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO can be toggled (Fn + N). -SHIFT and Ctrl keys for scrolling with the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications -Trimmed down the amazing 41 currently built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. +SHIFT and Ctrl keys for scrolling with the rotary, Fn-keys also used for screen brightness, media, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications. Trimmed down the amazing (currently 41) built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. -BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper and the entire discord community. +BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper, @noroadsleft and the entire discord community. * Keymap Creator: [StickAndGum](https://github.com/StickAndGum) * Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) @@ -38,14 +37,14 @@ Fn Layer: - Fn + F12 -> Suspend Computer - Fn + F11 -> Wake Computer (Necessary on MAC OS?) - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down - - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser Home. + - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser. - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively. - RGB Information: - - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate) + - Toggle for RGB via Fn-r (CAPS & ScrlLock still Light/Indicate) - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators - - Scroll: Fn-Home (Under Rotary) white indicator. - - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT IMHO) + - Scroll-Lock: Fn-Home (Under Rotary) white indicator. + - Modifiers identified around most of the edge of keyboard / Side lights also accented (Fn-1 looks GREAT IMHO) - RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. - Fn + r -> Toggle RGB From 588341edabe852ef087af273a3facbf03a8731eb Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 22 Aug 2021 21:01:49 -0700 Subject: [PATCH 26/26] fix line endings --- .../pro/ansi/keymaps/stickandgum/config.h | 150 +++++++++--------- .../pro/ansi/keymaps/stickandgum/readme.md | 126 +++++++-------- .../pro/ansi/keymaps/stickandgum/rules.mk | 4 +- 3 files changed, 140 insertions(+), 140 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index cb48dfe8ed4b..2566fc6f9cb0 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h @@ -1,75 +1,75 @@ -/* Copyright 2021 stickandgum - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// I like NKRO.. but let's not force it. @drashna pointed out some older hardware has issues - Toggle it via keycode if you like. -// #define FORCE_NKRO - -// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best. -#ifdef RGB_MATRIX_ENABLE - -// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR - -// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state - #define RGB_DISABLE_WHEN_USB_SUSPENDED - - #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain - #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes - -// Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft - // #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. - // #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. - // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! - #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). - // #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) - // #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) - // #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) - #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) - #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above - #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above - // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) - #define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow - // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right - #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom - #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. - #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. - #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right - // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. - #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard - #define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards - #define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. - #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) - #define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. - // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. - #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back - #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left - #define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right - // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! - // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue - // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades - #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades - #define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. - #define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. - #define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). - #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). -#endif +/* Copyright 2021 stickandgum + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +// I like NKRO.. but let's not force it. @drashna pointed out some older hardware has issues - Toggle it via keycode if you like. +// #define FORCE_NKRO + +// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best. +#ifdef RGB_MATRIX_ENABLE + +// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR + +// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state + #define RGB_DISABLE_WHEN_USB_SUSPENDED + + #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain + #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes + +// Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft + // #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color. + // #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard. + // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow! + #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho). + // #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!) + // #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white) + // #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black) + #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL) + #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above + #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above + // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black) + #define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow + // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right + #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom + #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center. + #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points. + #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right + // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes. + #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard + #define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards + #define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above. + #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-) + #define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better. + // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above. + #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back + #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left + #define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right + // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys! + // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix! + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue + // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise) + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo. + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade. + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys) + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades + #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades + #define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black. + #define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black. + #define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead). + #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead). +#endif diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 29179d8f8495..c4e2225433ec 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md @@ -1,63 +1,63 @@ -# Glorious GMMK Pro / ANSI - Enhanced Keyboard - -Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO can be toggled (Fn + N). -SHIFT and Ctrl keys for scrolling with the rotary, Fn-keys also used for screen brightness, media, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications. Trimmed down the amazing (currently 41) built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. - -BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper, @noroadsleft and the entire discord community. - -* Keymap Creator: [StickAndGum](https://github.com/StickAndGum) -* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) -* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) - -* Layout: - ![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) - -Features are as follows: - -Rotary: - - Default: Volume Up/Down - - Shift: Mouse Wheel Down/Up - - Ctrl: Page Down/Up - -Top/Default Layer: - - Print Screen -> Print Screen (Left of rotary) - - Delete -> Home (Under Rotary) - - Right Alt -> Delete (Right of Spacebar) - - All other keys defaults. - -Fn Layer: - - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in. - - Fn + Backspace -> Insert - - Fn + Print -> Pause/Break - - Fn + Home -> Scroll Lock (Lights up white!) - - Fn + Del (right of space) -> Right-Alt key. - - Fn + RCtrl (right of Fn) -> Menu/App key. - - Fn + N -> Toggle NKRO - - Fn + End -> Power Off Computer - - Fn + F12 -> Suspend Computer - - Fn + F11 -> Wake Computer (Necessary on MAC OS?) - - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down - - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser. - - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively. - -- RGB Information: - - Toggle for RGB via Fn-r (CAPS & ScrlLock still Light/Indicate) - - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators - - Scroll-Lock: Fn-Home (Under Rotary) white indicator. - - Modifiers identified around most of the edge of keyboard / Side lights also accented (Fn-1 looks GREAT IMHO) - -- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. - - Fn + r -> Toggle RGB - - Fn + w,s -> Brightness Up, Down - - Fn + a,d -> Cycle Forward/Backward through rgb effects - - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) - - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) - - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT for slower) - - Fn + ~, 0-9, - = keys (2nd row keys) -> 13 RGB different effects arranged to my liking. Fn-1 is my favorite. - - Fn + L -> My easter egg... "QMK rocks!" - -- Known issues: - - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't and the Caps/Scroll lights don't turn off properly when using. Just change the effect to something else to fix this. - - If you find a fix for this, please let me know. - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). +# Glorious GMMK Pro / ANSI - Enhanced Keyboard + +Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO can be toggled (Fn + N). +SHIFT and Ctrl keys for scrolling with the rotary, Fn-keys also used for screen brightness, media, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications. Trimmed down the amazing (currently 41) built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive. + +BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper, @noroadsleft and the entire discord community. + +* Keymap Creator: [StickAndGum](https://github.com/StickAndGum) +* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black) +* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html) + +* Layout: + ![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png) + +Features are as follows: + +Rotary: + - Default: Volume Up/Down + - Shift: Mouse Wheel Down/Up + - Ctrl: Page Down/Up + +Top/Default Layer: + - Print Screen -> Print Screen (Left of rotary) + - Delete -> Home (Under Rotary) + - Right Alt -> Delete (Right of Spacebar) + - All other keys defaults. + +Fn Layer: + - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in. + - Fn + Backspace -> Insert + - Fn + Print -> Pause/Break + - Fn + Home -> Scroll Lock (Lights up white!) + - Fn + Del (right of space) -> Right-Alt key. + - Fn + RCtrl (right of Fn) -> Menu/App key. + - Fn + N -> Toggle NKRO + - Fn + End -> Power Off Computer + - Fn + F12 -> Suspend Computer + - Fn + F11 -> Wake Computer (Necessary on MAC OS?) + - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down + - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser. + - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively. + +- RGB Information: + - Toggle for RGB via Fn-r (CAPS & ScrlLock still Light/Indicate) + - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators + - Scroll-Lock: Fn-Home (Under Rotary) white indicator. + - Modifiers identified around most of the edge of keyboard / Side lights also accented (Fn-1 looks GREAT IMHO) + +- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember. + - Fn + r -> Toggle RGB + - Fn + w,s -> Brightness Up, Down + - Fn + a,d -> Cycle Forward/Backward through rgb effects + - Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower) + - Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower) + - Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT for slower) + - Fn + ~, 0-9, - = keys (2nd row keys) -> 13 RGB different effects arranged to my liking. Fn-1 is my favorite. + - Fn + L -> My easter egg... "QMK rocks!" + +- Known issues: + - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't and the Caps/Scroll lights don't turn off properly when using. Just change the effect to something else to fix this. + - If you find a fix for this, please let me know. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk index 640ec44b2eaa..6440dc6d4123 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk @@ -1,2 +1,2 @@ -CONSOLE_ENABLE = no -MOUSEKEY_ENABLE = yes +CONSOLE_ENABLE = no +MOUSEKEY_ENABLE = yes