Browse Source

Merge remote-tracking branch 'origin/develop' into xap

QMK Bot 2 years ago
parent
commit
09d1d3bea9
35 changed files with 44 additions and 44 deletions
  1. 11 11
      builddefs/common_features.mk
  2. 1 1
      docs/feature_led_matrix.md
  3. 1 1
      drivers/led/issi/is31fl3218-mono.c
  4. 0 0
      drivers/led/issi/is31fl3218-mono.h
  5. 1 1
      drivers/led/issi/is31fl3731-mono.c
  6. 0 0
      drivers/led/issi/is31fl3731-mono.h
  7. 1 1
      drivers/led/issi/is31fl3733-mono.c
  8. 0 0
      drivers/led/issi/is31fl3733-mono.h
  9. 1 1
      drivers/led/issi/is31fl3736-mono.c
  10. 0 0
      drivers/led/issi/is31fl3736-mono.h
  11. 1 1
      drivers/led/issi/is31fl3737-mono.c
  12. 0 0
      drivers/led/issi/is31fl3737-mono.h
  13. 1 1
      drivers/led/issi/is31fl3741-mono.c
  14. 0 0
      drivers/led/issi/is31fl3741-mono.h
  15. 1 1
      drivers/led/issi/is31fl3742a-mono.c
  16. 0 0
      drivers/led/issi/is31fl3742a-mono.h
  17. 1 1
      drivers/led/issi/is31fl3743a-mono.c
  18. 0 0
      drivers/led/issi/is31fl3743a-mono.h
  19. 1 1
      drivers/led/issi/is31fl3745-mono.c
  20. 0 0
      drivers/led/issi/is31fl3745-mono.h
  21. 1 1
      drivers/led/issi/is31fl3746a-mono.c
  22. 0 0
      drivers/led/issi/is31fl3746a-mono.h
  23. 1 1
      drivers/led/snled27351-mono.c
  24. 0 0
      drivers/led/snled27351-mono.h
  25. 1 1
      keyboards/fallacy/indicators.c
  26. 1 1
      keyboards/fallacy/rules.mk
  27. 1 1
      keyboards/wilba_tech/wt60_a/rules.mk
  28. 1 1
      keyboards/wilba_tech/wt65_a/rules.mk
  29. 1 1
      keyboards/wilba_tech/wt65_b/rules.mk
  30. 1 1
      keyboards/wilba_tech/wt75_a/rules.mk
  31. 1 1
      keyboards/wilba_tech/wt75_b/rules.mk
  32. 1 1
      keyboards/wilba_tech/wt75_c/rules.mk
  33. 1 1
      keyboards/wilba_tech/wt80_a/rules.mk
  34. 1 1
      keyboards/wilba_tech/wt_mono_backlight.c
  35. 11 11
      quantum/led_matrix/led_matrix_drivers.h

+ 11 - 11
builddefs/common_features.mk

@@ -366,67 +366,67 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3218)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3218-simple.c
+        SRC += is31fl3218-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3731)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3731-simple.c
+        SRC += is31fl3731-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3733)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3733-simple.c
+        SRC += is31fl3733-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3736)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3736-simple.c
+        SRC += is31fl3736-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3737)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3737-simple.c
+        SRC += is31fl3737-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3741)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3741-simple.c
+        SRC += is31fl3741-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3742a)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3742a-simple.c
+        SRC += is31fl3742a-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3743a)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3743a-simple.c
+        SRC += is31fl3743a-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3745)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3745-simple.c
+        SRC += is31fl3745-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3746a)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3746a-simple.c
+        SRC += is31fl3746a-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), snled27351)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led
-        SRC += snled27351-simple.c
+        SRC += snled27351-mono.c
     endif
 
 endif

+ 1 - 1
docs/feature_led_matrix.md

@@ -65,7 +65,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 }
 ```
 
-Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/led/issi/is31fl3731-simple.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ).
+Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/led/issi/is31fl3731-mono.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ).
 
 ---
 ### IS31FLCOMMON :id=is31flcommon

+ 1 - 1
drivers/led/issi/is31fl3218-simple.c → drivers/led/issi/is31fl3218-mono.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "is31fl3218-simple.h"
+#include "is31fl3218-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 

+ 0 - 0
drivers/led/issi/is31fl3218-simple.h → drivers/led/issi/is31fl3218-mono.h


+ 1 - 1
drivers/led/issi/is31fl3731-simple.c → drivers/led/issi/is31fl3731-mono.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "is31fl3731-simple.h"
+#include "is31fl3731-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3731-simple.h → drivers/led/issi/is31fl3731-mono.h


+ 1 - 1
drivers/led/issi/is31fl3733-simple.c → drivers/led/issi/is31fl3733-mono.c

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "is31fl3733-simple.h"
+#include "is31fl3733-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3733-simple.h → drivers/led/issi/is31fl3733-mono.h


+ 1 - 1
drivers/led/issi/is31fl3736-simple.c → drivers/led/issi/is31fl3736-mono.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "is31fl3736-simple.h"
+#include "is31fl3736-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3736-simple.h → drivers/led/issi/is31fl3736-mono.h


+ 1 - 1
drivers/led/issi/is31fl3737-simple.c → drivers/led/issi/is31fl3737-mono.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "is31fl3737-simple.h"
+#include "is31fl3737-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3737-simple.h → drivers/led/issi/is31fl3737-mono.h


+ 1 - 1
drivers/led/issi/is31fl3741-simple.c → drivers/led/issi/is31fl3741-mono.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "is31fl3741-simple.h"
+#include "is31fl3741-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3741-simple.h → drivers/led/issi/is31fl3741-mono.h


+ 1 - 1
drivers/led/issi/is31fl3742a-simple.c → drivers/led/issi/is31fl3742a-mono.c

@@ -1,4 +1,4 @@
-#include "is31fl3742a-simple.h"
+#include "is31fl3742a-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3742a-simple.h → drivers/led/issi/is31fl3742a-mono.h


+ 1 - 1
drivers/led/issi/is31fl3743a-simple.c → drivers/led/issi/is31fl3743a-mono.c

@@ -1,4 +1,4 @@
-#include "is31fl3743a-simple.h"
+#include "is31fl3743a-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3743a-simple.h → drivers/led/issi/is31fl3743a-mono.h


+ 1 - 1
drivers/led/issi/is31fl3745-simple.c → drivers/led/issi/is31fl3745-mono.c

@@ -1,4 +1,4 @@
-#include "is31fl3745-simple.h"
+#include "is31fl3745-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3745-simple.h → drivers/led/issi/is31fl3745-mono.h


+ 1 - 1
drivers/led/issi/is31fl3746a-simple.c → drivers/led/issi/is31fl3746a-mono.c

@@ -1,4 +1,4 @@
-#include "is31fl3746a-simple.h"
+#include "is31fl3746a-mono.h"
 #include <string.h>
 #include "i2c_master.h"
 #include "wait.h"

+ 0 - 0
drivers/led/issi/is31fl3746a-simple.h → drivers/led/issi/is31fl3746a-mono.h


+ 1 - 1
drivers/led/snled27351-simple.c → drivers/led/snled27351-mono.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "snled27351-simple.h"
+#include "snled27351-mono.h"
 #include "i2c_master.h"
 
 #define SNLED27351_PWM_REGISTER_COUNT 192

+ 0 - 0
drivers/led/snled27351-simple.h → drivers/led/snled27351-mono.h


+ 1 - 1
keyboards/fallacy/indicators.c

@@ -15,7 +15,7 @@
  */
 
 #include "indicators.h"
-#include "drivers/led/issi/is31fl3731-simple.h"
+#include "drivers/led/issi/is31fl3731-mono.h"
 #include "i2c_master.h"
 
 /* Set up IS31FL3731 for use in powering indicator LEDs. Absolutely overkill for this job but it was already in the design.

+ 1 - 1
keyboards/fallacy/rules.mk

@@ -13,5 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 
 # project specific files
 SRC += indicators.c \
-       drivers/led/issi/is31fl3731-simple.c
+       drivers/led/issi/is31fl3731-mono.c
 I2C_DRIVER_REQUIRED = yes

+ 1 - 1
keyboards/wilba_tech/wt60_a/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt65_a/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt65_b/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt75_a/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt75_b/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt75_c/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt80_a/rules.mk

@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c

+ 1 - 1
keyboards/wilba_tech/wt_mono_backlight.c

@@ -33,7 +33,7 @@
 #error VIA_EEPROM_CUSTOM_CONFIG_SIZE was not defined to store backlight_config struct
 #endif
 
-#include "drivers/led/issi/is31fl3736-simple.h"
+#include "drivers/led/issi/is31fl3736-mono.h"
 
 #define BACKLIGHT_EFFECT_MAX 3
 

+ 11 - 11
quantum/led_matrix/led_matrix_drivers.h

@@ -6,27 +6,27 @@
 #include <stdint.h>
 
 #if defined(LED_MATRIX_IS31FL3218)
-#    include "is31fl3218-simple.h"
+#    include "is31fl3218-mono.h"
 #elif defined(LED_MATRIX_IS31FL3731)
-#    include "is31fl3731-simple.h"
+#    include "is31fl3731-mono.h"
 #elif defined(LED_MATRIX_IS31FL3733)
-#    include "is31fl3733-simple.h"
+#    include "is31fl3733-mono.h"
 #elif defined(LED_MATRIX_IS31FL3736)
-#    include "is31fl3736-simple.h"
+#    include "is31fl3736-mono.h"
 #elif defined(LED_MATRIX_IS31FL3737)
-#    include "is31fl3737-simple.h"
+#    include "is31fl3737-mono.h"
 #elif defined(LED_MATRIX_IS31FL3741)
-#    include "is31fl3741-simple.h"
+#    include "is31fl3741-mono.h"
 #elif defined(LED_MATRIX_IS31FL3742A)
-#    include "is31fl3742a-simple.h"
+#    include "is31fl3742a-mono.h"
 #elif defined(LED_MATRIX_IS31FL3743A)
-#    include "is31fl3743a-simple.h"
+#    include "is31fl3743a-mono.h"
 #elif defined(LED_MATRIX_IS31FL3745)
-#    include "is31fl3745-simple.h"
+#    include "is31fl3745-mono.h"
 #elif defined(LED_MATRIX_IS31FL3746A)
-#    include "is31fl3746a-simple.h"
+#    include "is31fl3746a-mono.h"
 #elif defined(LED_MATRIX_SNLED27351)
-#    include "snled27351-simple.h"
+#    include "snled27351-mono.h"
 #endif
 
 typedef struct {