[Keyboard] Code consistency updates for CRKBD (#15779)

Co-authored-by: Drashna Jaelre <drashna@live.com>
author: Albert Y <76888457+filterpaper@users.noreply.github.com> 2022-01-22 13:57:03 +0800
committer: GitHub <noreply@github.com> 2022-01-21 21:57:03 -0800
commit: 61246deec549050ae614fac007002da8e088780d (patch)
tree: 9cf8c4c1abfb150e47c2c46f606e99539e9f1050
parent: ef091d39d2ae5d6b5d90d82c87dc8135fe12f7eb (diff)
download: qmk_firmware-61246deec549050ae614fac007002da8e088780d.tar.gz
qmk_firmware-61246deec549050ae614fac007002da8e088780d.zip
5 files changed, 40 insertions, 28 deletions
diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h
index 937d67e25..8f4d73ca2 100644
--- a/keyboards/crkbd/keymaps/default/config.h
+++ b/keyboards/crkbd/keymaps/default/config.h
@@ -28,19 +28,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
-#define USE_SERIAL_PD2
+//#define TAPPING_FORCE_HOLD
+//#define TAPPING_TERM 100
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
 #ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
+    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLED_NUM 27
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_ALTERNATING
+    #define RGBLIGHT_EFFECT_TWINKLE
    #define RGBLIGHT_LIMIT_VAL 120
    #define RGBLIGHT_HUE_STEP 10
    #define RGBLIGHT_SAT_STEP 17
    #define RGBLIGHT_VAL_STEP 17
 #endif
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-\ No newline at end of file
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/default/rules.mk b/keyboards/crkbd/keymaps/default/rules.mk
index d34d066de..c14c202fa 100644
--- a/keyboards/crkbd/keymaps/default/rules.mk
+++ b/keyboards/crkbd/keymaps/default/rules.mk
@@ -1,2 +1,5 @@
-OLED_ENABLE = yes
+MOUSEKEY_ENABLE = yes    # Mouse keys
-OLED_DRIVER = SSD1306
+RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/keymaps/via/config.h b/keyboards/crkbd/keymaps/via/config.h
index fc8e7c478..806b77d01 100644
--- a/keyboards/crkbd/keymaps/via/config.h
+++ b/keyboards/crkbd/keymaps/via/config.h
@@ -25,16 +25,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 #ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
+    #define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_ANIMATIONS
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLED_NUM 54
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    undef RGBLED_SPLIT
+    #define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLED_SPLIT \
+    #define RGBLIGHT_EFFECT_KNIGHT
-        { 27, 27 }
+    #define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_HUE_STEP  10
+//  #define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_SAT_STEP  17
+//  #define RGBLIGHT_EFFECT_ALTERNATING
-#    define RGBLIGHT_VAL_STEP  17
+//  #define RGBLIGHT_EFFECT_TWINKLE
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
 #endif
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/via/rules.mk b/keyboards/crkbd/keymaps/via/rules.mk
index 69841c235..ee593dcbb 100644
--- a/keyboards/crkbd/keymaps/via/rules.mk
+++ b/keyboards/crkbd/keymaps/via/rules.mk
@@ -1,6 +1,6 @@
-MOUSEKEY_ENABLE     = no     # Mouse keys
+MOUSEKEY_ENABLE = no     # Mouse keys
-RGBLIGHT_ENABLE     = yes    # Enable WS2812 RGB underlight.
+RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
-VIA_ENABLE          = yes         # Enable VIA
+VIA_ENABLE      = yes    # Enable VIA
-OLED_ENABLE = yes
+OLED_ENABLE     = yes
-OLED_DRIVER = SSD1306
+OLED_DRIVER     = SSD1306
-LTO_ENABLE          = yes
+LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 337859d05..9f196a716 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN      D3
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 12 // Number of LEDs
+#    define RGBLED_NUM 54 // Number of LEDs
 #    define RGBLED_SPLIT \
-        { 6, 6 }
+        { 27, 27 }
 #    define RGBLIGHT_SPLIT
 #endif
author	Albert Y <76888457+filterpaper@users.noreply.github.com>	2022-01-22 13:57:03 +0800
committer	GitHub <noreply@github.com>	2022-01-21 21:57:03 -0800
commit	61246deec549050ae614fac007002da8e088780d (patch)
tree	9cf8c4c1abfb150e47c2c46f606e99539e9f1050
parent	ef091d39d2ae5d6b5d90d82c87dc8135fe12f7eb (diff)
download	qmk_firmware-61246deec549050ae614fac007002da8e088780d.tar.gz qmk_firmware-61246deec549050ae614fac007002da8e088780d.zip

diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h index 937d67e25..8f4d73ca2 100644 --- a/keyboards/crkbd/keymaps/default/config.h +++ b/keyboards/crkbd/keymaps/default/config.h
@@ -28,19 +28,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28	// #define MASTER_RIGHT	28	// #define MASTER_RIGHT
29	// #define EE_HANDS	29	// #define EE_HANDS
30		30
31	#define USE_SERIAL_PD2	31	//#define TAPPING_FORCE_HOLD
32		32	//#define TAPPING_TERM 100
33	#define TAPPING_FORCE_HOLD
34	#define TAPPING_TERM 100
35		33
36	#ifdef RGBLIGHT_ENABLE	34	#ifdef RGBLIGHT_ENABLE
37	#undef RGBLED_NUM	35	#define RGBLIGHT_EFFECT_BREATHING
38	#define RGBLIGHT_ANIMATIONS	36	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
39	#define RGBLED_NUM 27	37	#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
		38	#define RGBLIGHT_EFFECT_SNAKE
		39	#define RGBLIGHT_EFFECT_KNIGHT
		40	#define RGBLIGHT_EFFECT_CHRISTMAS
		41	#define RGBLIGHT_EFFECT_STATIC_GRADIENT
		42	#define RGBLIGHT_EFFECT_RGB_TEST
		43	#define RGBLIGHT_EFFECT_ALTERNATING
		44	#define RGBLIGHT_EFFECT_TWINKLE
40	#define RGBLIGHT_LIMIT_VAL 120	45	#define RGBLIGHT_LIMIT_VAL 120
41	#define RGBLIGHT_HUE_STEP 10	46	#define RGBLIGHT_HUE_STEP 10
42	#define RGBLIGHT_SAT_STEP 17	47	#define RGBLIGHT_SAT_STEP 17
43	#define RGBLIGHT_VAL_STEP 17	48	#define RGBLIGHT_VAL_STEP 17
44	#endif	49	#endif
45		50
46	#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" \ No newline at end of file	51	#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"


diff --git a/keyboards/crkbd/keymaps/default/rules.mk b/keyboards/crkbd/keymaps/default/rules.mk index d34d066de..c14c202fa 100644 --- a/keyboards/crkbd/keymaps/default/rules.mk +++ b/keyboards/crkbd/keymaps/default/rules.mk
@@ -1,2 +1,5 @@
1	OLED_ENABLE = yes	1	MOUSEKEY_ENABLE = yes # Mouse keys
2	OLED_DRIVER = SSD1306	2	RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
		3	OLED_ENABLE = yes
		4	OLED_DRIVER = SSD1306
		5	LTO_ENABLE = yes


diff --git a/keyboards/crkbd/keymaps/via/config.h b/keyboards/crkbd/keymaps/via/config.h index fc8e7c478..806b77d01 100644 --- a/keyboards/crkbd/keymaps/via/config.h +++ b/keyboards/crkbd/keymaps/via/config.h
@@ -25,16 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25	// #define EE_HANDS	25	// #define EE_HANDS
26		26
27	#ifdef RGBLIGHT_ENABLE	27	#ifdef RGBLIGHT_ENABLE
28	# undef RGBLED_NUM	28	#define RGBLIGHT_EFFECT_BREATHING
29	# define RGBLIGHT_ANIMATIONS	29	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
30	# define RGBLED_NUM 54	30	#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
31	# undef RGBLED_SPLIT	31	#define RGBLIGHT_EFFECT_SNAKE
32	# define RGBLED_SPLIT \	32	#define RGBLIGHT_EFFECT_KNIGHT
33	{ 27, 27 }	33	#define RGBLIGHT_EFFECT_CHRISTMAS
34	# define RGBLIGHT_LIMIT_VAL 120	34	#define RGBLIGHT_EFFECT_STATIC_GRADIENT
35	# define RGBLIGHT_HUE_STEP 10	35	// #define RGBLIGHT_EFFECT_RGB_TEST
36	# define RGBLIGHT_SAT_STEP 17	36	// #define RGBLIGHT_EFFECT_ALTERNATING
37	# define RGBLIGHT_VAL_STEP 17	37	// #define RGBLIGHT_EFFECT_TWINKLE
		38	#define RGBLIGHT_LIMIT_VAL 120
		39	#define RGBLIGHT_HUE_STEP 10
		40	#define RGBLIGHT_SAT_STEP 17
		41	#define RGBLIGHT_VAL_STEP 17
38	#endif	42	#endif
39		43
40	#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"	44	#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"


diff --git a/keyboards/crkbd/keymaps/via/rules.mk b/keyboards/crkbd/keymaps/via/rules.mk index 69841c235..ee593dcbb 100644 --- a/keyboards/crkbd/keymaps/via/rules.mk +++ b/keyboards/crkbd/keymaps/via/rules.mk
@@ -1,6 +1,6 @@
1	MOUSEKEY_ENABLE = no # Mouse keys	1	MOUSEKEY_ENABLE = no # Mouse keys
2	RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.	2	RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
3	VIA_ENABLE = yes # Enable VIA	3	VIA_ENABLE = yes # Enable VIA
4	OLED_ENABLE = yes	4	OLED_ENABLE = yes
5	OLED_DRIVER = SSD1306	5	OLED_DRIVER = SSD1306
6	LTO_ENABLE = yes	6	LTO_ENABLE = yes


diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index 337859d05..9f196a716 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h
@@ -25,9 +25,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25	#define RGB_DI_PIN D3	25	#define RGB_DI_PIN D3
26		26
27	#ifdef RGBLIGHT_ENABLE	27	#ifdef RGBLIGHT_ENABLE
28	# define RGBLED_NUM 12 // Number of LEDs	28	# define RGBLED_NUM 54 // Number of LEDs
29	# define RGBLED_SPLIT \	29	# define RGBLED_SPLIT \
30	{ 6, 6 }	30	{ 27, 27 }
31	# define RGBLIGHT_SPLIT	31	# define RGBLIGHT_SPLIT
32	#endif	32	#endif
33		33