Skip to content

Commit 7766fac

Browse files
committed
Revert "[RGB Matrix] Switch to typedef for rgb matrix"
This reverts commit 3629c19.
1 parent 16086a5 commit 7766fac

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

users/drashna/drashna.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#if defined(RGB_MATRIX_ENABLE)
1919
void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type,
20-
led_index_t led_min, led_index_t led_max);
20+
uint8_t led_min, uint8_t led_max);
2121
#endif // defined(RGB_MATRIX_ENABLE)
2222

2323
void matrix_scan_rate_task(void);

users/drashna/rgb/rgb_matrix_stuff.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static uint32_t hypno_timer;
2020
rgb_t rgb_matrix_hsv_to_rgb(hsv_t hsv);
2121

2222
void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type,
23-
led_index_t led_min, led_index_t led_max) {
23+
uint8_t led_min, uint8_t led_max) {
2424
hsv_t hsv = {hue, sat, val};
2525
rgb_t rgb = {0};
2626
uint8_t time = scale16by8(g_rgb_timer, qadd8(speed / 4, 1));
@@ -30,7 +30,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
3030

3131
switch (mode) {
3232
case 1: // breathing
33-
for (led_index_t i = led_min; i < led_max; i++) {
33+
for (uint8_t i = led_min; i < led_max; i++) {
3434
if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
3535
hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
3636
rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv);
@@ -39,7 +39,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
3939
}
4040
break;
4141
case 2: // Rainbow Mood
42-
for (led_index_t i = led_min; i < led_max; i++) {
42+
for (uint8_t i = led_min; i < led_max; i++) {
4343
hsv.h = time;
4444
if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
4545
rgb = rgb_matrix_hsv_to_rgb(hsv);
@@ -48,7 +48,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
4848
}
4949
break;
5050
case 3: // Rainbow Swirl
51-
for (led_index_t i = led_min; i < led_max; i++) {
51+
for (uint8_t i = led_min; i < led_max; i++) {
5252
if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
5353
hsv.h = g_led_config.point[i].x - time;
5454
rgb = rgb_matrix_hsv_to_rgb(hsv);
@@ -57,7 +57,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
5757
}
5858
break;
5959
case 4: // Snek
60-
for (led_index_t i = led_min; i < led_max; i++) {
60+
for (uint8_t i = led_min; i < led_max; i++) {
6161
if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
6262
int16_t v = hsv.v - abs(scale8(g_led_config.point[i].x, 228) + 28 - time) * 8;
6363
hsv.v = scale8(v < 0 ? 0 : v, hsv.v);
@@ -67,7 +67,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
6767
}
6868
break;
6969
default: // Solid Color
70-
for (led_index_t i = led_min; i < led_max; i++) {
70+
for (uint8_t i = led_min; i < led_max; i++) {
7171
if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
7272
rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv);
7373
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
@@ -172,10 +172,10 @@ const rgblight_driver_t rgblight_driver = {
172172
};
173173
#endif // RGBLIGHT_ENABLE && RGBLIGHT_CUSTOM
174174

175-
__attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(led_index_t led_min, led_index_t led_max) {
175+
__attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
176176
return true;
177177
}
178-
bool rgb_matrix_indicators_advanced_user(led_index_t led_min, led_index_t led_max) {
178+
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
179179
if (!rgb_matrix_indicators_advanced_keymap(led_min, led_max)) {
180180
return false;
181181
}
@@ -189,7 +189,7 @@ bool rgb_matrix_indicators_advanced_user(led_index_t led_min, led_index_t led_ma
189189
* @param led_min
190190
* @param led_max
191191
*/
192-
void rgb_matrix_indicators_render_layer(led_index_t led_min, led_index_t led_max) {
192+
void rgb_matrix_indicators_render_layer(uint8_t led_min, uint8_t led_max) {
193193
if (userspace_config.rgb.layer_change) {
194194
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_CUSTOM)
195195
# if defined(SPLIT_KEYBOARD) && defined(SPLIT_LAYER_STATE_ENABLE)
@@ -203,7 +203,7 @@ void rgb_matrix_indicators_render_layer(led_index_t led_min, led_index_t led_max
203203
}
204204
}
205205
# endif // SPLIT_KEYBOARD && SPLIT_LAYER_STATE_ENABLE
206-
for (led_index_t i = 0; i < RGBLIGHT_LED_COUNT; i++) {
206+
for (uint8_t i = 0; i < RGBLIGHT_LED_COUNT; i++) {
207207
RGB_MATRIX_INDICATOR_SET_COLOR(led_mapping[i], led_array[i].r, led_array[i].g, led_array[i].b);
208208
}
209209
#else // RGBLIGHT_ENABLE && RGBLIGHT_CUSTOM

users/drashna/rgb/rgb_matrix_stuff.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ void housekeeping_task_rgb_matrix(void);
1010

1111
void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
1212
void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type,
13-
led_index_t led_min, led_index_t led_max);
14-
void rgb_matrix_indicators_render_layer(led_index_t led_min, led_index_t led_max);
13+
uint8_t led_min, uint8_t led_max);
14+
void rgb_matrix_indicators_render_layer(uint8_t led_min, uint8_t led_max);
1515

16-
bool rgb_matrix_indicators_advanced_keymap(led_index_t led_min, led_index_t led_max);
16+
bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);
1717
bool rgb_matrix_indicators_keymap(void);
1818
void rgb_matrix_shutdown(bool jump_to_bootloader);
1919

0 commit comments

Comments
 (0)