summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/aeboards/satellite/rev1/rev1.c8
-rw-r--r--keyboards/input_club/k_type/is31fl3733-dual.c79
-rw-r--r--keyboards/input_club/k_type/is31fl3733-dual.h6
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/rev2.c6
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c6
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c6
-rwxr-xr-xkeyboards/melgeek/mach80/rev1/rev1.c2
-rwxr-xr-xkeyboards/melgeek/mach80/rev2/rev2.c2
-rwxr-xr-xkeyboards/melgeek/mojo68/rev1/rev1.c2
-rw-r--r--keyboards/melgeek/z70ultra/z70ultra.c2
-rw-r--r--keyboards/wilba_tech/wt_rgb_backlight.c90
-rw-r--r--keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c12
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/rev1.c4
-rw-r--r--keyboards/xelus/pachi/rgb/rev2/rev2.c4
14 files changed, 122 insertions, 107 deletions
diff --git a/keyboards/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
index 6727894e06..28ac5ef302 100644
--- a/keyboards/aeboards/satellite/rev1/rev1.c
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -146,8 +146,8 @@ led_config_t g_led_config = { {
static void init(void) {
i2c_init();
- is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
- is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
+ is31fl3731_init(0);
+ is31fl3731_init(1);
for (int index = 0; index < IS31FL3731_LED_COUNT; index++) {
bool enabled = !( ( index == 18+5) || //B5
@@ -157,8 +157,8 @@ static void init(void) {
is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
- is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
+ is31fl3731_update_led_control_registers(0);
+ is31fl3731_update_led_control_registers(1);
}
const rgb_matrix_driver_t rgb_matrix_driver = {
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
index dce371d444..60b251cc5a 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.c
+++ b/keyboards/input_club/k_type/is31fl3733-dual.c
@@ -60,6 +60,20 @@
# define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
#endif
+const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = {
+ IS31FL3733_I2C_ADDRESS_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+ IS31FL3733_I2C_ADDRESS_2,
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = {
+ IS31FL3733_SYNC_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+ IS31FL3733_SYNC_2,
+#endif
+};
+
// These buffers match the IS31FL3733 PWM registers.
// The control buffers match the page 0 LED On/Off registers.
// Storing them like this is optimal for I2C transfers to the registers.
@@ -72,22 +86,22 @@ bool g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false};
uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][IS31FL3733_LED_CONTROL_REGISTER_COUNT] = {0};
bool g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT] = {false};
-void is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) {
+void is31fl3733_write_register(uint8_t bus, uint8_t index, uint8_t reg, uint8_t data) {
#if IS31FL3733_I2C_PERSISTENCE > 0
for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
- if (i2c_write_register(index, addr << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+ if (i2c_write_register(bus, i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
}
#else
- i2c_write_register(index, addr << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT);
+ i2c_write_register(bus, i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT);
#endif
}
-void is31fl3733_select_page(uint8_t index, uint8_t addr, uint8_t page) {
- is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
- is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND, page);
+void is31fl3733_select_page(uint8_t bus, uint8_t index, uint8_t page) {
+ is31fl3733_write_register(bus, index, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+ is31fl3733_write_register(bus, index, IS31FL3733_REG_COMMAND, page);
}
-void is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t index) {
+void is31fl3733_write_pwm_buffer(uint8_t bus, uint8_t index) {
// Assumes page 1 is already selected.
// Transmit PWM registers in 12 transfers of 16 bytes.
@@ -95,10 +109,10 @@ void is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t index) {
for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
#if IS31FL3733_I2C_PERSISTENCE > 0
for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) {
- if (i2c_write_register(index, addr << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+ if (i2c_write_register(bus, i2c_addresses[index] << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
}
#else
- i2c_write_register(index, addr << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT);
+ i2c_write_register(bus, i2c_addresses[index] << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT);
#endif
}
}
@@ -106,54 +120,55 @@ void is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t index) {
void is31fl3733_init_drivers(void) {
i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);
- is31fl3733_init(0, IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_1);
+ is31fl3733_init(0, 0);
# ifdef USE_I2C2
i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN);
- is31fl3733_init(1, IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_2);
+ is31fl3733_init(1, 1);
# endif
for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
is31fl3733_set_led_control_register(i, true, true, true);
}
- is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_led_control_registers(0, 0);
# ifdef USE_I2C2
- is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1);
+ is31fl3733_update_led_control_registers(1, 1);
# endif
}
-void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
+void is31fl3733_init(uint8_t bus, uint8_t index) {
// In order to avoid the LEDs being driven with garbage data
// in the LED driver's PWM registers, shutdown is enabled last.
// Set up the mode and other settings, clear the PWM registers,
// then disable software shutdown.
- // Sync is passed so set it according to the datasheet.
- is31fl3733_select_page(bus, addr, IS31FL3733_COMMAND_LED_CONTROL);
+ is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_LED_CONTROL);
// Turn off all LEDs.
for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
- is31fl3733_write_register(bus, addr, i, 0x00);
+ is31fl3733_write_register(bus, index, i, 0x00);
}
- is31fl3733_select_page(bus, addr, IS31FL3733_COMMAND_PWM);
+ is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_PWM);
// Set PWM on all LEDs to 0
// No need to setup Breath registers to PWM as that is the default.
for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
- is31fl3733_write_register(bus, addr, i, 0x00);
+ is31fl3733_write_register(bus, index, i, 0x00);
}
- is31fl3733_select_page(bus, addr, IS31FL3733_COMMAND_FUNCTION);
+ is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_FUNCTION);
+
+ uint8_t sync = driver_sync[index];
// Set de-ghost pull-up resistors (SWx)
- is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
+ is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
// Set de-ghost pull-down resistors (CSx)
- is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
+ is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
// Set global current to maximum.
- is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
+ is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
// Disable software shutdown.
- is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+ is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
// Wait 10ms to ensure the device has woken up.
wait_ms(10);
@@ -212,22 +227,22 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo
g_led_control_registers_update_required[led.driver] = true;
}
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
+void is31fl3733_update_pwm_buffers(uint8_t bus, uint8_t index) {
if (g_pwm_buffer_update_required[index]) {
- is31fl3733_select_page(index, addr, IS31FL3733_COMMAND_PWM);
+ is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_PWM);
- is31fl3733_write_pwm_buffer(addr, index);
+ is31fl3733_write_pwm_buffer(bus, index);
g_pwm_buffer_update_required[index] = false;
}
}
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
+void is31fl3733_update_led_control_registers(uint8_t bus, uint8_t index) {
if (g_led_control_registers_update_required[index]) {
- is31fl3733_select_page(index, addr, IS31FL3733_COMMAND_LED_CONTROL);
+ is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_LED_CONTROL);
for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
- is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]);
+ is31fl3733_write_register(bus, index, i, g_led_control_registers[index][i]);
}
g_led_control_registers_update_required[index] = false;
@@ -235,8 +250,8 @@ void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
}
void is31fl3733_flush(void) {
- is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_pwm_buffers(0, 0);
# ifdef USE_I2C2
- is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1);
+ is31fl3733_update_pwm_buffers(1, 1);
# endif
}
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index 1237fc77d1..b7e3eb54e7 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -83,7 +83,7 @@ typedef struct is31fl3733_led_t {
extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
void is31fl3733_init_drivers(void);
-void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync);
+void is31fl3733_init(uint8_t bus, uint8_t index);
void is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);
void is31fl3733_select_page(uint8_t index, uint8_t addr, uint8_t page);
@@ -96,8 +96,8 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo
// (eg. from a timer interrupt).
// Call this while idle (in between matrix scans).
// If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index); // index is the driver index
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3733_update_pwm_buffers(uint8_t bus, uint8_t index);
+void is31fl3733_update_led_control_registers(uint8_t bus, uint8_t index);
void is31fl3733_flush(void);
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 0e9b3d318d..ce12ad67fe 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -153,16 +153,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
- is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+ is31fl3733_init(0);
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_led_control_registers(0);
}
static void rgb_matrix_driver_flush(void) {
- is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_pwm_buffers(0);
# if WS2812_LED_TOTAL > 0
ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
# endif
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index 9cb9edba8e..24c785d28e 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -153,16 +153,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
- is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+ is31fl3733_init(0);
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_led_control_registers(0);
}
static void rgb_matrix_driver_flush(void) {
- is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_pwm_buffers(0);
# if WS2812_LED_TOTAL > 0
ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
# endif
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index 2e66a3096e..f2f6337542 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -149,16 +149,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
- is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+ is31fl3733_init(0);
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_led_control_registers(0);
}
static void rgb_matrix_driver_flush(void) {
- is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_pwm_buffers(0);
# if WS2812_LED_TOTAL > 0
ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
# endif
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index 97744bd824..c09833bbaf 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -179,7 +179,7 @@ void matrix_init_kb(void) {
is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+ is31fl3741_update_led_control_registers(0);
matrix_init_user();
}
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index 5fcc84e947..1729d608c0 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -177,7 +177,7 @@ void matrix_init_kb(void) {
is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+ is31fl3741_update_led_control_registers(0);
matrix_init_user();
}
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index ea10051431..901a099fd5 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -147,7 +147,7 @@ void matrix_init_kb(void) {
is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+ is31fl3741_update_led_control_registers(0);
matrix_init_user();
}
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index eaf03fd344..51827ab15e 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -161,7 +161,7 @@ void matrix_init_kb(void) {
is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
}
- is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+ is31fl3741_update_led_control_registers(0);
matrix_init_user();
}
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 72ddb34ee7..cf36288705 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -980,34 +980,34 @@ void backlight_update_pwm_buffers(void)
#if defined(RGB_BACKLIGHT_M6_B)
is31fl3218_update_pwm_buffers();
#elif defined(RGB_BACKLIGHT_PORTICO75)
- is31fl3741_update_pwm_buffers( IS31FL3741_I2C_ADDRESS_1, 0 );
- is31fl3741_update_led_control_registers( IS31FL3741_I2C_ADDRESS_1, 0 );
+ is31fl3741_update_pwm_buffers( 0 );
+ is31fl3741_update_led_control_registers( 0 );
#elif defined(RGB_BACKLIGHT_M10_C)
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
+ is31fl3731_update_pwm_buffers( 0 );
+ is31fl3731_update_led_control_registers( 0 );
#elif defined(RGB_BACKLIGHT_HS60)
- is31fl3733_update_pwm_buffers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
+ is31fl3733_update_pwm_buffers( 0 );
+ is31fl3733_update_led_control_registers( 0 );
#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_KW_MEGA)
- is31fl3733_update_pwm_buffers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_pwm_buffers( IS31FL3733_I2C_ADDRESS_2, 1 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+ is31fl3733_update_pwm_buffers( 0 );
+ is31fl3733_update_pwm_buffers( 1 );
+ is31fl3733_update_led_control_registers( 0 );
+ is31fl3733_update_led_control_registers( 1 );
#elif defined(RGB_BACKLIGHT_NEBULA12)
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
+ is31fl3731_update_pwm_buffers( 0 );
+ is31fl3731_update_led_control_registers( 0 );
#elif defined(RGB_BACKLIGHT_U80_A)
static uint8_t driver = 0;
switch ( driver )
{
case 0:
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
+ is31fl3731_update_pwm_buffers( 0 );
break;
case 1:
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_2, 1 );
+ is31fl3731_update_pwm_buffers( 1 );
break;
case 2:
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_3, 2 );
+ is31fl3731_update_pwm_buffers( 2 );
break;
}
if ( ++driver > 2 )
@@ -1015,10 +1015,10 @@ void backlight_update_pwm_buffers(void)
driver = 0;
}
#else
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
- is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_2, 1 );
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_2, 1 );
+ is31fl3731_update_pwm_buffers( 0 );
+ is31fl3731_update_pwm_buffers( 1 );
+ is31fl3731_update_led_control_registers( 0 );
+ is31fl3731_update_led_control_registers( 1 );
#endif
}
@@ -2134,7 +2134,7 @@ void backlight_init_drivers(void)
// This actually updates the LED drivers
is31fl3218_update_led_control_registers();
#elif defined(RGB_BACKLIGHT_HS60)
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
+ is31fl3733_init( 0 );
for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
{
@@ -2153,10 +2153,10 @@ void backlight_init_drivers(void)
is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
}
// This actually updates the LED drivers
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
+ is31fl3733_update_led_control_registers( 0 );
#elif defined(RGB_BACKLIGHT_NK65)
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+ is31fl3733_init( 0 );
+ is31fl3733_init( 1 );
for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
{
@@ -2167,11 +2167,11 @@ void backlight_init_drivers(void)
}
is31fl3733_set_led_control_register( 7+64-1, 0, 1, 0 ); //Enable LB7 green enable for indicators
// This actually updates the LED drivers
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+ is31fl3733_update_led_control_registers( 0 );
+ is31fl3733_update_led_control_registers( 1 );
#elif defined(RGB_BACKLIGHT_NK87)
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+ is31fl3733_init( 0 );
+ is31fl3733_init( 1 );
for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
{
@@ -2197,11 +2197,11 @@ void backlight_init_drivers(void)
}
is31fl3733_set_led_control_register( 48+64-1, 0, 0, 1 ); //Enable LB48 blue enable for indicators
// This actually updates the LED drivers
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+ is31fl3733_update_led_control_registers( 0 );
+ is31fl3733_update_led_control_registers( 1 );
#elif defined(RGB_BACKLIGHT_NEBULA68)
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+ is31fl3733_init( 0 );
+ is31fl3733_init( 1 );
for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
{
@@ -2211,20 +2211,20 @@ void backlight_init_drivers(void)
is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
}
// This actually updates the LED drivers
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+ is31fl3733_update_led_control_registers( 0 );
+ is31fl3733_update_led_control_registers( 1 );
#elif defined(RGB_BACKLIGHT_PORTICO75)
- is31fl3741_init( IS31FL3741_I2C_ADDRESS_1 );
+ is31fl3741_init( 0 );
bool enabled = true;
for ( int index = 0; index < IS31FL3741_LED_COUNT; index++ )
{
is31fl3741_set_led_control_register( index, enabled, enabled, enabled );
}
// This actually updates the LED drivers
- is31fl3741_update_led_control_registers( IS31FL3741_I2C_ADDRESS_1, 0 );
+ is31fl3741_update_led_control_registers( 0 );
#elif defined(RGB_BACKLIGHT_KW_MEGA)
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
- is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+ is31fl3733_init( 0 );
+ is31fl3733_init( 1 );
for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
{
@@ -2234,18 +2234,18 @@ void backlight_init_drivers(void)
is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
}
// This actually updates the LED drivers
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
- is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+ is31fl3733_update_led_control_registers( 0 );
+ is31fl3733_update_led_control_registers( 1 );
#else
// Init the #1 driver
- is31fl3731_init( IS31FL3731_I2C_ADDRESS_1 );
+ is31fl3731_init( 0 );
// Init the #2 driver (if used)
#if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
- is31fl3731_init( IS31FL3731_I2C_ADDRESS_2 );
+ is31fl3731_init( 1 );
#endif
// Init the #3 driver (if used)
#if defined(RGB_BACKLIGHT_U80_A)
- is31fl3731_init( IS31FL3731_I2C_ADDRESS_3 );
+ is31fl3731_init( 2 );
#endif
// Experimental feature, not in configuration yet
@@ -2378,12 +2378,12 @@ void backlight_init_drivers(void)
}
// This actually updates the LED drivers
// TODO: refactor this to use DRIVER_COUNT
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
+ is31fl3731_update_led_control_registers( 0 );
#if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_2, 1 );
+ is31fl3731_update_led_control_registers( 1 );
#endif
#if defined(RGB_BACKLIGHT_U80_A)
- is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_3, 2 );
+ is31fl3731_update_led_control_registers( 2 );
#endif
#endif
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index 35ac5a06b2..6b8f91bc2f 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -145,22 +145,22 @@ led_config_t g_led_config = { {
//Custom Driver
static void init(void) {
i2c_init();
- is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
- is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
+ is31fl3731_init(0);
+ is31fl3731_init(1);
for (int index = 0; index < IS31FL3731_LED_COUNT; index++) {
bool enabled = true;
is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
- is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
+ is31fl3731_update_led_control_registers(0);
+ is31fl3731_update_led_control_registers(1);
//RGB Underglow ws2812
}
static void flush(void) {
- is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_1, 0);
- is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_2, 1);
+ is31fl3731_update_pwm_buffers(0);
+ is31fl3731_update_pwm_buffers(1);
ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
}
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index e43726115e..b5786f9c3c 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -188,7 +188,7 @@ led_config_t g_led_config = { {
static void init(void) {
i2c_init();
- is31fl3741_init(IS31FL3741_I2C_ADDRESS_1);
+ is31fl3741_init(0);
for (int index = 0; index < IS31FL3741_LED_COUNT; index++) {
bool enabled = !( ( index == -1+0+13) || //A13
( index == -1+13+3) || //B3
@@ -223,7 +223,7 @@ static void init(void) {
);
is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+ is31fl3741_update_led_control_registers(0);
}
const rgb_matrix_driver_t rgb_matrix_driver = {
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index 25d1406653..f38d2c67b5 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -194,7 +194,7 @@ led_config_t g_led_config = { {
static void init(void) {
i2c_init();
- is31fl3741_init(IS31FL3741_I2C_ADDRESS_1);
+ is31fl3741_init(0);
for (int index = 0; index < IS31FL3741_LED_COUNT; index++) {
bool enabled = !( ( index == -1+0+13) || //A13
( index == -1+13+3) || //B3
@@ -229,7 +229,7 @@ static void init(void) {
);
is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+ is31fl3741_update_led_control_registers(0);
}
const rgb_matrix_driver_t rgb_matrix_driver = {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 03:11:36 +0000