Fixup line endings.

author: Nick Brassel <nick@tzarc.org> 2021-08-23 19:37:16 +1000
committer: Nick Brassel <nick@tzarc.org> 2021-08-23 19:37:16 +1000
commit: d8778eba922f3415acb40dd178dd821b05bdb654 (patch)
tree: eb7a6a857607313aee1c57f5d696b56d200c352b
parent: 71df135254709c183b980b89554216ec86d02eab (diff)
download: qmk_firmware-d8778eba922f3415acb40dd178dd821b05bdb654.tar.gz
qmk_firmware-d8778eba922f3415acb40dd178dd821b05bdb654.zip
2 files changed, 139 insertions, 139 deletions
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h
index cb48dfe8e..2566fc6f9 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
+/* Copyright 2021 stickandgum
- *
+ *
- * This program is free software: you can redistribute it and/or modify
+ * 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
+ * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- *
+ *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU General Public License for more details.
- *
+ *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+ */
-#pragma once
+#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.
+// 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
+// #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.
+// 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
+#ifdef RGB_MATRIX_ENABLE
-// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+// #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
+// 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_DISABLE_WHEN_USB_SUSPENDED
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
-    #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes
+    #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
+// 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_SOLID_COLOR               // BUILT IN (MAPPED!) Static single color.
-    //    #define DISABLE_RGB_MATRIX_ALPHAS_MODS               // Accenting various keys on the keyboard.
+    //    #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_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_GRADIENT_LEFT_RIGHT       // Left Right Rainbow (the top-down is better imho).
-    //    #define DISABLE_RGB_MATRIX_BREATHING                 // Built in (MAPPED!)
+    //    #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_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_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_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_PINWHEEL_VAL         // See above
-     #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // 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_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_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_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_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              // 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_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_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_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_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_DUAL_BEACON               // Two rainbows spinning around keyboards
-     #define DISABLE_RGB_MATRIX_RAINBOW_BEACON            // Similar to above.
+     #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_RAINBOW_PINWHEELS         // Enough of the spinning rainbows - we get it! :-)
-     #define DISABLE_RGB_MATRIX_RAINDROPS                 // Jellybeans are better.
+     #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_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_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_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_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_TYPING_HEATMAP            // Hot keys!
-    //    #define DISABLE_RGB_MATRIX_DIGITAL_RAIN              // The Matrix!
+    //    #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_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            // 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_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_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_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_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_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_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_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_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_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 DISABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead).
-#endif
+#endif
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md
index 7eb21d05e..4e6628c91 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md
+++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md
@@ -1,64 +1,64 @@
-# Glorious GMMK Pro / ANSI - Enhanced Keyboard
+# 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 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
+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.
+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.
+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)
+* Keymap Creator: [StickAndGum](https://github.com/StickAndGum)
-* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black)
+* 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)
+* 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)
+  ![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png)
-Features are as follows:
+Features are as follows:
-Rotary:
+Rotary:
-  - Default:  Volume Up/Down
+  - Default:  Volume Up/Down
-  - Shift:    Mouse Wheel Down/Up
+  - Shift:    Mouse Wheel Down/Up
-  - Ctrl:     Page Down/Up
+  - Ctrl:     Page Down/Up
-Top/Default Layer:
+Top/Default Layer:
-  - Print Screen -> Print Screen (Left of rotary)
+  - Print Screen -> Print Screen (Left of rotary)
-  - Delete -> Home (Under Rotary)
+  - Delete -> Home (Under Rotary)
-  - Right Alt -> Delete (Right of Spacebar)
+  - Right Alt -> Delete (Right of Spacebar)
-  - All other keys defaults.
+  - 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 + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in.
-  - Fn + Backspace -> Insert
+  - Fn + Backspace -> Insert
-  - Fn + Print  -> Pause/Break
+  - Fn + Print  -> Pause/Break
-  - Fn + Home -> Scroll Lock (Lights up white!)
+  - Fn + Home -> Scroll Lock (Lights up white!)
-  - Fn + Del (right of space) -> Right-Alt key.
+  - Fn + Del (right of space) -> Right-Alt key.
-  - Fn + RCtrl (right of Fn) -> Menu/App key.
+  - Fn + RCtrl (right of Fn) -> Menu/App key.
-  - Fn + N -> Toggle NKRO (Defaults to Enabled)
+  - Fn + N -> Toggle NKRO (Defaults to Enabled)
-  - Fn + End -> Power Off Computer
+  - Fn + End -> Power Off Computer
-  - Fn + F12 -> Suspend Computer
+  - Fn + F12 -> Suspend Computer
-  - Fn + F11 -> Wake Computer (Necessary on MAC OS?)
+  - Fn + F11 -> Wake Computer (Necessary on MAC OS?)
-  - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down
+  - 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 Home.
-  - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively.
+  - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively.
- RGB Information:
+- RGB Information:
-  - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate)
+  - Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate)
-  - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators
+  - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators
-  - Scroll: Fn-Home (Under Rotary) white indicator.
+  - Scroll: Fn-Home (Under Rotary) white indicator.
-  - Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT IMHO)
+  - 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.
+- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember.
-  - Fn + r -> Toggle RGB
+  - Fn + r -> Toggle RGB
-  - Fn + w,s -> Brightness Up, Down
+  - Fn + w,s -> Brightness Up, Down
-  - Fn + a,d -> Cycle Forward/Backward through rgb effects
+  - Fn + a,d -> Cycle Forward/Backward through rgb effects
-  - Fn + q   -> Increase or Decrease Saturation (use SHIFT key to lower)
+  - Fn + q   -> Increase or Decrease Saturation (use SHIFT key to lower)
-  - Fn + e   -> Increase or Decrease Hue/Color (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 + 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 + ~, 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!"
+  - Fn + L -> My easter egg... "QMK rocks!"
-  
+  
- Known issues:
+- 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. 
+  - 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.
+    - 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).
+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).
author	Nick Brassel <nick@tzarc.org>	2021-08-23 19:37:16 +1000
committer	Nick Brassel <nick@tzarc.org>	2021-08-23 19:37:16 +1000
commit	d8778eba922f3415acb40dd178dd821b05bdb654 (patch)
tree	eb7a6a857607313aee1c57f5d696b56d200c352b
parent	71df135254709c183b980b89554216ec86d02eab (diff)
download	qmk_firmware-d8778eba922f3415acb40dd178dd821b05bdb654.tar.gz qmk_firmware-d8778eba922f3415acb40dd178dd821b05bdb654.zip

diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h index cb48dfe8e..2566fc6f9 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h
@@ -1,75 +1,75 @@
1	/* Copyright 2021 stickandgum	1	/* Copyright 2021 stickandgum
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16		16
17	#pragma once	17	#pragma once
18		18
19	// I like NKRO.. but let's not force it. @drashna pointed out some older hardware has issues - Toggle it via keycode if you like.	19	// I like NKRO.. but let's not force it. @drashna pointed out some older hardware has issues - Toggle it via keycode if you like.
20	// #define FORCE_NKRO	20	// #define FORCE_NKRO
21		21
22	// 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.	22	// 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.
23	#ifdef RGB_MATRIX_ENABLE	23	#ifdef RGB_MATRIX_ENABLE
24		24
25	// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR	25	// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
26		26
27	// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state	27	// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
28	#define RGB_DISABLE_WHEN_USB_SUSPENDED	28	#define RGB_DISABLE_WHEN_USB_SUSPENDED
29		29
30	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain	30	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
31	#define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes	31	#define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes
32		32
33	// Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft	33	// Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft
34	// #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color.	34	// #define DISABLE_RGB_MATRIX_SOLID_COLOR // BUILT IN (MAPPED!) Static single color.
35	// #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard.	35	// #define DISABLE_RGB_MATRIX_ALPHAS_MODS // Accenting various keys on the keyboard.
36	// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow!	36	// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Top down rainbow!
37	#define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho).	37	#define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Left Right Rainbow (the top-down is better imho).
38	// #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!)	38	// #define DISABLE_RGB_MATRIX_BREATHING // Built in (MAPPED!)
39	// #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white)	39	// #define DISABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right (with white)
40	// #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black)	40	// #define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right (with black)
41	#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL)	41	#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL)
42	#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above	42	#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // See above
43	#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above	43	#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT // See above
44	// #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black)	44	// #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness (with black)
45	#define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow	45	#define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard cycling through rainbow
46	// #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right	46	// #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // BUILT IN (MAPPED!) Full Rainbow Left to Right
47	#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom	47	#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
48	#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center.	48	#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Rainbow circles coming to center.
49	#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points.	49	#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Two Rainbow circles coming to 1/3 and 2/3 points.
50	#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right	50	#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
51	// #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes.	51	// #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes.
52	#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard	52	#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
53	#define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards	53	#define DISABLE_RGB_MATRIX_DUAL_BEACON // Two rainbows spinning around keyboards
54	#define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above.	54	#define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Similar to above.
55	#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-)	55	#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enough of the spinning rainbows - we get it! :-)
56	#define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better.	56	#define DISABLE_RGB_MATRIX_RAINDROPS // Jellybeans are better.
57	// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above.	57	// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - better than above.
58	#define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back	58	#define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back
59	#define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left	59	#define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left
60	#define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right	60	#define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
61	// #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys!	61	// #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // Hot keys!
62	// #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix!	62	// #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // The Matrix!
63	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo	63	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Key hits shown in current hue - all other keys black: wide slightly better imo
64	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue	64	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Key hits shown in current hue - all other keys shifted hue
65	// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise)	65	// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse around a single key hit then fades value out (black otherwise)
66	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo.	66	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // same as above but a bit too intense imo.
67	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade.	67	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Column and Row single color fade.
68	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys)	68	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Column and Row single color fade. (Multi-keys)
69	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades	69	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of key hit then fades
70	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades	70	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multi-key hit then fades
71	#define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black.	71	#define DISABLE_RGB_MATRIX_SPLASH // Full rainbow pulses from key hit. All else black.
72	#define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black.	72	#define DISABLE_RGB_MATRIX_MULTISPLASH // Full rainbow pulses from multi-keys. All else black.
73	#define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead).	73	#define DISABLE_RGB_MATRIX_SOLID_SPLASH // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead).
74	#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead).	74	#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead).
75	#endif	75	#endif


diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md index 7eb21d05e..4e6628c91 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md
@@ -1,64 +1,64 @@
1	# Glorious GMMK Pro / ANSI - Enhanced Keyboard	1	# Glorious GMMK Pro / ANSI - Enhanced Keyboard
2		2
3	Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO is on by default.	3	Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO is on by default.
4	SHIFT and Ctrl keys for scrolling with the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications	4	SHIFT and Ctrl keys for scrolling with the rotary, Added Fn-keys for Screen Brightness, NKRO, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications
5	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.	5	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.
6		6
7	BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper and the entire discord community.	7	BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper and the entire discord community.
8		8
9	* Keymap Creator: [StickAndGum](https://github.com/StickAndGum)	9	* Keymap Creator: [StickAndGum](https://github.com/StickAndGum)
10	* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black)	10	* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black)
11	* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html)	11	* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html)
12		12
13	* Layout:	13	* Layout:
14	![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png)	14	![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png)
15		15
16	Features are as follows:	16	Features are as follows:
17		17
18	Rotary:	18	Rotary:
19	- Default: Volume Up/Down	19	- Default: Volume Up/Down
20	- Shift: Mouse Wheel Down/Up	20	- Shift: Mouse Wheel Down/Up
21	- Ctrl: Page Down/Up	21	- Ctrl: Page Down/Up
22		22
23	Top/Default Layer:	23	Top/Default Layer:
24	- Print Screen -> Print Screen (Left of rotary)	24	- Print Screen -> Print Screen (Left of rotary)
25	- Delete -> Home (Under Rotary)	25	- Delete -> Home (Under Rotary)
26	- Right Alt -> Delete (Right of Spacebar)	26	- Right Alt -> Delete (Right of Spacebar)
27	- All other keys defaults.	27	- All other keys defaults.
28		28
29	Fn Layer:	29	Fn Layer:
30	- Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in.	30	- Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in.
31	- Fn + Backspace -> Insert	31	- Fn + Backspace -> Insert
32	- Fn + Print -> Pause/Break	32	- Fn + Print -> Pause/Break
33	- Fn + Home -> Scroll Lock (Lights up white!)	33	- Fn + Home -> Scroll Lock (Lights up white!)
34	- Fn + Del (right of space) -> Right-Alt key.	34	- Fn + Del (right of space) -> Right-Alt key.
35	- Fn + RCtrl (right of Fn) -> Menu/App key.	35	- Fn + RCtrl (right of Fn) -> Menu/App key.
36	- Fn + N -> Toggle NKRO (Defaults to Enabled)	36	- Fn + N -> Toggle NKRO (Defaults to Enabled)
37	- Fn + End -> Power Off Computer	37	- Fn + End -> Power Off Computer
38	- Fn + F12 -> Suspend Computer	38	- Fn + F12 -> Suspend Computer
39	- Fn + F11 -> Wake Computer (Necessary on MAC OS?)	39	- Fn + F11 -> Wake Computer (Necessary on MAC OS?)
40	- Fn + Page Up / Down -> Laptop Screen Brightness Up/Down	40	- Fn + Page Up / Down -> Laptop Screen Brightness Up/Down
41	- Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser Home.	41	- Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser Home.
42	- Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively.	42	- Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively.
43		43
44	- RGB Information:	44	- RGB Information:
45	- Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate)	45	- Toggle for RGB via Fn-r (CAPS & SCROLL still Light/Indicate)
46	- CAPS: Side Light Rainbow Indicators and Left-side RED Indicators	46	- CAPS: Side Light Rainbow Indicators and Left-side RED Indicators
47	- Scroll: Fn-Home (Under Rotary) white indicator.	47	- Scroll: Fn-Home (Under Rotary) white indicator.
48	- Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT IMHO)	48	- Modifiers identified around most of the edge of keyboard / Side lights accented (Fn-1 looks GREAT IMHO)
49		49
50	- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember.	50	- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember.
51	- Fn + r -> Toggle RGB	51	- Fn + r -> Toggle RGB
52	- Fn + w,s -> Brightness Up, Down	52	- Fn + w,s -> Brightness Up, Down
53	- Fn + a,d -> Cycle Forward/Backward through rgb effects	53	- Fn + a,d -> Cycle Forward/Backward through rgb effects
54	- Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower)	54	- Fn + q -> Increase or Decrease Saturation (use SHIFT key to lower)
55	- Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower)	55	- Fn + e -> Increase or Decrease Hue/Color (use SHIFT key to lower)
56	- Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT for slower)	56	- Fn + f -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT for slower)
57	- Fn + ~, 0-9, - = keys (2nd row keys) -> 13 RGB different effects arranged to my liking. Fn-1 is my favorite.	57	- Fn + ~, 0-9, - = keys (2nd row keys) -> 13 RGB different effects arranged to my liking. Fn-1 is my favorite.
58	- Fn + L -> My easter egg... "QMK rocks!"	58	- Fn + L -> My easter egg... "QMK rocks!"
59		59
60	- Known issues:	60	- Known issues:
61	- 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.	61	- 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.
62	- If you find a fix for this, please let me know.	62	- If you find a fix for this, please let me know.
63		63
64	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).	64	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).