aboutsummaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-10-06 19:01:07 +1100
committerGitHub <noreply@github.com>2024-10-06 21:01:07 +1300
commit208ebf54a905ce6e4e563a6811eca8c8dc8b17e1 (patch)
tree7bb6a8bdb5a641263c39236d0b655825ac37307b /keyboards/ergodox_ez
parent43e82ed5c72b7386ca91d1bd363ee092f77c1b9a (diff)
WS2812 API rework (#24364)
* Begin WS2812 API rework * Move RGBW conversion, clean up color.h, fix RGBW for AVR bitbang * Formatting & update PS2AVRGB I2C driver (untested) * Tested ARM bitbang RGB+RGBW * Tested ARM SPI RGB - RGBW not working * Tested ARM PWM RGB+RGBW * Tested RP2040 PIO driver RGB+RGBW * Update RGBLight * Formatting * Fix BM60HSRGB rev2 * Fix oddforge/vea * Fix 1k and XD002 RGBLite * Fix model_m/mschwingen * Fix handwired/promethium * Rename `WS2812_LED_TOTAL` for BM60HSRGB * Fix work_louder boards * Fix dawn60 * Fix rgbkb/pan * Fix neson_design/700e and n6 * Fix ergodox_ez/shine * ergodox_ez/shine: invert indices for left half * Fix matrix/abelx * Fix matrix/m20add * Remove custom rgblight driver for matrix/noah - should be done with lighting layers * Fix LED indexes for RGBLight split * Rename `convert_rgb_to_rgbw()` to `ws2812_rgb_to_rgbw()` * Update WS2812 API docs * `ergodox_ez/shine`: simplify LED index calculation * LED/RGB Matrix: Add weak function for LED index resolution * Bandaid fix for RGB Matrix splits not using WS2812 * `steelseries/prime_plus`: redo custom RGBLight driver * Update keyboards/steelseries/prime_plus/rgblight_custom.c Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> --------- Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Diffstat (limited to 'keyboards/ergodox_ez')
-rw-r--r--keyboards/ergodox_ez/post_config.h2
-rw-r--r--keyboards/ergodox_ez/shine/rgblight_custom.c82
2 files changed, 47 insertions, 37 deletions
diff --git a/keyboards/ergodox_ez/post_config.h b/keyboards/ergodox_ez/post_config.h
index eb22439ae4..e94fda0f06 100644
--- a/keyboards/ergodox_ez/post_config.h
+++ b/keyboards/ergodox_ez/post_config.h
@@ -33,8 +33,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ERGODOX_LED_30
// If using 30 LEDs, then define that many
+# define WS2812_LED_COUNT 30
# define RGBLIGHT_LED_COUNT 30 // Number of LEDs
#else
// If not, then only define 15
+# define WS2812_LED_COUNT 15
# define RGBLIGHT_LED_COUNT 15 // Number of LEDs
#endif
diff --git a/keyboards/ergodox_ez/shine/rgblight_custom.c b/keyboards/ergodox_ez/shine/rgblight_custom.c
index 29060e76fc..8e806b1fd1 100644
--- a/keyboards/ergodox_ez/shine/rgblight_custom.c
+++ b/keyboards/ergodox_ez/shine/rgblight_custom.c
@@ -21,47 +21,55 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ergodox_ez.h"
#include "ws2812.h"
-void setleds_custom(rgb_led_t *led, uint16_t led_num) {
- uint16_t length = 0;
- int i = 0;
- int j = 0;
-# ifdef WS2812_RGBW
- int bytes_per_led = 4;
-# else
- int bytes_per_led = 3;
-# endif
-# if defined(ERGODOX_LED_30)
- // prevent right-half code from trying to bitbang all 30
- // so with 30 LEDs, we count from 29 to 15 here, and the
- // other half does 0 to 14.
- uint8_t half_led_num = RGBLIGHT_LED_COUNT / 2;
- length = half_led_num * bytes_per_led;
- uint8_t data[length];
- for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i)
-# elif defined(ERGODOX_LED_15_MIRROR)
- length = led_num * bytes_per_led;
- uint8_t data[length];
- for (i = 0; i < led_num; ++i)
-# else // ERGDOX_LED_15 non-mirrored
- length = led_num * bytes_per_led;
- uint8_t data[length];
- for (i = led_num - 1; i >= 0; --i)
-# endif
- {
- uint8_t *data_byte = (uint8_t *)(led + i);
- data[j++] = data_byte[0];
- data[j++] = data_byte[1];
- data[j++] = data_byte[2];
-#ifdef WS2812_RGBW
- data[j++] = data_byte[3];
+#define WS2812_I2C_ADDRESS_LEFT 0x84
+
+#if defined(ERGODOX_LED_30)
+# define WS2812_LED_COUNT_LEFT (RGBLIGHT_LED_COUNT / 2)
+ws2812_led_t ws2812_leds_left[WS2812_LED_COUNT_LEFT];
+#else
+# define WS2812_LED_COUNT_LEFT RGBLIGHT_LED_COUNT
+ws2812_led_t ws2812_leds_left[WS2812_LED_COUNT_LEFT];
+#endif
+
+void set_color_left(int index, uint8_t red, uint8_t green, uint8_t blue) {
+ ws2812_leds_left[index].r = red;
+ ws2812_leds_left[index].g = green;
+ ws2812_leds_left[index].b = blue;
+#if defined(WS2812_RGBW)
+ ws2812_rgb_to_rgbw(&ws2812_leds_left[index]);
+#endif
+}
+
+void set_color_custom(int index, uint8_t red, uint8_t green, uint8_t blue) {
+#if defined(ERGODOX_LED_30)
+ if (index < WS2812_LED_COUNT_LEFT) {
+ ws2812_set_color(index, red, green, blue);
+ } else {
+ set_color_left(RGBLIGHT_LED_COUNT - index - 1, red, green, blue);
+ }
+#elif defined(ERGODOX_LED_15_MIRROR)
+ ws2812_set_color(index, red, green, blue);
+ set_color_left(index, red, green, blue);
+#else
+ ws2812_set_color(index, red, green, blue);
+ set_color_left(WS2812_LED_COUNT_LEFT - index - 1, red, green, blue);
#endif
+}
+
+void set_color_all_custom(uint8_t red, uint8_t green, uint8_t blue) {
+ for (int i = 0; i < RGBLIGHT_LED_COUNT; i++) {
+ set_color_custom(i, red, green, blue);
}
- i2c_transmit(0x84, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
+}
- ws2812_setleds(led, led_num);
+void flush_custom(void) {
+ i2c_transmit(WS2812_I2C_ADDRESS_LEFT, (uint8_t *)ws2812_leds_left, sizeof(ws2812_leds_left), ERGODOX_EZ_I2C_TIMEOUT);
+ ws2812_flush();
}
const rgblight_driver_t rgblight_driver = {
- .init = ws2812_init,
- .setleds = setleds_custom,
+ .init = ws2812_init,
+ .set_color = set_color_custom,
+ .set_color_all = set_color_all_custom,
+ .flush = flush_custom,
};