diff options
Diffstat (limited to 'keyboards/melgeek/mojo68')
-rwxr-xr-x | keyboards/melgeek/mojo68/config.h | 54 | ||||
-rwxr-xr-x | keyboards/melgeek/mojo68/info.json | 47 | ||||
-rwxr-xr-x | keyboards/melgeek/mojo68/rev1/config.h | 1 | ||||
-rwxr-xr-x | keyboards/melgeek/mojo68/rev1/rev1.c | 153 |
4 files changed, 120 insertions, 135 deletions
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 |