diff options
Diffstat (limited to 'keyboards/melgeek')
56 files changed, 1557 insertions, 1918 deletions
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h index cc4d7bc6bf..68088ba745 100755 --- a/keyboards/melgeek/mach80/config.h +++ b/keyboards/melgeek/mach80/config.h @@ -16,58 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -#define DISABLE_RGB_MATRIX_SPLASH -#define DISABLE_RGB_MATRIX_MULTISPLASH -#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND - -#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_FRACTAL -#define ENABLE_RGB_MATRIX_PIXEL_RAIN - -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN - -#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 IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json index e084dda413..ade831fc36 100755 --- a/keyboards/melgeek/mach80/info.json +++ b/keyboards/melgeek/mach80/info.json @@ -11,6 +11,60 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, + "rgb_matrix": { + "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_fractal": true, + "pixel_rain": 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 + }, + "center_point": [108, 30], + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h index 072419e163..960bf58c52 100755 --- a/keyboards/melgeek/mach80/rev1/config.h +++ b/keyboards/melgeek/mach80/rev1/config.h @@ -16,9 +16,4 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 97 #define DRIVER_INDICATOR_LED_TOTAL 3 - - -#define RGB_MATRIX_CENTER { 108, 30 } - diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json index 1d7d87b76f..af9f7c2669 100644 --- a/keyboards/melgeek/mach80/rev1/info.json +++ b/keyboards/melgeek/mach80/rev1/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c index 9e5c2d8b81..a4b49610cc 100755 --- a/keyboards/melgeek/mach80/rev1/rev1.c +++ b/keyboards/melgeek/mach80/rev1/rev1.c @@ -19,104 +19,104 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */ - {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */ - {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */ - {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */ - {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */ - {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */ - {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */ - {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */ - {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */ - {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */ - {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */ - {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */ - {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */ - {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */ - {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */ - {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */ - {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */ - {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */ - {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */ - {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */ - {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB110 */ - {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB111 */ - {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB112 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */ + {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */ + {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */ + {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */ + {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */ + {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */ + {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */ + {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */ + {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */ + {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */ + {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */ + {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */ + {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */ + {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */ + {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */ + {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */ + {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */ + {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */ + {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */ + {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */ + {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB110 */ + {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB111 */ + {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB112 */ }; led_config_t g_led_config = { { @@ -145,9 +145,9 @@ led_config_t g_led_config = { }; const is31fl3741_led_t g_is31_indicator_leds[3] = { - {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */ - {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */ - {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */ + {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */ + {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */ + {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */ }; bool led_update_kb(led_t led_state) { @@ -179,15 +179,8 @@ void matrix_init_kb(void) { is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); } - is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0); + is31fl3741_update_led_control_registers(0); matrix_init_user(); } - - -void keyboard_pre_init_kb(void) { - setPinOutput(B7); - writePinHigh(B7); - keyboard_pre_init_user(); -} #endif diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h index 10d3bde47a..960bf58c52 100755 --- a/keyboards/melgeek/mach80/rev2/config.h +++ b/keyboards/melgeek/mach80/rev2/config.h @@ -16,9 +16,4 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 94 #define DRIVER_INDICATOR_LED_TOTAL 3 - - -#define RGB_MATRIX_CENTER { 108, 30 } - diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json index 1d7d87b76f..af9f7c2669 100644 --- a/keyboards/melgeek/mach80/rev2/info.json +++ b/keyboards/melgeek/mach80/rev2/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c index e9fdc2517f..1a759f38c6 100755 --- a/keyboards/melgeek/mach80/rev2/rev2.c +++ b/keyboards/melgeek/mach80/rev2/rev2.c @@ -19,101 +19,101 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */ - {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */ - {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */ - {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */ - {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */ - {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */ - {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */ - {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */ - {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */ - {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */ - {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */ - {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */ - {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */ - {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */ - {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */ - {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */ - {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */ - {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */ - {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */ - {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */ + {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */ + {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */ + {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */ + {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */ + {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */ + {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */ + {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */ + {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */ + {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */ + {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */ + {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */ + {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */ + {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */ + {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */ + {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */ + {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */ + {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */ + {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */ + {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */ }; led_config_t g_led_config = { { @@ -143,9 +143,9 @@ led_config_t g_led_config = { }; const is31fl3741_led_t g_is31_indicator_leds[3] = { - {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */ - {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */ - {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */ + {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */ + {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */ + {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */ }; bool led_update_kb(led_t led_state) { @@ -177,15 +177,8 @@ void matrix_init_kb(void) { is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); } - is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0); + is31fl3741_update_led_control_registers(0); matrix_init_user(); } - - -void keyboard_pre_init_kb(void) { - setPinOutput(B7); - writePinHigh(B7); - keyboard_pre_init_user(); -} #endif diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h index 704699ece9..010e035e2e 100644 --- a/keyboards/melgeek/mj61/config.h +++ b/keyboards/melgeek/mj61/config.h @@ -16,58 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json index 3e62cbf28a..d34dc59364 100644 --- a/keyboards/melgeek/mj61/info.json +++ b/keyboards/melgeek/mj61/info.json @@ -12,6 +12,57 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "debounce": 3, + "rgb_matrix": { + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h deleted file mode 100644 index ea29d94b9b..0000000000 --- a/keyboards/melgeek/mj61/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 63 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json index 705023fb8e..67a4a004d6 100644 --- a/keyboards/melgeek/mj61/rev1/info.json +++ b/keyboards/melgeek/mj61/rev1/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c index 76fcb64c37..3ee0da5183 100644 --- a/keyboards/melgeek/mj61/rev1/rev1.c +++ b/keyboards/melgeek/mj61/rev1/rev1.c @@ -17,70 +17,70 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB1 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB2 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB3 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB4 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB5 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB6 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB7 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB8 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB9 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB10 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB11 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB12 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB13 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB14 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB15 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB16 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB17 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB18 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB19 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB20 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB21 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB22 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB23 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB24 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB25 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB26 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB27 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB28 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB29 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB30 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB31 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB32 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB33 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB34 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB35 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB36 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB37 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB38 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB39 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB40 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB41 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB42 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB43 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB44 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB45 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB46 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB47 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB48 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB49 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB50 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB51 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB52 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB53 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB54 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB55 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB56 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB57 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB58 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB59 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */ }; led_config_t g_led_config = { @@ -116,9 +116,3 @@ void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } #endif - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h deleted file mode 100644 index 0cd072eb4b..0000000000 --- a/keyboards/melgeek/mj61/rev2/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 71 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json index 62b2c58f15..62c5827117 100644 --- a/keyboards/melgeek/mj61/rev2/info.json +++ b/keyboards/melgeek/mj61/rev2/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c index 9d13d52ebc..71d41c16b3 100644 --- a/keyboards/melgeek/mj61/rev2/rev2.c +++ b/keyboards/melgeek/mj61/rev2/rev2.c @@ -19,78 +19,78 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ }; led_config_t g_led_config = { @@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } #endif - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} diff --git a/keyboards/melgeek/mj63/config.h b/keyboards/melgeek/mj63/config.h index 704699ece9..010e035e2e 100644 --- a/keyboards/melgeek/mj63/config.h +++ b/keyboards/melgeek/mj63/config.h @@ -16,58 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mj63/info.json b/keyboards/melgeek/mj63/info.json index ecd3b0fff6..c81bf9f867 100644 --- a/keyboards/melgeek/mj63/info.json +++ b/keyboards/melgeek/mj63/info.json @@ -12,6 +12,57 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "debounce": 3, + "rgb_matrix": { + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true + }, "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/melgeek/mj63/rev1/config.h b/keyboards/melgeek/mj63/rev1/config.h deleted file mode 100644 index 8abf7f5595..0000000000 --- a/keyboards/melgeek/mj63/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 65 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json index 705023fb8e..67a4a004d6 100644 --- a/keyboards/melgeek/mj63/rev1/info.json +++ b/keyboards/melgeek/mj63/rev1/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj63/rev1/rev1.c b/keyboards/melgeek/mj63/rev1/rev1.c index 69e7ab5da6..e3baf32de7 100644 --- a/keyboards/melgeek/mj63/rev1/rev1.c +++ b/keyboards/melgeek/mj63/rev1/rev1.c @@ -19,72 +19,72 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */ }; led_config_t g_led_config = { @@ -119,12 +119,4 @@ void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); suspend_wakeup_init_user(); } - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} - #endif - diff --git a/keyboards/melgeek/mj63/rev2/config.h b/keyboards/melgeek/mj63/rev2/config.h deleted file mode 100644 index 0cd072eb4b..0000000000 --- a/keyboards/melgeek/mj63/rev2/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 71 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json index 62b2c58f15..62c5827117 100644 --- a/keyboards/melgeek/mj63/rev2/info.json +++ b/keyboards/melgeek/mj63/rev2/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj63/rev2/rev2.c b/keyboards/melgeek/mj63/rev2/rev2.c index 5ab9cdb65a..418092ec9f 100644 --- a/keyboards/melgeek/mj63/rev2/rev2.c +++ b/keyboards/melgeek/mj63/rev2/rev2.c @@ -19,78 +19,78 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */ }; led_config_t g_led_config = { @@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } #endif - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h index 704699ece9..010e035e2e 100644 --- a/keyboards/melgeek/mj64/config.h +++ b/keyboards/melgeek/mj64/config.h @@ -16,58 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json index cbc73a262a..731996ef84 100644 --- a/keyboards/melgeek/mj64/info.json +++ b/keyboards/melgeek/mj64/info.json @@ -12,6 +12,57 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "debounce": 3, + "rgb_matrix": { + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true + }, "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h deleted file mode 100644 index ab8fcd6e09..0000000000 --- a/keyboards/melgeek/mj64/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 66 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json index 705023fb8e..67a4a004d6 100644 --- a/keyboards/melgeek/mj64/rev1/info.json +++ b/keyboards/melgeek/mj64/rev1/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c index fff946b20a..b9609cad1e 100644 --- a/keyboards/melgeek/mj64/rev1/rev1.c +++ b/keyboards/melgeek/mj64/rev1/rev1.c @@ -18,71 +18,71 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ }; led_config_t g_led_config = { @@ -116,11 +116,4 @@ void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); suspend_wakeup_init_user(); } - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} - #endif diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h deleted file mode 100644 index ab8fcd6e09..0000000000 --- a/keyboards/melgeek/mj64/rev2/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 66 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json index 705023fb8e..67a4a004d6 100644 --- a/keyboards/melgeek/mj64/rev2/info.json +++ b/keyboards/melgeek/mj64/rev2/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c index 35da35b2e4..16c8e1f612 100644 --- a/keyboards/melgeek/mj64/rev2/rev2.c +++ b/keyboards/melgeek/mj64/rev2/rev2.c @@ -18,73 +18,73 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */ }; led_config_t g_led_config = { @@ -119,12 +119,4 @@ void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); suspend_wakeup_init_user(); } - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} - #endif - diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h deleted file mode 100644 index a5a1fbf3e0..0000000000 --- a/keyboards/melgeek/mj64/rev3/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 72 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json index 62b2c58f15..62c5827117 100644 --- a/keyboards/melgeek/mj64/rev3/info.json +++ b/keyboards/melgeek/mj64/rev3/info.json @@ -1,7 +1,4 @@ { - "rgb_matrix": { - "driver": "is31fl3741" - }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c index 942bda1487..7af80c7388 100644 --- a/keyboards/melgeek/mj64/rev3/rev3.c +++ b/keyboards/melgeek/mj64/rev3/rev3.c @@ -18,79 +18,79 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */ }; led_config_t g_led_config = { @@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } #endif - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h index 704699ece9..010e035e2e 100644 --- a/keyboards/melgeek/mj65/config.h +++ b/keyboards/melgeek/mj65/config.h @@ -16,58 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json index 061b4bc83e..773c9a3198 100644 --- a/keyboards/melgeek/mj65/info.json +++ b/keyboards/melgeek/mj65/info.json @@ -9,7 +9,55 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "is31fl3741" + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"], diff --git a/keyboards/melgeek/mj65/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h deleted file mode 100644 index 7fc5f0afd1..0000000000 --- a/keyboards/melgeek/mj65/rev3/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 76 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c index 6d851aa847..1392d5af4e 100644 --- a/keyboards/melgeek/mj65/rev3/rev3.c +++ b/keyboards/melgeek/mj65/rev3/rev3.c @@ -18,83 +18,83 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */ - {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB73 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB74 */ - {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB75 */ - {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB76 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */ + {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB73 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB74 */ + {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB75 */ + {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB76 */ }; led_config_t g_led_config = { @@ -131,9 +131,3 @@ void suspend_wakeup_init_kb(void) { } #endif - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h index 288c8e3a3e..b3932491c1 100755 --- a/keyboards/melgeek/mj6xy/rev3/config.h +++ b/keyboards/melgeek/mj6xy/rev3/config.h @@ -16,5 +16,4 @@ #pragma once -# define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) -# define RGBLIGHT_DEFAULT_SPD 10 +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json index dba086e493..e690065639 100644 --- a/keyboards/melgeek/mj6xy/rev3/info.json +++ b/keyboards/melgeek/mj6xy/rev3/info.json @@ -24,6 +24,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 10 } }, "ws2812": { diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h index e661efb2a9..68088ba745 100755 --- a/keyboards/melgeek/mojo68/config.h +++ b/keyboards/melgeek/mojo68/config.h @@ -16,57 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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_FRACTAL -// # define ENABLE_RGB_MATRIX_PIXEL_RAIN -// 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 RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json index 7e160d0c59..8938bd8a13 100755 --- a/keyboards/melgeek/mojo68/info.json +++ b/keyboards/melgeek/mojo68/info.json @@ -9,7 +9,52 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "is31fl3741" + "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, + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h index 2a93a475cf..960bf58c52 100755 --- a/keyboards/melgeek/mojo68/rev1/config.h +++ b/keyboards/melgeek/mojo68/rev1/config.h @@ -16,5 +16,4 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 68 #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c index cd6d4ec413..af17d96c6d 100755 --- a/keyboards/melgeek/mojo68/rev1/rev1.c +++ b/keyboards/melgeek/mojo68/rev1/rev1.c @@ -18,75 +18,75 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ }; led_config_t g_led_config = { @@ -113,9 +113,9 @@ led_config_t g_led_config = { }; const is31fl3741_led_t g_is31_indicator_leds[3] = { - {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB124 */ - {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB125 */ - {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB126 */ + {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB124 */ + {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB125 */ + {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB126 */ }; bool led_update_kb(led_t led_state) { @@ -147,15 +147,8 @@ void matrix_init_kb(void) { is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); } - is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0); + is31fl3741_update_led_control_registers(0); matrix_init_user(); } - - -void keyboard_pre_init_kb(void) { - setPinOutput(B7); - writePinHigh(B7); - keyboard_pre_init_user(); -} #endif diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h index a4e89e5a90..010e035e2e 100644 --- a/keyboards/melgeek/mojo75/config.h +++ b/keyboards/melgeek/mojo75/config.h @@ -16,59 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json index c22c5710a5..e934cb9f4b 100644 --- a/keyboards/melgeek/mojo75/info.json +++ b/keyboards/melgeek/mojo75/info.json @@ -9,7 +9,55 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "is31fl3741" + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h deleted file mode 100644 index 44435f2220..0000000000 --- a/keyboards/melgeek/mojo75/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 92 -#define DRIVER_INDICATOR_LED_TOTAL 0 - diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c index e64c163c78..18daafebf8 100644 --- a/keyboards/melgeek/mojo75/rev1/rev1.c +++ b/keyboards/melgeek/mojo75/rev1/rev1.c @@ -18,99 +18,99 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */ - {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */ - {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB3 */ - {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB4 */ - {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB5 */ - {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* RGB6 */ - {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB7 */ - {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB8 */ - {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* RGB9 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */ - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB10 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB11 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB12 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB13 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB14 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB15 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB16 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB17 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB18 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB22 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB23 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB24 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB31 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB32 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB33 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */ - {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB40 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB41 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB42 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */ - {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */ - {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */ - {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */ - {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */ - {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */ - {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */ - {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB49 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB50 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB51 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */ - {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */ - {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */ - {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB1 */ + {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB2 */ + {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB3 */ + {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* RGB4 */ + {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB5 */ + {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* RGB6 */ + {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB7 */ + {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* RGB8 */ + {0, SW9_CS6, SW9_CS5, SW9_CS4}, /* RGB9 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB55 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB56 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB57 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB58 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB59 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB60 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB61 */ + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB10 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB11 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB12 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB13 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB14 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB15 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB16 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB17 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB18 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB62 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB63 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB64 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB65 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB66 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB67 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB68 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB69 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB19 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB20 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB21 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB22 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB23 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB24 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB25 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB26 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB27 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB70 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB71 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB72 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB86 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB73 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB74 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB28 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB29 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB30 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB31 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB32 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB33 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB34 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB35 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB36 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB75 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB76 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB77 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB78 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB79 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB80 */ + {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB91 */ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB37 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB38 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB39 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB40 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB41 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB42 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB43 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB44 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB45 */ + {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB84 */ + {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB83 */ + {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB82 */ + {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */ + {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB81 */ + {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB87 */ + {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB89 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB46 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB47 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB48 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB49 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB50 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB51 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB52 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB53 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB54 */ + {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB88 */ + {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB92 */ + {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB90 */ }; led_config_t g_led_config = { @@ -149,12 +149,4 @@ void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); suspend_wakeup_init_user(); } - -void keyboard_pre_init_kb(void) { - setPinOutput(A2); - writePinHigh(A2); - keyboard_pre_init_user(); -} - #endif - diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h index 723706d610..68088ba745 100755 --- a/keyboards/melgeek/tegic/config.h +++ b/keyboards/melgeek/tegic/config.h @@ -16,55 +16,5 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND - -#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_FRACTAL -#define ENABLE_RGB_MATRIX_PIXEL_RAIN - -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN - -#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 IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json index c54f53ca61..755ae3db3e 100644 --- a/keyboards/melgeek/tegic/info.json +++ b/keyboards/melgeek/tegic/info.json @@ -9,7 +9,58 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "is31fl3741" + "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_fractal": true, + "pixel_rain": 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 + }, + "center_point": [84, 24], + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h deleted file mode 100755 index bba7c01f5f..0000000000 --- a/keyboards/melgeek/tegic/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 91 -//#define DRIVER_INDICATOR_LED_TOTAL 3 - - -#define RGB_MATRIX_CENTER { 84, 24 } - diff --git a/keyboards/melgeek/tegic/rev1/rev1.c b/keyboards/melgeek/tegic/rev1/rev1.c index 6dc2e8d180..b087264919 100755 --- a/keyboards/melgeek/tegic/rev1/rev1.c +++ b/keyboards/melgeek/tegic/rev1/rev1.c @@ -19,103 +19,103 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ - {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ - {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ - {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */ - {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */ - {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */ - {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */ - {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */ - {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */ + {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */ + {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */ + {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */ + {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */ + {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */ + {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */ + {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */ + {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */ + {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */ + {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */ + {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */ + {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */ + {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */ + {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */ - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */ + {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */ + {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */ + {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */ + {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */ + {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */ + {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */ + {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */ + {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */ + {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */ + {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */ + {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */ + {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */ + {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ + {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */ + {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */ + {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */ + {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */ - {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB127 */ - {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB128 */ - {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB129 */ - {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB130 */ - {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB136 */ - {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB135 */ + {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */ + {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */ + {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */ + {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */ + {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */ + {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */ + {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */ + {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */ + {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */ + {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB127 */ + {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB128 */ + {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB129 */ + {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB130 */ + {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB136 */ + {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB135 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ - {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB138 */ - {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB139 */ - {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB137 */ - {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB131 */ - {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB132 */ - {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB133*/ + {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */ + {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */ + {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */ + {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */ + {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */ + {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */ + {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */ + {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */ + {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */ + {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB138 */ + {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB139 */ + {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB137 */ + {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB131 */ + {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB132 */ + {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB133*/ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */ - {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB134 */ - {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB145 */ - {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB144*/ - {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB148 */ - {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB147 */ - {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB146 */ - {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB140 */ - {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB141 */ + {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */ + {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */ + {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */ + {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */ + {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */ + {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */ + {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */ + {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */ + {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */ + {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB134 */ + {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB145 */ + {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB144*/ + {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB148 */ + {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB147 */ + {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB146 */ + {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB140 */ + {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB141 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */ - {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB142 */ - {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB143 */ - {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB149 */ + {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */ + {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */ + {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */ + {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */ + {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */ + {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */ + {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */ + {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */ + {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ + {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB142 */ + {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB143 */ + {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB149 */ }; led_config_t g_led_config = { { @@ -142,14 +142,4 @@ led_config_t g_led_config = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, } }; - - - - #endif - -void keyboard_pre_init_kb(void) { - setPinOutput(B7); - writePinHigh(B7); - keyboard_pre_init_user(); -} diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h index d78cbab672..5d5ce04668 100644 --- a/keyboards/melgeek/z70ultra/config.h +++ b/keyboards/melgeek/z70ultra/config.h @@ -16,60 +16,6 @@ #pragma once -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// 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 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define RGB_MATRIX_LED_COUNT 69 + #define DRIVER_INDICATOR_LED_TOTAL 6 diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json index ae555e046b..471929f9db 100644 --- a/keyboards/melgeek/z70ultra/info.json +++ b/keyboards/melgeek/z70ultra/info.json @@ -9,7 +9,55 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "is31fl3741" + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true }, "matrix_pins": { "cols": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"], diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c index f978edea92..1cb46df643 100644 --- a/keyboards/melgeek/z70ultra/z70ultra.c +++ b/keyboards/melgeek/z70ultra/z70ultra.c @@ -18,78 +18,78 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */ - {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */ - {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */ - {0, CS28_SW4, CS30_SW4, CS29_SW4}, /* RGB13 */ - {0, CS28_SW5, CS30_SW5, CS29_SW5}, /* RGB14 */ - {0, CS28_SW6, CS30_SW6, CS29_SW6}, /* RGB15 */ - {0, CS28_SW7, CS30_SW7, CS29_SW7}, /* RGB16 */ - {0, CS28_SW8, CS30_SW8, CS29_SW8}, /* RGB17 */ - {0, CS28_SW9, CS30_SW9, CS29_SW9}, /* RGB18 */ - {0, CS31_SW1, CS33_SW1, CS32_SW1}, /* RGB28 */ - {0, CS31_SW2, CS33_SW2, CS32_SW2}, /* RGB29 */ - {0, CS31_SW3, CS33_SW3, CS32_SW3}, /* RGB30 */ - {0, CS31_SW4, CS33_SW4, CS32_SW4}, /* RGB31 */ - {0, CS31_SW5, CS33_SW5, CS32_SW5}, /* RGB32 */ - {0, CS31_SW6, CS33_SW6, CS32_SW6}, /* RGB33 */ - {0, CS25_SW1, CS27_SW1, CS26_SW1}, /* RGB1 */ - {0, CS25_SW2, CS27_SW2, CS26_SW2}, /* RGB2 */ - {0, CS25_SW3, CS27_SW3, CS26_SW3}, /* RGB3 */ - {0, CS25_SW4, CS27_SW4, CS26_SW4}, /* RGB4 */ - {0, CS25_SW5, CS27_SW5, CS26_SW5}, /* RGB5 */ - {0, CS25_SW6, CS27_SW6, CS26_SW6}, /* RGB6 */ - {0, CS25_SW7, CS27_SW7, CS26_SW7}, /* RGB7 */ - {0, CS25_SW8, CS27_SW8, CS26_SW8}, /* RGB8 */ - {0, CS25_SW9, CS27_SW9, CS26_SW9}, /* RGB9 */ - {0, CS34_SW1, CS36_SW1, CS35_SW1}, /* RGB46 */ - {0, CS34_SW2, CS36_SW2, CS35_SW2}, /* RGB47 */ - {0, CS34_SW3, CS36_SW3, CS35_SW3}, /* RGB48 */ - {0, CS34_SW4, CS36_SW4, CS35_SW4}, /* RGB49 */ - {0, CS34_SW5, CS36_SW5, CS35_SW5}, /* RGB50 */ - {0, CS31_SW7, CS33_SW7, CS32_SW7}, /* RGB34 */ - {0, CS22_SW1, CS24_SW1, CS23_SW1}, /* RGB37 */ - {0, CS22_SW2, CS24_SW2, CS23_SW2}, /* RGB38 */ - {0, CS22_SW3, CS24_SW3, CS23_SW3}, /* RGB39 */ - {0, CS22_SW4, CS24_SW4, CS23_SW4}, /* RGB40 */ - {0, CS22_SW5, CS24_SW5, CS23_SW5}, /* RGB41 */ - {0, CS22_SW6, CS24_SW6, CS23_SW6}, /* RGB42 */ - {0, CS22_SW7, CS24_SW7, CS23_SW7}, /* RGB43 */ - {0, CS22_SW8, CS24_SW8, CS23_SW8}, /* RGB44 */ - {0, CS22_SW9, CS24_SW9, CS23_SW9}, /* RGB45 */ - {0, CS34_SW9, CS36_SW9, CS35_SW9}, /* RGB54 */ - {0, CS34_SW8, CS36_SW8, CS35_SW8}, /* RGB53 */ - {0, CS34_SW7, CS36_SW7, CS35_SW7}, /* RGB52 */ - {0, CS34_SW6, CS36_SW6, CS35_SW6}, /* RGB51 */ - {0, CS31_SW8, CS33_SW8, CS32_SW8}, /* RGB35 */ - {0, CS19_SW2, CS21_SW2, CS20_SW2}, /* RGB56 */ - {0, CS19_SW4, CS21_SW4, CS20_SW4}, /* RGB60 */ - {0, CS19_SW5, CS21_SW5, CS20_SW5}, /* RGB59 */ - {0, CS19_SW6, CS21_SW6, CS20_SW6}, /* RGB60 */ - {0, CS19_SW7, CS21_SW7, CS20_SW7}, /* RGB61 */ - {0, CS19_SW8, CS21_SW8, CS20_SW8}, /* RGB62 */ - {0, CS19_SW9, CS21_SW9, CS20_SW9}, /* RGB63 */ - {0, CS19_SW3, CS21_SW3, CS20_SW3}, /* RGB57 */ - {0, CS19_SW1, CS21_SW1, CS20_SW1}, /* RGB55 */ - {0, CS37_SW5, CS39_SW5, CS38_SW5}, /* RGB23 */ - {0, CS37_SW6, CS39_SW6, CS38_SW6}, /* RGB24 */ - {0, CS37_SW7, CS39_SW7, CS38_SW7}, /* RGB25 */ - {0, CS37_SW8, CS39_SW8, CS38_SW8}, /* RGB26 */ - {0, CS31_SW9, CS33_SW9, CS32_SW9}, /* RGB36 */ +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS28, SW1_CS30, SW1_CS29}, /* RGB10 */ + {0, SW2_CS28, SW2_CS30, SW2_CS29}, /* RGB11 */ + {0, SW3_CS28, SW3_CS30, SW3_CS29}, /* RGB12 */ + {0, SW4_CS28, SW4_CS30, SW4_CS29}, /* RGB13 */ + {0, SW5_CS28, SW5_CS30, SW5_CS29}, /* RGB14 */ + {0, SW6_CS28, SW6_CS30, SW6_CS29}, /* RGB15 */ + {0, SW7_CS28, SW7_CS30, SW7_CS29}, /* RGB16 */ + {0, SW8_CS28, SW8_CS30, SW8_CS29}, /* RGB17 */ + {0, SW9_CS28, SW9_CS30, SW9_CS29}, /* RGB18 */ + {0, SW1_CS31, SW1_CS33, SW1_CS32}, /* RGB28 */ + {0, SW2_CS31, SW2_CS33, SW2_CS32}, /* RGB29 */ + {0, SW3_CS31, SW3_CS33, SW3_CS32}, /* RGB30 */ + {0, SW4_CS31, SW4_CS33, SW4_CS32}, /* RGB31 */ + {0, SW5_CS31, SW5_CS33, SW5_CS32}, /* RGB32 */ + {0, SW6_CS31, SW6_CS33, SW6_CS32}, /* RGB33 */ + {0, SW1_CS25, SW1_CS27, SW1_CS26}, /* RGB1 */ + {0, SW2_CS25, SW2_CS27, SW2_CS26}, /* RGB2 */ + {0, SW3_CS25, SW3_CS27, SW3_CS26}, /* RGB3 */ + {0, SW4_CS25, SW4_CS27, SW4_CS26}, /* RGB4 */ + {0, SW5_CS25, SW5_CS27, SW5_CS26}, /* RGB5 */ + {0, SW6_CS25, SW6_CS27, SW6_CS26}, /* RGB6 */ + {0, SW7_CS25, SW7_CS27, SW7_CS26}, /* RGB7 */ + {0, SW8_CS25, SW8_CS27, SW8_CS26}, /* RGB8 */ + {0, SW9_CS25, SW9_CS27, SW9_CS26}, /* RGB9 */ + {0, SW1_CS34, SW1_CS36, SW1_CS35}, /* RGB46 */ + {0, SW2_CS34, SW2_CS36, SW2_CS35}, /* RGB47 */ + {0, SW3_CS34, SW3_CS36, SW3_CS35}, /* RGB48 */ + {0, SW4_CS34, SW4_CS36, SW4_CS35}, /* RGB49 */ + {0, SW5_CS34, SW5_CS36, SW5_CS35}, /* RGB50 */ + {0, SW7_CS31, SW7_CS33, SW7_CS32}, /* RGB34 */ + {0, SW1_CS22, SW1_CS24, SW1_CS23}, /* RGB37 */ + {0, SW2_CS22, SW2_CS24, SW2_CS23}, /* RGB38 */ + {0, SW3_CS22, SW3_CS24, SW3_CS23}, /* RGB39 */ + {0, SW4_CS22, SW4_CS24, SW4_CS23}, /* RGB40 */ + {0, SW5_CS22, SW5_CS24, SW5_CS23}, /* RGB41 */ + {0, SW6_CS22, SW6_CS24, SW6_CS23}, /* RGB42 */ + {0, SW7_CS22, SW7_CS24, SW7_CS23}, /* RGB43 */ + {0, SW8_CS22, SW8_CS24, SW8_CS23}, /* RGB44 */ + {0, SW9_CS22, SW9_CS24, SW9_CS23}, /* RGB45 */ + {0, SW9_CS34, SW9_CS36, SW9_CS35}, /* RGB54 */ + {0, SW8_CS34, SW8_CS36, SW8_CS35}, /* RGB53 */ + {0, SW7_CS34, SW7_CS36, SW7_CS35}, /* RGB52 */ + {0, SW6_CS34, SW6_CS36, SW6_CS35}, /* RGB51 */ + {0, SW8_CS31, SW8_CS33, SW8_CS32}, /* RGB35 */ + {0, SW2_CS19, SW2_CS21, SW2_CS20}, /* RGB56 */ + {0, SW4_CS19, SW4_CS21, SW4_CS20}, /* RGB60 */ + {0, SW5_CS19, SW5_CS21, SW5_CS20}, /* RGB59 */ + {0, SW6_CS19, SW6_CS21, SW6_CS20}, /* RGB60 */ + {0, SW7_CS19, SW7_CS21, SW7_CS20}, /* RGB61 */ + {0, SW8_CS19, SW8_CS21, SW8_CS20}, /* RGB62 */ + {0, SW9_CS19, SW9_CS21, SW9_CS20}, /* RGB63 */ + {0, SW3_CS19, SW3_CS21, SW3_CS20}, /* RGB57 */ + {0, SW1_CS19, SW1_CS21, SW1_CS20}, /* RGB55 */ + {0, SW5_CS37, SW5_CS39, SW5_CS38}, /* RGB23 */ + {0, SW6_CS37, SW6_CS39, SW6_CS38}, /* RGB24 */ + {0, SW7_CS37, SW7_CS39, SW7_CS38}, /* RGB25 */ + {0, SW8_CS37, SW8_CS39, SW8_CS38}, /* RGB26 */ + {0, SW9_CS31, SW9_CS33, SW9_CS32}, /* RGB36 */ - {0, CS6_SW1, CS8_SW1, CS7_SW1}, /* RGB64 */ - {0, CS6_SW3, CS8_SW3, CS7_SW3}, /* RGB66 */ - {0, CS6_SW4, CS8_SW4, CS7_SW4}, /* RGB67 */ - {0, CS6_SW5, CS8_SW5, CS7_SW5}, /* RGB69 */ - {0, CS6_SW6, CS8_SW6, CS7_SW6}, /* RGB70 */ - {0, CS6_SW2, CS8_SW2, CS7_SW2}, /* RGB65 */ + {0, SW1_CS6, SW1_CS8, SW1_CS7}, /* RGB64 */ + {0, SW3_CS6, SW3_CS8, SW3_CS7}, /* RGB66 */ + {0, SW4_CS6, SW4_CS8, SW4_CS7}, /* RGB67 */ + {0, SW5_CS6, SW5_CS8, SW5_CS7}, /* RGB69 */ + {0, SW6_CS6, SW6_CS8, SW6_CS7}, /* RGB70 */ + {0, SW2_CS6, SW2_CS8, SW2_CS7}, /* RGB65 */ - {0, CS37_SW1, CS39_SW1, CS38_SW1}, /* RGB19 */ - {0, CS37_SW2, CS39_SW2, CS38_SW2}, /* RGB20 */ - {0, CS37_SW3, CS39_SW3, CS38_SW3}, /* RGB21 */ - {0, CS37_SW4, CS39_SW4, CS38_SW4}, /* RGB22 */ - {0, CS37_SW9, CS39_SW9, CS38_SW9}, /* RGB27 */ + {0, SW1_CS37, SW1_CS39, SW1_CS38}, /* RGB19 */ + {0, SW2_CS37, SW2_CS39, SW2_CS38}, /* RGB20 */ + {0, SW3_CS37, SW3_CS39, SW3_CS38}, /* RGB21 */ + {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */ + {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */ }; led_config_t g_led_config = { { @@ -118,12 +118,12 @@ led_config_t g_led_config = { }; const is31fl3741_led_t g_is31_indicator_leds[6] = { - {0, CS5_SW1, CS3_SW1, CS4_SW1}, /* RGB71 */ - {0, CS5_SW2, CS3_SW2, CS4_SW2}, /* RGB72 */ - {0, CS5_SW3, CS3_SW3, CS4_SW3}, /* RGB73 */ - {0, CS5_SW4, CS3_SW4, CS4_SW4}, /* RGB74 */ - {0, CS5_SW5, CS3_SW5, CS4_SW5}, /* RGB75 */ - {0, CS5_SW6, CS3_SW6, CS4_SW6}, /* RGB76 */ + {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */ + {0, SW2_CS5, SW2_CS3, SW2_CS4}, /* RGB72 */ + {0, SW3_CS5, SW3_CS3, SW3_CS4}, /* RGB73 */ + {0, SW4_CS5, SW4_CS3, SW4_CS4}, /* RGB74 */ + {0, SW5_CS5, SW5_CS3, SW5_CS4}, /* RGB75 */ + {0, SW6_CS5, SW6_CS3, SW6_CS4}, /* RGB76 */ }; bool led_update_kb(led_t led_state) { @@ -161,7 +161,7 @@ void matrix_init_kb(void) { is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); } - is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0); + is31fl3741_update_led_control_registers(0); matrix_init_user(); } |