gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-05 01:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2024-01-04 06:06:08 +00:00
commit 09d1d3bea9
35 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builddefs/common_features.mk
View File

@ -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

2
docs/feature_led_matrix.md
View File

@ -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

2
drivers/led/issi/is31fl3218-simple.c → drivers/led/issi/is31fl3218-mono.c
View File

@ -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
drivers/led/issi/is31fl3218-simple.h → drivers/led/issi/is31fl3218-mono.h
View File

2
drivers/led/issi/is31fl3731-simple.c → drivers/led/issi/is31fl3731-mono.c
View File

@ -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
drivers/led/issi/is31fl3731-simple.h → drivers/led/issi/is31fl3731-mono.h
View File

2
drivers/led/issi/is31fl3733-simple.c → drivers/led/issi/is31fl3733-mono.c
View File

@ -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
drivers/led/issi/is31fl3733-simple.h → drivers/led/issi/is31fl3733-mono.h
View File

2
drivers/led/issi/is31fl3736-simple.c → drivers/led/issi/is31fl3736-mono.c
View File

@ -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
drivers/led/issi/is31fl3736-simple.h → drivers/led/issi/is31fl3736-mono.h
View File

2
drivers/led/issi/is31fl3737-simple.c → drivers/led/issi/is31fl3737-mono.c
View File

@ -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
drivers/led/issi/is31fl3737-simple.h → drivers/led/issi/is31fl3737-mono.h
View File

2
drivers/led/issi/is31fl3741-simple.c → drivers/led/issi/is31fl3741-mono.c
View File

@ -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
drivers/led/issi/is31fl3741-simple.h → drivers/led/issi/is31fl3741-mono.h
View File

2
drivers/led/issi/is31fl3742a-simple.c → drivers/led/issi/is31fl3742a-mono.c
View File

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

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

2
drivers/led/issi/is31fl3743a-simple.c → drivers/led/issi/is31fl3743a-mono.c
View File

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

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

2
drivers/led/issi/is31fl3745-simple.c → drivers/led/issi/is31fl3745-mono.c
View File

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

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

2
drivers/led/issi/is31fl3746a-simple.c → drivers/led/issi/is31fl3746a-mono.c
View File

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

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

2
drivers/led/snled27351-simple.c → drivers/led/snled27351-mono.c
View File

@ -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
drivers/led/snled27351-simple.h → drivers/led/snled27351-mono.h
View File

2
keyboards/fallacy/indicators.c
View File

@ -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.

2
keyboards/fallacy/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt60_a/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt65_a/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt65_b/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt75_a/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt75_b/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt75_c/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt80_a/rules.mk
View File

@ -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

2
keyboards/wilba_tech/wt_mono_backlight.c
View File

@ -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

22
quantum/led_matrix/led_matrix_drivers.h
View File

@ -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 {