diff options
author | Nick Brassel <[email protected]> | 2023-11-28 16:39:48 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2023-11-28 16:40:47 +1100 |
commit | 0115951de12bd4c798a43a380651c34552552e85 (patch) | |
tree | 62999011ae782d93aa6dc9c889615db2a840cafc /keyboards/ferris | |
parent | 0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff) | |
parent | 4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff) | |
download | qmk_firmware-0.23.0.tar.gz qmk_firmware-0.23.0.zip |
`develop` -> `master`, 2023q4 edition0.23.0
Diffstat (limited to 'keyboards/ferris')
-rw-r--r-- | keyboards/ferris/0_1/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/ferris/0_2/bling/bling.c | 2 | ||||
-rw-r--r-- | keyboards/ferris/0_2/bling/config.h | 5 | ||||
-rw-r--r-- | keyboards/ferris/0_2/rules.mk | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk index 487375928e..f971aa9a48 100644 --- a/keyboards/ferris/0_1/rules.mk +++ b/keyboards/ferris/0_1/rules.mk @@ -16,4 +16,4 @@ NO_USB_STARTUP_CHECK = yes LTO_ENABLE = yes SRC += matrix.c -QUANTUM_LIB_SRC += i2c_master.c +I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/ferris/0_2/bling/bling.c b/keyboards/ferris/0_2/bling/bling.c index 8af1d33e85..07f58149cc 100644 --- a/keyboards/ferris/0_2/bling/bling.c +++ b/keyboards/ferris/0_2/bling/bling.c @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | | 4 | | || | | 4 | | | 6 | | | 2 || 2 | | | 5 | */ -const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h index cbb3b11c90..64e7a6de2d 100644 --- a/keyboards/ferris/0_2/bling/config.h +++ b/keyboards/ferris/0_2/bling/config.h @@ -18,9 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once /* LED Drivers */ -#define DRIVER_ADDR_1 0b1110100 -#define DRIVER_ADDR_2 0b1110101 -#define DRIVER_COUNT 2 +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL #define DRIVER_1_LED_TOTAL 7 #define DRIVER_2_LED_TOTAL 7 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index f3760b7b62..6f67e3dece 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/rules.mk @@ -16,6 +16,6 @@ NO_USB_STARTUP_CHECK = yes LTO_ENABLE = no SRC += matrix.c -QUANTUM_LIB_SRC += i2c_master.c +I2C_DRIVER_REQUIRED = yes DEFAULT_FOLDER = ferris/0_2/base |