diff options
author | Nick Brassel <[email protected]> | 2024-02-28 21:47:37 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2024-02-28 21:47:37 +1100 |
commit | 4e369d405af6bba1adce6337b2e1b1ea1788566c (patch) | |
tree | b0f020feff1809e37c9e7795d344929ff0bb290a /keyboards/kbdfans/kbd67/mkiirgb/v3 | |
parent | 4e04da397ef643f8fcf4afbe1d19f63aee1fc561 (diff) | |
parent | dd1706e468bb18dd7f7ae143de735a5d3be1bfb8 (diff) | |
download | qmk_firmware-0.24.0.tar.gz qmk_firmware-0.24.0.zip |
Merge branch 'develop'0.24.0
Diffstat (limited to 'keyboards/kbdfans/kbd67/mkiirgb/v3')
-rwxr-xr-x | keyboards/kbdfans/kbd67/mkiirgb/v3/config.h | 57 | ||||
-rw-r--r-- | keyboards/kbdfans/kbd67/mkiirgb/v3/info.json | 36 | ||||
-rwxr-xr-x | keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c | 146 |
3 files changed, 108 insertions, 131 deletions
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h index 8dd12678ee..1d924ae1ea 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h @@ -16,63 +16,6 @@ #pragma once -#ifdef RGB_MATRIX_ENABLE -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define RGB_MATRIX_KEYPRESSES -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -// #define ENABLE_RGB_MATRIX_GRADIENT_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_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define RGB_MATRIX_LED_COUNT 67 -#define DRIVER_INDICATOR_LED_TOTAL 0 -#endif diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json index 284461c2a7..1fd3448de4 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -5,8 +5,42 @@ "device_version": "0.0.3" }, "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_left_right": true, + "breathing": true, + "band_val": true, + "band_pinwheel_val": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "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 + }, + "default": { + "animation": "cycle_all" + }, "driver": "is31fl3741", - "val_steps": 8 + "val_steps": 8, + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c index 7347a365bc..0b40afadf9 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c @@ -18,79 +18,79 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS21_SW1, CS20_SW1, CS19_SW1}, - {0, CS21_SW2, CS20_SW2, CS19_SW2}, - {0, CS21_SW3, CS20_SW3, CS19_SW3}, - {0, CS21_SW4, CS20_SW4, CS19_SW4}, - {0, CS21_SW5, CS20_SW5, CS19_SW5}, - {0, CS21_SW6, CS20_SW6, CS19_SW6}, - {0, CS21_SW7, CS20_SW7, CS19_SW7}, - {0, CS21_SW8, CS20_SW8, CS19_SW8}, - {0, CS24_SW1, CS23_SW1, CS22_SW1}, - {0, CS24_SW2, CS23_SW2, CS22_SW2}, - {0, CS24_SW3, CS23_SW3, CS22_SW3}, - {0, CS24_SW4, CS23_SW4, CS22_SW4}, - {0, CS24_SW5, CS23_SW5, CS22_SW5}, - {0, CS24_SW6, CS23_SW6, CS22_SW6}, - {0, CS24_SW7, CS23_SW7, CS22_SW7}, - - {0, CS15_SW1, CS14_SW1, CS13_SW1}, - {0, CS15_SW2, CS14_SW2, CS13_SW2}, - {0, CS15_SW3, CS14_SW3, CS13_SW3}, - {0, CS15_SW4, CS14_SW4, CS13_SW4}, - {0, CS15_SW5, CS14_SW5, CS13_SW5}, - {0, CS15_SW6, CS14_SW6, CS13_SW6}, - {0, CS15_SW7, CS14_SW7, CS13_SW7}, - {0, CS15_SW8, CS14_SW8, CS13_SW8}, - {0, CS30_SW1, CS29_SW1, CS28_SW1}, - {0, CS30_SW2, CS29_SW2, CS28_SW2}, - {0, CS30_SW3, CS29_SW3, CS28_SW3}, - {0, CS30_SW4, CS29_SW4, CS28_SW4}, - {0, CS30_SW5, CS29_SW5, CS28_SW5}, - {0, CS30_SW6, CS29_SW6, CS28_SW6}, - {0, CS30_SW7, CS29_SW7, CS28_SW7}, - - {0, CS12_SW1, CS11_SW1, CS10_SW1}, - {0, CS12_SW2, CS11_SW2, CS10_SW2}, - {0, CS12_SW3, CS11_SW3, CS10_SW3}, - {0, CS12_SW4, CS11_SW4, CS10_SW4}, - {0, CS12_SW5, CS11_SW5, CS10_SW5}, - {0, CS12_SW6, CS11_SW6, CS10_SW6}, - {0, CS12_SW7, CS11_SW7, CS10_SW7}, - {0, CS12_SW8, CS11_SW8, CS10_SW8}, - {0, CS33_SW1, CS32_SW1, CS31_SW1}, - {0, CS33_SW2, CS32_SW2, CS31_SW2}, - {0, CS33_SW3, CS32_SW3, CS31_SW3}, - {0, CS33_SW4, CS32_SW4, CS31_SW4}, - {0, CS33_SW5, CS32_SW5, CS31_SW5}, - {0, CS33_SW7, CS32_SW7, CS31_SW7}, - - {0, CS9_SW1, CS8_SW1, CS7_SW1}, - {0, CS9_SW2, CS8_SW2, CS7_SW2}, - {0, CS9_SW3, CS8_SW3, CS7_SW3}, - {0, CS9_SW4, CS8_SW4, CS7_SW4}, - {0, CS9_SW5, CS8_SW5, CS7_SW5}, - {0, CS9_SW6, CS8_SW6, CS7_SW6}, - {0, CS9_SW7, CS8_SW7, CS7_SW7}, - {0, CS9_SW8, CS8_SW8, CS7_SW8}, - {0, CS36_SW1, CS35_SW1, CS34_SW1}, - {0, CS36_SW2, CS35_SW2, CS34_SW2}, - {0, CS36_SW3, CS35_SW3, CS34_SW3}, - {0, CS36_SW4, CS35_SW4, CS34_SW4}, - {0, CS36_SW5, CS35_SW5, CS34_SW5}, - {0, CS36_SW7, CS35_SW7, CS34_SW7}, - - {0, CS3_SW1, CS2_SW1, CS1_SW1}, - {0, CS3_SW2, CS2_SW2, CS1_SW2}, - {0, CS3_SW3, CS2_SW3, CS1_SW3}, - {0, CS3_SW6, CS2_SW6, CS1_SW6}, -// {0, CS39_SW1, CS38_SW1, CS37_SW1}, - {0, CS39_SW2, CS38_SW2, CS37_SW2}, - {0, CS39_SW3, CS38_SW3, CS37_SW3}, - {0, CS39_SW4, CS38_SW4, CS37_SW4}, - {0, CS39_SW5, CS38_SW5, CS37_SW5}, - {0, CS39_SW7, CS38_SW7, CS37_SW7} +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS21, SW1_CS20, SW1_CS19}, + {0, SW2_CS21, SW2_CS20, SW2_CS19}, + {0, SW3_CS21, SW3_CS20, SW3_CS19}, + {0, SW4_CS21, SW4_CS20, SW4_CS19}, + {0, SW5_CS21, SW5_CS20, SW5_CS19}, + {0, SW6_CS21, SW6_CS20, SW6_CS19}, + {0, SW7_CS21, SW7_CS20, SW7_CS19}, + {0, SW8_CS21, SW8_CS20, SW8_CS19}, + {0, SW1_CS24, SW1_CS23, SW1_CS22}, + {0, SW2_CS24, SW2_CS23, SW2_CS22}, + {0, SW3_CS24, SW3_CS23, SW3_CS22}, + {0, SW4_CS24, SW4_CS23, SW4_CS22}, + {0, SW5_CS24, SW5_CS23, SW5_CS22}, + {0, SW6_CS24, SW6_CS23, SW6_CS22}, + {0, SW7_CS24, SW7_CS23, SW7_CS22}, + + {0, SW1_CS15, SW1_CS14, SW1_CS13}, + {0, SW2_CS15, SW2_CS14, SW2_CS13}, + {0, SW3_CS15, SW3_CS14, SW3_CS13}, + {0, SW4_CS15, SW4_CS14, SW4_CS13}, + {0, SW5_CS15, SW5_CS14, SW5_CS13}, + {0, SW6_CS15, SW6_CS14, SW6_CS13}, + {0, SW7_CS15, SW7_CS14, SW7_CS13}, + {0, SW8_CS15, SW8_CS14, SW8_CS13}, + {0, SW1_CS30, SW1_CS29, SW1_CS28}, + {0, SW2_CS30, SW2_CS29, SW2_CS28}, + {0, SW3_CS30, SW3_CS29, SW3_CS28}, + {0, SW4_CS30, SW4_CS29, SW4_CS28}, + {0, SW5_CS30, SW5_CS29, SW5_CS28}, + {0, SW6_CS30, SW6_CS29, SW6_CS28}, + {0, SW7_CS30, SW7_CS29, SW7_CS28}, + + {0, SW1_CS12, SW1_CS11, SW1_CS10}, + {0, SW2_CS12, SW2_CS11, SW2_CS10}, + {0, SW3_CS12, SW3_CS11, SW3_CS10}, + {0, SW4_CS12, SW4_CS11, SW4_CS10}, + {0, SW5_CS12, SW5_CS11, SW5_CS10}, + {0, SW6_CS12, SW6_CS11, SW6_CS10}, + {0, SW7_CS12, SW7_CS11, SW7_CS10}, + {0, SW8_CS12, SW8_CS11, SW8_CS10}, + {0, SW1_CS33, SW1_CS32, SW1_CS31}, + {0, SW2_CS33, SW2_CS32, SW2_CS31}, + {0, SW3_CS33, SW3_CS32, SW3_CS31}, + {0, SW4_CS33, SW4_CS32, SW4_CS31}, + {0, SW5_CS33, SW5_CS32, SW5_CS31}, + {0, SW7_CS33, SW7_CS32, SW7_CS31}, + + {0, SW1_CS9, SW1_CS8, SW1_CS7}, + {0, SW2_CS9, SW2_CS8, SW2_CS7}, + {0, SW3_CS9, SW3_CS8, SW3_CS7}, + {0, SW4_CS9, SW4_CS8, SW4_CS7}, + {0, SW5_CS9, SW5_CS8, SW5_CS7}, + {0, SW6_CS9, SW6_CS8, SW6_CS7}, + {0, SW7_CS9, SW7_CS8, SW7_CS7}, + {0, SW8_CS9, SW8_CS8, SW8_CS7}, + {0, SW1_CS36, SW1_CS35, SW1_CS34}, + {0, SW2_CS36, SW2_CS35, SW2_CS34}, + {0, SW3_CS36, SW3_CS35, SW3_CS34}, + {0, SW4_CS36, SW4_CS35, SW4_CS34}, + {0, SW5_CS36, SW5_CS35, SW5_CS34}, + {0, SW7_CS36, SW7_CS35, SW7_CS34}, + + {0, SW1_CS3, SW1_CS2, SW1_CS1}, + {0, SW2_CS3, SW2_CS2, SW2_CS1}, + {0, SW3_CS3, SW3_CS2, SW3_CS1}, + {0, SW6_CS3, SW6_CS2, SW6_CS1}, +// {0, SW1_CS39, SW1_CS38, SW1_CS37}, + {0, SW2_CS39, SW2_CS38, SW2_CS37}, + {0, SW3_CS39, SW3_CS38, SW3_CS37}, + {0, SW4_CS39, SW4_CS38, SW4_CS37}, + {0, SW5_CS39, SW5_CS38, SW5_CS37}, + {0, SW7_CS39, SW7_CS38, SW7_CS37} }; |