From 709d07aebc38e6edd4e0f41d80792a7230c5180f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 1 Jan 2024 01:33:20 +0000 Subject: Migrate LED Matrix config to info.json (#22792) --- keyboards/mechlovin/olly/octagon/config.h | 29 +-------------------------- keyboards/mechlovin/olly/octagon/info.json | 25 ++++++++++++++++++++++- keyboards/mechlovin/zed65/mono_led/config.h | 30 +--------------------------- keyboards/mechlovin/zed65/mono_led/info.json | 25 ++++++++++++++++++++++- 4 files changed, 50 insertions(+), 59 deletions(-) (limited to 'keyboards/mechlovin') diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h index 88918506eb..791bfee784 100644 --- a/keyboards/mechlovin/olly/octagon/config.h +++ b/keyboards/mechlovin/olly/octagon/config.h @@ -17,37 +17,10 @@ along with this program. If not, see . #pragma once -#ifdef LED_MATRIX_ENABLE #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA + #define I2C_DRIVER I2CD2 #define I2C1_SCL_PIN B10 #define I2C1_SDA_PIN B11 -#define LED_MATRIX_LED_COUNT 94 -#define LED_MATRIX_KEYPRESSES // reacts to keypresses -#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects -#define ENABLE_LED_MATRIX_ALPHAS_MODS -#define ENABLE_LED_MATRIX_BREATHING -#define ENABLE_LED_MATRIX_BAND -#define ENABLE_LED_MATRIX_BAND_PINWHEEL -#define ENABLE_LED_MATRIX_BAND_SPIRAL -#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN -#define ENABLE_LED_MATRIX_CYCLE_OUT_IN -#define ENABLE_LED_MATRIX_DUAL_BEACON -#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_WAVE_UP_DOWN -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_LED_MATRIX_SOLID_SPLASH -#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH - #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -#endif diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 3621f491d8..3ef290d351 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -29,7 +29,30 @@ "pin": "A7" }, "led_matrix": { - "driver": "is31fl3731" + "animations":{ + "alphas_mods": true, + "breathing": true, + "band": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "wave_left_right": true, + "wave_up_down": true + }, + "driver": "is31fl3731", + "react_on_keyup": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h index 811841d7fe..e31259438a 100644 --- a/keyboards/mechlovin/zed65/mono_led/config.h +++ b/keyboards/mechlovin/zed65/mono_led/config.h @@ -17,38 +17,10 @@ along with this program. If not, see . #pragma once -#ifdef LED_MATRIX_ENABLE #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA + #define I2C_DRIVER I2CD2 #define I2C1_SCL_PIN B10 #define I2C1_SDA_PIN B11 -#define LED_MATRIX_LED_COUNT 70 -#define LED_MATRIX_KEYPRESSES // reacts to keypresses -#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects -#define ENABLE_LED_MATRIX_ALPHAS_MODS -#define ENABLE_LED_MATRIX_BREATHING -#define ENABLE_LED_MATRIX_BAND -#define ENABLE_LED_MATRIX_BAND_PINWHEEL -#define ENABLE_LED_MATRIX_BAND_SPIRAL -#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN -#define ENABLE_LED_MATRIX_CYCLE_OUT_IN -#define ENABLE_LED_MATRIX_DUAL_BEACON -#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_WAVE_UP_DOWN -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_LED_MATRIX_SOLID_SPLASH -#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH - #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -#define VIA_QMK_LED_MATRIX_ENABLE -#endif diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index 228d2c50d5..aa46b1bd8b 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -30,7 +30,30 @@ "pin": "A7" }, "led_matrix": { - "driver": "is31fl3731" + "animations":{ + "alphas_mods": true, + "breathing": true, + "band": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "wave_left_right": true, + "wave_up_down": true + }, + "driver": "is31fl3731", + "react_on_keyup": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], -- cgit v1.2.3