aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/clueboard/keymaps/default/keymap.c72
-rw-r--r--keyboards/clueboard/keymaps/max/keymap.c66
-rw-r--r--keyboards/cluepad/keymaps/default/keymap.c67
-rw-r--r--keyboards/kc60/keymaps/stanleylai/keymap.c67
-rw-r--r--keyboards/kc60/keymaps/ws2812/keymap.c65
-rw-r--r--keyboards/phantom/keymaps/default/keymap.c69
-rw-r--r--keyboards/planck/keymaps/yang/keymap.c62
-rw-r--r--keyboards/satan/keymaps/default/keymap.c68
-rw-r--r--keyboards/satan/keymaps/sethbc/keymap.c73
-rw-r--r--quantum/keymap.h10
-rw-r--r--quantum/quantum.c50
11 files changed, 83 insertions, 586 deletions
diff --git a/keyboards/clueboard/keymaps/default/keymap.c b/keyboards/clueboard/keymaps/default/keymap.c
index 89f71e83a..896bc7ebc 100644
--- a/keyboards/clueboard/keymaps/default/keymap.c
+++ b/keyboards/clueboard/keymaps/default/keymap.c
@@ -67,11 +67,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 */ 67 */
68[_RS] = KEYMAP( 68[_RS] = KEYMAP(
69 #ifdef RGBLIGHT_ENABLE 69 #ifdef RGBLIGHT_ENABLE
70 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(1), F(7), \ 70 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, \
71 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(8), \ 71 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, \
72 KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 72 KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
73 MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), F(5), \ 73 MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), RGB_SAI, \
74 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, F(2), F(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(4), F(6), F(3)), 74 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI),
75 #else 75 #else
76 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 76 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
77 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 77 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
@@ -83,30 +83,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
83 83
84enum function_id { 84enum function_id {
85 SHIFT_ESC, 85 SHIFT_ESC,
86 #ifdef RGBLIGHT_ENABLE
87 RGBLED_TOGGLE,
88 RGBLED_STEP_MODE,
89 RGBLED_INCREASE_HUE,
90 RGBLED_DECREASE_HUE,
91 RGBLED_INCREASE_SAT,
92 RGBLED_DECREASE_SAT,
93 RGBLED_INCREASE_VAL,
94 RGBLED_DECREASE_VAL
95 #endif
96}; 86};
97 87
98const uint16_t PROGMEM fn_actions[] = { 88const uint16_t PROGMEM fn_actions[] = {
99 [0] = ACTION_FUNCTION(SHIFT_ESC), 89 [0] = ACTION_FUNCTION(SHIFT_ESC),
100 #ifdef RGBLIGHT_ENABLE
101 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
102 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
103 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
104 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
105 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
106 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
107 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
108 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
109 #endif
110}; 90};
111 91
112void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 92void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
@@ -132,49 +112,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
132 } 112 }
133 } 113 }
134 break; 114 break;
135 //led operations
136 #ifdef RGBLIGHT_ENABLE
137 case RGBLED_TOGGLE:
138 if (record->event.pressed) {
139 rgblight_toggle();
140 }
141
142 break;
143 case RGBLED_INCREASE_HUE:
144 if (record->event.pressed) {
145 rgblight_increase_hue();
146 }
147 break;
148 case RGBLED_DECREASE_HUE:
149 if (record->event.pressed) {
150 rgblight_decrease_hue();
151 }
152 break;
153 case RGBLED_INCREASE_SAT:
154 if (record->event.pressed) {
155 rgblight_increase_sat();
156 }
157 break;
158 case RGBLED_DECREASE_SAT:
159 if (record->event.pressed) {
160 rgblight_decrease_sat();
161 }
162 break;
163 case RGBLED_INCREASE_VAL:
164 if (record->event.pressed) {
165 rgblight_increase_val();
166 }
167 break;
168 case RGBLED_DECREASE_VAL:
169 if (record->event.pressed) {
170 rgblight_decrease_val();
171 }
172 break;
173 case RGBLED_STEP_MODE:
174 if (record->event.pressed) {
175 rgblight_step();
176 }
177 break;
178 #endif
179 } 115 }
180} 116}
diff --git a/keyboards/clueboard/keymaps/max/keymap.c b/keyboards/clueboard/keymaps/max/keymap.c
index 82c93401d..080b4930b 100644
--- a/keyboards/clueboard/keymaps/max/keymap.c
+++ b/keyboards/clueboard/keymaps/max/keymap.c
@@ -66,78 +66,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 * `----------------------------------------------------------------------------------' 66 * `----------------------------------------------------------------------------------'
67 */ 67 */
68[_RS] = KEYMAP( 68[_RS] = KEYMAP(
69 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(0), F(6), \ 69 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, \
70 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(7), \ 70 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, \
71 KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 71 KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
72 MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), F(4), \ 72 MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), RGB_SAI, \
73 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, F(1), F(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, F(3), F(5), F(2)), 73 KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI),
74}; 74};
75 75
76enum function_id { 76enum function_id {
77 RGBLED_TOGGLE,
78 RGBLED_STEP_MODE,
79 RGBLED_INCREASE_HUE,
80 RGBLED_DECREASE_HUE,
81 RGBLED_INCREASE_SAT,
82 RGBLED_DECREASE_SAT,
83 RGBLED_INCREASE_VAL,
84 RGBLED_DECREASE_VAL,
85}; 77};
86 78
87const uint16_t PROGMEM fn_actions[] = { 79const uint16_t PROGMEM fn_actions[] = {
88 [0] = ACTION_FUNCTION(RGBLED_TOGGLE),
89 [1] = ACTION_FUNCTION(RGBLED_STEP_MODE),
90 [2] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
91 [3] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
92 [4] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
93 [5] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
94 [6] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
95 [7] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
96}; 80};
97 81
98void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 82void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
99 switch (id) { 83 switch (id) {
100 case RGBLED_TOGGLE:
101 //led operations
102 if (record->event.pressed) {
103 rgblight_toggle();
104 }
105
106 break;
107 case RGBLED_INCREASE_HUE:
108 if (record->event.pressed) {
109 rgblight_increase_hue();
110 }
111 break;
112 case RGBLED_DECREASE_HUE:
113 if (record->event.pressed) {
114 rgblight_decrease_hue();
115 }
116 break;
117 case RGBLED_INCREASE_SAT:
118 if (record->event.pressed) {
119 rgblight_increase_sat();
120 }
121 break;
122 case RGBLED_DECREASE_SAT:
123 if (record->event.pressed) {
124 rgblight_decrease_sat();
125 }
126 break;
127 case RGBLED_INCREASE_VAL:
128 if (record->event.pressed) {
129 rgblight_increase_val();
130 }
131 break;
132 case RGBLED_DECREASE_VAL:
133 if (record->event.pressed) {
134 rgblight_decrease_val();
135 }
136 break;
137 case RGBLED_STEP_MODE:
138 if (record->event.pressed) {
139 rgblight_step();
140 }
141 break;
142 } 84 }
143} 85}
diff --git a/keyboards/cluepad/keymaps/default/keymap.c b/keyboards/cluepad/keymaps/default/keymap.c
index 8ba49952f..10881e8de 100644
--- a/keyboards/cluepad/keymaps/default/keymap.c
+++ b/keyboards/cluepad/keymaps/default/keymap.c
@@ -1,7 +1,6 @@
1#include "cluepad.h" 1#include "cluepad.h"
2 2
3#include "backlight.h" 3#include "backlight.h"
4#include "rgblight.h"
5 4
6// Each layer gets a name for readability, which is then used in the keymap matrix below. 5// Each layer gets a name for readability, which is then used in the keymap matrix below.
7// The underscores don't mean anything - you can have a layer called STUFF or any other name. 6// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -46,77 +45,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 * '-------------------' 45 * '-------------------'
47 */ 46 */
48[_FL] = KEYMAP( 47[_FL] = KEYMAP(
49 LT(_FL, KC_NLCK), KC_TRNS, KC_TRNS, F(0), \ 48 LT(_FL, KC_NLCK), KC_TRNS, KC_TRNS, RGB_TOG, \
50 KC_TRNS, F(4), KC_TRNS, F(6), \ 49 KC_TRNS, RGB_SAI, KC_TRNS, RGB_VAI, \
51 F(3), BL_STEP, F(2), \ 50 RGB_HUD, BL_STEP, RGB_HUI, \
52 KC_TRNS, F(5), KC_TRNS, F(7), \ 51 KC_TRNS, RGB_SAD, KC_TRNS, RGB_VAD, \
53 F(1), KC_TRNS) 52 RGB_MOD, KC_TRNS)
54}; 53};
55 54
56enum function_id { 55enum function_id {
57 RGBLED_TOGGLE,
58 RGBLED_STEP_MODE,
59 RGBLED_INCREASE_HUE,
60 RGBLED_DECREASE_HUE,
61 RGBLED_INCREASE_SAT,
62 RGBLED_DECREASE_SAT,
63 RGBLED_INCREASE_VAL,
64 RGBLED_DECREASE_VAL,
65}; 56};
66 57
67const uint16_t PROGMEM fn_actions[] = { 58const uint16_t PROGMEM fn_actions[] = {
68 [0] = ACTION_FUNCTION(RGBLED_TOGGLE),
69 [1] = ACTION_FUNCTION(RGBLED_STEP_MODE),
70 [2] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
71 [3] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
72 [4] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
73 [5] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
74 [6] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
75 [7] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
76}; 59};
77 60
78void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 61void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
79 switch (id) { 62 switch (id) {
80 case RGBLED_TOGGLE:
81 if (record->event.pressed) {
82 rgblight_toggle();
83 }
84 break;
85 case RGBLED_INCREASE_HUE:
86 if (record->event.pressed) {
87 rgblight_increase_hue();
88 }
89 break;
90 case RGBLED_DECREASE_HUE:
91 if (record->event.pressed) {
92 rgblight_decrease_hue();
93 }
94 break;
95 case RGBLED_INCREASE_SAT:
96 if (record->event.pressed) {
97 rgblight_increase_sat();
98 }
99 break;
100 case RGBLED_DECREASE_SAT:
101 if (record->event.pressed) {
102 rgblight_decrease_sat();
103 }
104 break;
105 case RGBLED_INCREASE_VAL:
106 if (record->event.pressed) {
107 rgblight_increase_val();
108 }
109 break;
110 case RGBLED_DECREASE_VAL:
111 if (record->event.pressed) {
112 rgblight_decrease_val();
113 }
114 break;
115 case RGBLED_STEP_MODE:
116 if (record->event.pressed) {
117 rgblight_step();
118 }
119 break;
120 } 63 }
121} 64}
122 65
diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c
index a7ea6040d..057c73bf4 100644
--- a/keyboards/kc60/keymaps/stanleylai/keymap.c
+++ b/keyboards/kc60/keymaps/stanleylai/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 38 RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
39 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 39 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
40 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 40 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
41 KC_TRNS,KC_NO, F(1), F(2), F(3), F(4), F(5), F(6), F(7), F(8), BL_STEP,BL_TOGG, KC_TRNS, KC_TRNS,\ 41 KC_TRNS,KC_NO, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,BL_STEP,BL_TOGG, KC_TRNS, KC_TRNS,\
42 KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS), 42 KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS),
43 #else 43 #else
44 RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 44 RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
@@ -52,30 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 52
53enum function_id { 53enum function_id {
54 SHIFT_ESC, 54 SHIFT_ESC,
55 #ifdef RGBLIGHT_ENABLE
56 RGBLED_TOGGLE,
57 RGBLED_STEP_MODE,
58 RGBLED_INCREASE_HUE,
59 RGBLED_DECREASE_HUE,
60 RGBLED_INCREASE_SAT,
61 RGBLED_DECREASE_SAT,
62 RGBLED_INCREASE_VAL,
63 RGBLED_DECREASE_VAL,
64 #endif
65}; 55};
66 56
67const uint16_t PROGMEM fn_actions[] = { 57const uint16_t PROGMEM fn_actions[] = {
68 [0] = ACTION_FUNCTION(SHIFT_ESC), 58 [0] = ACTION_FUNCTION(SHIFT_ESC),
69 #ifdef RGBLIGHT_ENABLE
70 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
71 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
72 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
73 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
74 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
75 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
76 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
77 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
78 #endif
79}; 59};
80 60
81#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 61#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
@@ -102,50 +82,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
102 } 82 }
103 } 83 }
104 break; 84 break;
105
106 #ifdef RGBLIGHT_ENABLE
107
108 case RGBLED_TOGGLE:
109 //led operations
110 if (record->event.pressed) {
111 rgblight_toggle();
112 }
113 break;
114 case RGBLED_INCREASE_HUE:
115 if (record->event.pressed) {
116 rgblight_increase_hue();
117 }
118 break;
119 case RGBLED_DECREASE_HUE:
120 if (record->event.pressed) {
121 rgblight_decrease_hue();
122 }
123 break;
124 case RGBLED_INCREASE_SAT:
125 if (record->event.pressed) {
126 rgblight_increase_sat();
127 }
128 break;
129 case RGBLED_DECREASE_SAT:
130 if (record->event.pressed) {
131 rgblight_decrease_sat();
132 }
133 break;
134 case RGBLED_INCREASE_VAL:
135 if (record->event.pressed) {
136 rgblight_increase_val();
137 }
138 break;
139 case RGBLED_DECREASE_VAL:
140 if (record->event.pressed) {
141 rgblight_decrease_val();
142 }
143 break;
144 case RGBLED_STEP_MODE:
145 if (record->event.pressed) {
146 rgblight_step();
147 }
148 break;
149 #endif
150 } 85 }
151} 86}
diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c
index bd5bef787..1c0574df0 100644
--- a/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 KC_GRV, 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_DEL, \ 52 KC_GRV, 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_DEL, \
53 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_INC, BL_TOGG, \ 53 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_INC, BL_TOGG, \
54 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 54 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
55 KC_TRNS, KC_TRNS, F(1), F(2), F(3), F(4), F(5), F(6), F(7), F(8), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 55 KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET), 56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET),
57 #else 57 #else
58 KC_GRV, 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_DEL, \ 58 KC_GRV, 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_DEL, \
@@ -65,30 +65,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
65 65
66enum function_id { 66enum function_id {
67 SHIFT_ESC, 67 SHIFT_ESC,
68 #ifdef RGBLIGHT_ENABLE
69 RGBLED_TOGGLE,
70 RGBLED_STEP_MODE,
71 RGBLED_INCREASE_HUE,
72 RGBLED_DECREASE_HUE,
73 RGBLED_INCREASE_SAT,
74 RGBLED_DECREASE_SAT,
75 RGBLED_INCREASE_VAL,
76 RGBLED_DECREASE_VAL
77 #endif
78}; 68};
79 69
80const uint16_t PROGMEM fn_actions[] = { 70const uint16_t PROGMEM fn_actions[] = {
81 [0] = ACTION_FUNCTION(SHIFT_ESC), 71 [0] = ACTION_FUNCTION(SHIFT_ESC),
82 #ifdef RGBLIGHT_ENABLE
83 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
84 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
85 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
86 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
87 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
88 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
89 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
90 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
91 #endif
92}; 72};
93 73
94void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 74void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
@@ -114,48 +94,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
114 } 94 }
115 } 95 }
116 break; 96 break;
117 //led operations
118 #ifdef RGBLIGHT_ENABLE
119 case RGBLED_TOGGLE:
120 if (record->event.pressed) {
121 rgblight_toggle();
122 }
123 break;
124 case RGBLED_INCREASE_HUE:
125 if (record->event.pressed) {
126 rgblight_increase_hue();
127 }
128 break;
129 case RGBLED_DECREASE_HUE:
130 if (record->event.pressed) {
131 rgblight_decrease_hue();
132 }
133 break;
134 case RGBLED_INCREASE_SAT:
135 if (record->event.pressed) {
136 rgblight_increase_sat();
137 }
138 break;
139 case RGBLED_DECREASE_SAT:
140 if (record->event.pressed) {
141 rgblight_decrease_sat();
142 }
143 break;
144 case RGBLED_INCREASE_VAL:
145 if (record->event.pressed) {
146 rgblight_increase_val();
147 }
148 break;
149 case RGBLED_DECREASE_VAL:
150 if (record->event.pressed) {
151 rgblight_decrease_val();
152 }
153 break;
154 case RGBLED_STEP_MODE:
155 if (record->event.pressed) {
156 rgblight_step();
157 }
158 break;
159 #endif
160 } 97 }
161} 98}
diff --git a/keyboards/phantom/keymaps/default/keymap.c b/keyboards/phantom/keymaps/default/keymap.c
index 1368226aa..a4fc319ac 100644
--- a/keyboards/phantom/keymaps/default/keymap.c
+++ b/keyboards/phantom/keymaps/default/keymap.c
@@ -1,9 +1,5 @@
1#include "phantom.h" 1#include "phantom.h"
2 2
3#ifdef RGBLIGHT_ENABLE
4#include "rgblight.h"
5#endif
6
7// Used for SHIFT_ESC 3// Used for SHIFT_ESC
8#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 4#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
9 5
@@ -59,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, \ 55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, \
60 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
61 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, \ 57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, \
62 KC_TRNS, F(1), F(2), F(3), F(4), F(5), F(6), F(7), F(8), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 58 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
63 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
64 #else 60 #else
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 61 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
@@ -73,30 +69,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
73 69
74enum function_id { 70enum function_id {
75 SHIFT_ESC, 71 SHIFT_ESC,
76 #ifdef RGBLIGHT_ENABLE
77 RGBLED_TOGGLE,
78 RGBLED_STEP_MODE,
79 RGBLED_INCREASE_HUE,
80 RGBLED_DECREASE_HUE,
81 RGBLED_INCREASE_SAT,
82 RGBLED_DECREASE_SAT,
83 RGBLED_INCREASE_VAL,
84 RGBLED_DECREASE_VAL
85 #endif
86}; 72};
87 73
88const uint16_t PROGMEM fn_actions[] = { 74const uint16_t PROGMEM fn_actions[] = {
89 [0] = ACTION_FUNCTION(SHIFT_ESC), 75 [0] = ACTION_FUNCTION(SHIFT_ESC),
90 #ifdef RGBLIGHT_ENABLE
91 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
92 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
93 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
94 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
95 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
96 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
97 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
98 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
99 #endif
100}; 76};
101 77
102void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 78void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
@@ -122,48 +98,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
122 } 98 }
123 } 99 }
124 break; 100 break;
125 //led operations
126 #ifdef RGBLIGHT_ENABLE
127 case RGBLED_TOGGLE:
128 if (record->event.pressed) {
129 rgblight_toggle();
130 }
131 break;
132 case RGBLED_INCREASE_HUE:
133 if (record->event.pressed) {
134 rgblight_increase_hue();
135 }
136 break;
137 case RGBLED_DECREASE_HUE:
138 if (record->event.pressed) {
139 rgblight_decrease_hue();
140 }
141 break;
142 case RGBLED_INCREASE_SAT:
143 if (record->event.pressed) {
144 rgblight_increase_sat();
145 }
146 break;
147 case RGBLED_DECREASE_SAT:
148 if (record->event.pressed) {
149 rgblight_decrease_sat();
150 }
151 break;
152 case RGBLED_INCREASE_VAL:
153 if (record->event.pressed) {
154 rgblight_increase_val();
155 }
156 break;
157 case RGBLED_DECREASE_VAL:
158 if (record->event.pressed) {
159 rgblight_decrease_val();
160 }
161 break;
162 case RGBLED_STEP_MODE:
163 if (record->event.pressed) {
164 rgblight_step();
165 }
166 break;
167 #endif
168 } 101 }
169} 102}
diff --git a/keyboards/planck/keymaps/yang/keymap.c b/keyboards/planck/keymaps/yang/keymap.c
index 541b1a57e..5f2907a08 100644
--- a/keyboards/planck/keymaps/yang/keymap.c
+++ b/keyboards/planck/keymaps/yang/keymap.c
@@ -51,33 +51,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51[_RGB] = { /* RGBLIGHT */ 51[_RGB] = { /* RGBLIGHT */
52 {KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL}, 52 {KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL},
53 {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_TRNS}, 53 {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_TRNS},
54 {KC_TRNS, F(1), F(2), F(3), F(4), F(5), F(6), F(7), F(8), KC_TRNS, KC_TRNS, KC_TRNS}, 54 {KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS},
55 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} 55 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
56 56
57} 57}
58}; 58};
59 59
60enum function_id { 60enum function_id {
61 RGBLED_TOGGLE, 61
62 RGBLED_STEP_MODE,
63 RGBLED_INCREASE_HUE,
64 RGBLED_DECREASE_HUE,
65 RGBLED_INCREASE_SAT,
66 RGBLED_DECREASE_SAT,
67 RGBLED_INCREASE_VAL,
68 RGBLED_DECREASE_VAL,
69}; 62};
70 63
71const uint16_t PROGMEM fn_actions[] = { 64const uint16_t PROGMEM fn_actions[] = {
72 [0] = ACTION_LAYER_TAP_KEY(_RGB, KC_SPC), 65 [0] = ACTION_LAYER_TAP_KEY(_RGB, KC_SPC),
73 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
74 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
75 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
76 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
77 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
78 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
79 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
80 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
81}; 66};
82 67
83const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 68const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -100,47 +85,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
100 85
101void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 86void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
102 switch (id) { 87 switch (id) {
103 case RGBLED_TOGGLE: 88
104 //led operations
105 if (record->event.pressed) {
106 rgblight_toggle();
107 }
108
109 break;
110 case RGBLED_INCREASE_HUE:
111 if (record->event.pressed) {
112 rgblight_increase_hue();
113 }
114 break;
115 case RGBLED_DECREASE_HUE:
116 if (record->event.pressed) {
117 rgblight_decrease_hue();
118 }
119 break;
120 case RGBLED_INCREASE_SAT:
121 if (record->event.pressed) {
122 rgblight_increase_sat();
123 }
124 break;
125 case RGBLED_DECREASE_SAT:
126 if (record->event.pressed) {
127 rgblight_decrease_sat();
128 }
129 break;
130 case RGBLED_INCREASE_VAL:
131 if (record->event.pressed) {
132 rgblight_increase_val();
133 }
134 break;
135 case RGBLED_DECREASE_VAL:
136 if (record->event.pressed) {
137 rgblight_decrease_val();
138 }
139 break;
140 case RGBLED_STEP_MODE:
141 if (record->event.pressed) {
142 rgblight_step();
143 }
144 break;
145 } 89 }
146} 90}
diff --git a/keyboards/satan/keymaps/default/keymap.c b/keyboards/satan/keymaps/default/keymap.c
index b19404afc..35dbbb77b 100644
--- a/keyboards/satan/keymaps/default/keymap.c
+++ b/keyboards/satan/keymaps/default/keymap.c
@@ -1,8 +1,5 @@
1#include "satan.h" 1#include "satan.h"
2 2
3#ifdef RGBLIGHT_ENABLE
4#include "rgblight.h"
5#endif
6 3
7// Used for SHIFT_ESC 4// Used for SHIFT_ESC
8#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 5#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
@@ -53,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
53 KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, \ 50 KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, \
54 KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_INC, BL_TOGG, \ 51 KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_INC, BL_TOGG, \
55 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 52 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
56 KC_TRNS, F(1), F(2), F(3), F(4), F(5), F(6), F(7), F(8), KC_TRNS, KC_TRNS, KC_TRNS, \ 53 KC_TRNS,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, \
57 KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 54 KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
58 #else 55 #else
59 KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, \ 56 KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, \
@@ -66,30 +63,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 63
67enum function_id { 64enum function_id {
68 SHIFT_ESC, 65 SHIFT_ESC,
69 #ifdef RGBLIGHT_ENABLE
70 RGBLED_TOGGLE,
71 RGBLED_STEP_MODE,
72 RGBLED_INCREASE_HUE,
73 RGBLED_DECREASE_HUE,
74 RGBLED_INCREASE_SAT,
75 RGBLED_DECREASE_SAT,
76 RGBLED_INCREASE_VAL,
77 RGBLED_DECREASE_VAL
78 #endif
79}; 66};
80 67
81const uint16_t PROGMEM fn_actions[] = { 68const uint16_t PROGMEM fn_actions[] = {
82 [0] = ACTION_FUNCTION(SHIFT_ESC), 69 [0] = ACTION_FUNCTION(SHIFT_ESC),
83 #ifdef RGBLIGHT_ENABLE
84 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
85 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
86 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
87 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
88 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
89 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
90 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
91 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
92 #endif
93}; 70};
94 71
95void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 72void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
@@ -115,48 +92,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
115 } 92 }
116 } 93 }
117 break; 94 break;
118 //led operations
119 #ifdef RGBLIGHT_ENABLE
120 case RGBLED_TOGGLE:
121 if (record->event.pressed) {
122 rgblight_toggle();
123 }
124 break;
125 case RGBLED_INCREASE_HUE:
126 if (record->event.pressed) {
127 rgblight_increase_hue();
128 }
129 break;
130 case RGBLED_DECREASE_HUE:
131 if (record->event.pressed) {
132 rgblight_decrease_hue();
133 }
134 break;
135 case RGBLED_INCREASE_SAT:
136 if (record->event.pressed) {
137 rgblight_increase_sat();
138 }
139 break;
140 case RGBLED_DECREASE_SAT:
141 if (record->event.pressed) {
142 rgblight_decrease_sat();
143 }
144 break;
145 case RGBLED_INCREASE_VAL:
146 if (record->event.pressed) {
147 rgblight_increase_val();
148 }
149 break;
150 case RGBLED_DECREASE_VAL:
151 if (record->event.pressed) {
152 rgblight_decrease_val();
153 }
154 break;
155 case RGBLED_STEP_MODE:
156 if (record->event.pressed) {
157 rgblight_step();
158 }
159 break;
160 #endif
161 } 95 }
162} 96}
diff --git a/keyboards/satan/keymaps/sethbc/keymap.c b/keyboards/satan/keymaps/sethbc/keymap.c
index 0ea4a7ae4..f8991f9fd 100644
--- a/keyboards/satan/keymaps/sethbc/keymap.c
+++ b/keyboards/satan/keymaps/sethbc/keymap.c
@@ -1,9 +1,5 @@
1#include "satan.h" 1#include "satan.h"
2 2
3#ifdef RGBLIGHT_ENABLE
4#include "rgblight.h"
5#endif
6
7// Used for SHIFT_ESC 3// Used for SHIFT_ESC
8#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) 4#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
9 5
@@ -44,39 +40,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
45 #else 41 #else
46 KC_GRV, 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_TRNS, RESET, \ 42 KC_GRV, 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_TRNS, RESET, \
47 KC_CAPS, KC_TRNS, F(1), F(2), F(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ 43 KC_CAPS, KC_TRNS, RGB_TOG,RGB_MOD,RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \
48 KC_TRNS, KC_VOLD, F(4), F(5), F(6), KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 44 KC_TRNS, KC_VOLD, RGB_HUD,RGB_SAI,RGB_SAD, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \
49 KC_TRNS, F(7), F(8), KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 45 KC_TRNS, RGB_VAI,RGB_VAD,KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
51 #endif 47 #endif
52}; 48};
53 49
54enum function_id { 50enum function_id {
55 SHIFT_ESC, 51 SHIFT_ESC,
56 #ifdef RGBLIGHT_ENABLE
57 RGBLED_TOGGLE,
58 RGBLED_STEP_MODE,
59 RGBLED_INCREASE_HUE,
60 RGBLED_DECREASE_HUE,
61 RGBLED_INCREASE_SAT,
62 RGBLED_DECREASE_SAT,
63 RGBLED_INCREASE_VAL,
64 RGBLED_DECREASE_VAL
65 #endif
66}; 52};
67 53
68const uint16_t PROGMEM fn_actions[] = { 54const uint16_t PROGMEM fn_actions[] = {
69 [0] = ACTION_FUNCTION(SHIFT_ESC), 55 [0] = ACTION_FUNCTION(SHIFT_ESC),
70 #ifdef RGBLIGHT_ENABLE
71 [1] = ACTION_FUNCTION(RGBLED_TOGGLE),
72 [2] = ACTION_FUNCTION(RGBLED_STEP_MODE),
73 [3] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
74 [4] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
75 [5] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
76 [6] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
77 [7] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
78 [8] = ACTION_FUNCTION(RGBLED_DECREASE_VAL),
79 #endif
80}; 56};
81 57
82void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 58void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
@@ -102,48 +78,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
102 } 78 }
103 } 79 }
104 break; 80 break;
105 //led operations
106 #ifdef RGBLIGHT_ENABLE
107 case RGBLED_TOGGLE:
108 if (record->event.pressed) {
109 rgblight_toggle();
110 }
111 break;
112 case RGBLED_INCREASE_HUE:
113 if (record->event.pressed) {
114 rgblight_increase_hue();
115 }
116 break;
117 case RGBLED_DECREASE_HUE:
118 if (record->event.pressed) {
119 rgblight_decrease_hue();
120 }
121 break;
122 case RGBLED_INCREASE_SAT:
123 if (record->event.pressed) {
124 rgblight_increase_sat();
125 }
126 break;
127 case RGBLED_DECREASE_SAT:
128 if (record->event.pressed) {
129 rgblight_decrease_sat();
130 }
131 break;
132 case RGBLED_INCREASE_VAL:
133 if (record->event.pressed) {
134 rgblight_increase_val();
135 }
136 break;
137 case RGBLED_DECREASE_VAL:
138 if (record->event.pressed) {
139 rgblight_decrease_val();
140 }
141 break;
142 case RGBLED_STEP_MODE:
143 if (record->event.pressed) {
144 rgblight_step();
145 }
146 break;
147 #endif
148 } 81 }
149} 82}
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 73f99f821..a15865183 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -156,6 +156,16 @@ enum quantum_keycodes {
156 BL_INC, 156 BL_INC,
157 BL_TOGG, 157 BL_TOGG,
158 BL_STEP, 158 BL_STEP,
159
160 // RGB functionality
161 RGB_TOG,
162 RGB_MOD,
163 RGB_HUI,
164 RGB_HUD,
165 RGB_SAI,
166 RGB_SAD,
167 RGB_VAI,
168 RGB_VAD,
159 169
160 // Left shift, open paren 170 // Left shift, open paren
161 KC_LSPO, 171 KC_LSPO,
diff --git a/quantum/quantum.c b/quantum/quantum.c
index d8e43a465..5c0b53e22 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -103,6 +103,56 @@ bool process_record_quantum(keyrecord_t *record) {
103 return false; 103 return false;
104 } 104 }
105 break; 105 break;
106 #ifdef RGBLIGHT_ENABLE
107 case RGB_TOG:
108 if (record->event.pressed) {
109 rgblight_toggle();
110 return false;
111 }
112 break;
113 case RGB_MOD:
114 if (record->event.pressed) {
115 rgblight_step();
116 return false;
117 }
118 break;
119 case RGB_HUI:
120 if (record->event.pressed) {
121 rgblight_increase_hue();
122 return false;
123 }
124 break;
125 case RGB_HUD:
126 if (record->event.pressed) {
127 rgblight_decrease_hue();
128 return false;
129 }
130 break;
131 case RGB_SAI:
132 if (record->event.pressed) {
133 rgblight_increase_sat();
134 return false;
135 }
136 break;
137 case RGB_SAD:
138 if (record->event.pressed) {
139 rgblight_decrease_sat();
140 return false;
141 }
142 break;
143 case RGB_VAI:
144 if (record->event.pressed) {
145 rgblight_increase_val();
146 return false;
147 }
148 break;
149 case RGB_VAD:
150 if (record->event.pressed) {
151 rgblight_decrease_val();
152 return false;
153 }
154 break;
155 #endif
106 case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_UNSWAP_ALT_GUI: 156 case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_UNSWAP_ALT_GUI:
107 if (record->event.pressed) { 157 if (record->event.pressed) {
108 // MAGIC actions (BOOTMAGIC without the boot) 158 // MAGIC actions (BOOTMAGIC without the boot)