summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/olly
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin/olly')
-rw-r--r--keyboards/mechlovin/olly/octagon/config.h31
-rw-r--r--keyboards/mechlovin/olly/octagon/info.json25
-rw-r--r--keyboards/mechlovin/olly/octagon/octagon.c2
3 files changed, 28 insertions, 30 deletions
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 88918506eb..6f9d5f9a02 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,37 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef LED_MATRIX_ENABLE
#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
+
+#define LED_MATRIX_LED_COUNT 94
+
#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/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index b5eb828bc8..185ee32a3e 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -16,7 +16,7 @@
#include "quantum.h"
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | LED address