summaryrefslogtreecommitdiff
path: root/keyboards/kprepublic/bm60hsrgb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kprepublic/bm60hsrgb')
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/config.h72
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/info.json48
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c41
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md5
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/config.h60
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/info.json46
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/rev2.c140
7 files changed, 163 insertions, 249 deletions
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
deleted file mode 100644
index 6a3bee5a52..0000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 69
-# define RGB_MATRIX_KEYPRESSES
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# define ENABLE_RGB_MATRIX_SPLASH
-# define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index 589f4310f7..31527a79fa 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -12,7 +12,53 @@
"pin": "E2"
},
"rgb_matrix": {
- "driver": "ws2812"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": 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,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 180
},
"rgblight": {
"max_brightness": 180
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
deleted file mode 100644
index da5aa92901..0000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 jbradforddillon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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 QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(1,KC_DEL),
- KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(2), KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [1] = LAYOUT(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
- _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [2] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
- _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
- )
-
-};
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md
deleted file mode 100644
index aa2009e1e8..0000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-I set this up the same way I set up my dz60 boards.
-- Apple layout,
-- Capslock replaced with grave/tilde,
-- RShift doubles as forward slash, and
-- Delete doubles as a layer shift.
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index e4089e9fd5..1d2b071fc1 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -15,66 +15,13 @@
*/
#pragma once
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-
-#define RGB_MATRIX_KEYPRESSES
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define DRIVER_1_LED_TOTAL 63
-//#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define IS31FL3733_LED_COUNT 63
#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
#define RGB_MATRIX_DISABLE_KEYCODES
#endif
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define IS31FL3733_LED_COUNT DRIVER_1_LED_TOTAL
-
// Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
// don't use those LEDs in RGB Matrix in that case.
#ifdef RGBLIGHT_ENABLE
@@ -84,8 +31,3 @@
#endif
#define RGB_MATRIX_LED_COUNT (IS31FL3733_LED_COUNT + WS2812_LED_TOTAL)
-
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 47c0b8081a..9a77549e68 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -12,7 +12,48 @@
"pin": "F0"
},
"rgb_matrix": {
- "driver": "custom"
+ "animations":{
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": 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,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "custom",
+ "max_brightness": 120,
+ "sleep": true
},
"rgblight": {
"saturation_steps": 8,
@@ -30,6 +71,9 @@
"rgb_test": true,
"alternating": true,
"twinkle": true
+ },
+ "default": {
+ "animation": "rainbow_mood"
}
},
"matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 0e9b3d318d..3ee74755fa 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -23,73 +23,73 @@
# include "ws2812.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
-
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
-
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_14, G_14, I_14 },
-
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
-
- { 0, H_16, G_16, I_16 },
- { 0, H_15, G_15, I_15 },
- { 0, H_13, G_13, I_13 },
- { 0, E_15, D_15, F_15 },
- { 0, K_15, J_15, L_15 },
- { 0, K_11, J_11, L_11 },
- { 0, K_16, J_16, L_16 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 }
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
};
led_config_t g_led_config = {
@@ -153,16 +153,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
- is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+ is31fl3733_init(0);
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
}
- is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_led_control_registers(0);
}
static void rgb_matrix_driver_flush(void) {
- is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+ is31fl3733_update_pwm_buffers(0);
# if WS2812_LED_TOTAL > 0
ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
# endif