X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fled_matrix_drivers.c;h=cb91821a4028533a6a7cd9086947724e24d60df6;hb=91b0c75045c38a9c770f7835b928b3b298a1ff8f;hp=f00f4f366807a16d9c74e48d2dd11096eb66cf2a;hpb=fd698c43d78ebbc42c1eb2bec74078b791616ad1;p=qmk_firmware.git

diff --git a/quantum/led_matrix_drivers.c b/quantum/led_matrix_drivers.c
index f00f4f366..cb91821a4 100644
--- a/quantum/led_matrix_drivers.c
+++ b/quantum/led_matrix_drivers.c
@@ -1,4 +1,5 @@
-/* Copyright 2018 Clueboard
+/* Copyright 2018 James Laird-Wah
+ * Copyright 2019 Clueboard
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "quantum.h"
-#include "led_matrix.h"
+#include "ledmatrix.h"
 
 /* Each driver needs to define a struct:
  *
@@ -39,32 +40,33 @@ static void init(void) {
     i2c_init();
     #ifdef IS31FL3731
         #ifdef LED_DRIVER_ADDR_1
-            IS31FL3731_init(DRIVER_ADDR_1);
+            IS31FL3731_init(LED_DRIVER_ADDR_1);
         #endif
         #ifdef LED_DRIVER_ADDR_2
-            IS31FL3731_init(DRIVER_ADDR_2);
+            IS31FL3731_init(LED_DRIVER_ADDR_2);
         #endif
         #ifdef LED_DRIVER_ADDR_3
-            IS31FL3731_init(DRIVER_ADDR_3);
+            IS31FL3731_init(LED_DRIVER_ADDR_3);
         #endif
         #ifdef LED_DRIVER_ADDR_4
-            IS31FL3731_init(DRIVER_ADDR_4);
+            IS31FL3731_init(LED_DRIVER_ADDR_4);
         #endif
     #else
         #ifdef LED_DRIVER_ADDR_1
-            IS31FL3733_init(DRIVER_ADDR_1);
+            IS31FL3733_init(LED_DRIVER_ADDR_1, 0 );
         #endif
         #ifdef LED_DRIVER_ADDR_2
-            IS31FL3733_init(DRIVER_ADDR_2);
+            IS31FL3733_init(LED_DRIVER_ADDR_2, 0 );
         #endif
         #ifdef LED_DRIVER_ADDR_3
-            IS31FL3733_init(DRIVER_ADDR_3);
+            IS31FL3733_init(LED_DRIVER_ADDR_3, 0 );
         #endif
         #ifdef LED_DRIVER_ADDR_4
-            IS31FL3733_init(DRIVER_ADDR_4);
+            IS31FL3733_init(LED_DRIVER_ADDR_4, 0 );
         #endif
     #endif
-    for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
+
+    for (int index = 0; index < LED_DRIVER_LED_COUNT; index++) {
         #ifdef IS31FL3731
             IS31FL3731_set_led_control_register(index, true);
         #else
@@ -74,29 +76,29 @@ static void init(void) {
     // This actually updates the LED drivers
     #ifdef IS31FL3731
         #ifdef LED_DRIVER_ADDR_1
-            IS31FL3731_update_led_control_registers(DRIVER_ADDR_1);
+            IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
         #endif
         #ifdef LED_DRIVER_ADDR_2
-            IS31FL3731_update_led_control_registers(DRIVER_ADDR_2);
+            IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
         #endif
         #ifdef LED_DRIVER_ADDR_3
-            IS31FL3731_update_led_control_registers(DRIVER_ADDR_3);
+            IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
         #endif
         #ifdef LED_DRIVER_ADDR_4
-            IS31FL3731_update_led_control_registers(DRIVER_ADDR_4);
+            IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
         #endif
     #else
         #ifdef LED_DRIVER_ADDR_1
-            IS31FL3733_update_led_control_registers(DRIVER_ADDR_1);
+            IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
         #endif
         #ifdef LED_DRIVER_ADDR_2
-            IS31FL3733_update_led_control_registers(DRIVER_ADDR_2);
+            IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
         #endif
         #ifdef LED_DRIVER_ADDR_3
-            IS31FL3733_update_led_control_registers(DRIVER_ADDR_3);
+            IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
         #endif
         #ifdef LED_DRIVER_ADDR_4
-            IS31FL3733_update_led_control_registers(DRIVER_ADDR_4);
+            IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
         #endif
     #endif
 }
@@ -104,29 +106,29 @@ static void init(void) {
 static void flush(void) {
     #ifdef IS31FL3731
         #ifdef LED_DRIVER_ADDR_1
-            IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1);
+            IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
         #endif
         #ifdef LED_DRIVER_ADDR_2
-            IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2);
+            IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
         #endif
         #ifdef LED_DRIVER_ADDR_3
-            IS31FL3731_update_pwm_buffers(DRIVER_ADDR_3);
+            IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
         #endif
         #ifdef LED_DRIVER_ADDR_4
-            IS31FL3731_update_pwm_buffers(DRIVER_ADDR_4);
+            IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
         #endif
     #else
         #ifdef LED_DRIVER_ADDR_1
-            IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1);
+            IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
         #endif
         #ifdef LED_DRIVER_ADDR_2
-            IS31FL3733_update_pwm_buffers(DRIVER_ADDR_2);
+            IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
         #endif
         #ifdef LED_DRIVER_ADDR_3
-            IS31FL3733_update_pwm_buffers(DRIVER_ADDR_3);
+            IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
         #endif
         #ifdef LED_DRIVER_ADDR_4
-            IS31FL3733_update_pwm_buffers(DRIVER_ADDR_4);
+            IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
         #endif
     #endif
 }