diff options
Diffstat (limited to 'keyboards/mechlovin')
62 files changed, 2260 insertions, 1239 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h deleted file mode 100644 index 909bc7f83a..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#define RGB_MATRIX_LED_COUNT 91 -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set - -// 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 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index bdf9e7fdf5..af68bb8457 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -4,7 +4,58 @@ "pid": "0xAEC1" }, "rgb_matrix": { - "driver": "ws2812" + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_pinwheel" + }, + "driver": "ws2812", + "max_brightness": 220, + "react_on_keyup": true, + "sleep": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"], diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index 6bdd06aba8..d63b339468 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,65 +1,6 @@ #pragma once -//rgb matrix setting #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA -#define DRIVER_1_LED_TOTAL 32 -#define DRIVER_2_LED_TOTAL 36 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set -// 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_DISABLE_KEYCODES diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 60fff3c7a7..fb88cb359d 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -4,7 +4,57 @@ "pid": "0xAEC2" }, "rgb_matrix": { - "driver": "is31fl3731" + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_pinwheel" + }, + "driver": "is31fl3731", + "react_on_keyup": true, + "sleep": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"], diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c index 9e5fe11895..d49d16e85a 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c @@ -17,7 +17,7 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {0, C2_1, C3_1, C4_1}, //D102-A0-0 {0, C5_1, C6_1, C7_1}, //D108-A1-1 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index ba93133857..84075534e7 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -20,67 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_SPI_DRIVER SPID1 // default: SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5 -#ifdef RGB_MATRIX_ENABLE -//rgb matrix setting -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA -#define RGB_MATRIX_LED_COUNT 66 - -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set - -#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 RGB_MATRIX_DISABLE_KEYCODES - #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 -#endif +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA + +#define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 6064967f7f..62acf349c0 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -4,7 +4,56 @@ "pid": "0xAEC3" }, "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 + }, + "default": { + "animation": "cycle_pinwheel" + }, + "driver": "is31fl3741", + "react_on_keyup": true, + "sleep": true }, "matrix_pins": { "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"], diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c index b13f223a1c..5eebd7ec8a 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c @@ -17,7 +17,7 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */ {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */ {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */ diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h index 60dc290bfb..3fd2a2a490 100644 --- a/keyboards/mechlovin/delphine/rgb_led/config.h +++ b/keyboards/mechlovin/delphine/rgb_led/config.h @@ -1,59 +1,3 @@ #pragma once -//rgb matrix setting #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA -#define RGB_MATRIX_LED_COUNT 25 -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set -// 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 diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json index 59127ea64f..6a0b8df2cf 100644 --- a/keyboards/mechlovin/delphine/rgb_led/info.json +++ b/keyboards/mechlovin/delphine/rgb_led/info.json @@ -25,6 +25,55 @@ "pin": "E2" }, "rgb_matrix": { - "driver": "is31fl3731" + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_pinwheel" + }, + "driver": "is31fl3731", + "react_on_keyup": true } } diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c index a55143f2e1..feda05a071 100644 --- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c +++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c @@ -18,7 +18,7 @@ #ifdef RGB_MATRIX_ENABLE -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { // left CA {0, C5_2, C6_2, C7_2}, //D2-0 {0, C1_1, C3_2, C4_2}, //D20-1 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h deleted file mode 100644 index 08006aa996..0000000000 --- a/keyboards/mechlovin/hannah60rgb/rev1/config.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 72 -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -# define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 3eeba2ab7e..6a3510c7df 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -12,7 +12,56 @@ "pin": "A15" }, "rgb_matrix": { - "driver": "ws2812" + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_pinwheel" + }, + "driver": "ws2812", + "react_on_keyup": true }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h index 4a4f4c7556..ddcde6b290 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h @@ -1,66 +1,7 @@ #pragma once -//rgb matrix setting #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA -#define DRIVER_1_LED_TOTAL 44 -#define DRIVER_2_LED_TOTAL 34 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set -// 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 #if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE) # define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 84524c2331..e6be250311 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -29,7 +29,56 @@ "pin": "A15" }, "rgb_matrix": { - "driver": "is31fl3731" + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_pinwheel" + }, + "driver": "is31fl3731", + "react_on_keyup": true }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c index 2e3c8d0090..c6943cc357 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c +++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c @@ -17,7 +17,7 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h index 6e73aba5d9..29520b6a8f 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h +++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h @@ -16,63 +16,4 @@ #pragma once -//rgb matrix setting -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#undef ENABLE_RGB_MATRIX_SPLASH -#undef ENABLE_RGB_MATRIX_MULTISPLASH -#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -// 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_SDA -#define RGB_MATRIX_LED_COUNT 91 -#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index 347ea1b311..27a7b441e3 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -9,7 +9,56 @@ "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, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "sleep": true }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"], diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c index 5649f80712..cd8f2e2ca0 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c +++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c @@ -17,7 +17,7 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { {0, CS34_SW1, CS35_SW1, CS36_SW1}, //D92-K00-0 {0, CS37_SW1, CS38_SW1, CS39_SW1}, //D94-K01-1 {0, CS31_SW1, CS32_SW1, CS33_SW1}, //D96-K02-2 diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h index eee31e69ef..8e7f778004 100644 --- a/keyboards/mechlovin/infinity875/config.h +++ b/keyboards/mechlovin/infinity875/config.h @@ -37,10 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL - -#ifdef RGB_MATRIX_ENABLE -#define RGB_MATRIX_LED_COUNT 42 -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#endif diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index bb249cf39b..cb8154a713 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -9,7 +9,9 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "ws2812" + "driver": "ws2812", + "max_brightness": 200, + "sleep": true }, "indicators": { "caps_lock": "D6", diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index cb0ab92fb4..b67551a111 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -1,686 +1,37 @@ { - "keyboard_name": "Olly JF", "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", "usb": { - "vid": "0x4D4C", - "pid": "0xD180", - "device_version": "0.0.1" + "vid": "0x4D4C" }, - "backlight": { - "pin": "D4", - "breathing": true - }, - "indicators": { - "caps_lock": "B0", - "num_lock": "B1", - "scroll_lock": "B2" + "features": { + "nkro": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "rgblight": true }, + "diode_direction": "ROW2COL", "rgblight": { "led_count": 27, "sleep": true, "animations": { + "alternating": true, "breathing": true, + "christmas": true, + "knight": true, "rainbow_mood": true, "rainbow_swirl": true, + "rgb_test": true, "snake": true, - "knight": true, - "christmas": true, "static_gradient": true, - "rgb_test": true, - "alternating": true, "twinkle": true } }, - "ws2812": { - "pin": "B3" - }, "bootmagic": { "matrix": [1, 14] - }, - "processor": "atmega32a", - "bootloader": "usbasploader", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, - - {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, - {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, - {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, - {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, - {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25}, - - {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, - - {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, - {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, - {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, - {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - - {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, - - {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, - {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, - {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, - {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, - - {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, - {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, - {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, - {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, - {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, - {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, - {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25}, - - {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, - - {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, - {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, - {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, - {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, - {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, - {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, - {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, - {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, - - {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, - {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, - {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, - - {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, - {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, - {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} - ] - }, - "LAYOUT_ansi": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, - - {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, - {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, - {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, - {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, - - {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, - - {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, - {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, - {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, - {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - - {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, - - {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, - {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, - {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, - {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, - - {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, - {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, - {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, - {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, - {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, - - {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, - - {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, - {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, - {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, - {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, - {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, - {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, - {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, - {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, - - {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, - {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, - {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, - - {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, - {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, - {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} - ] - }, - "LAYOUT_ansi_split_bs_rshift": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, - - {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, - {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, - {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, - {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, - {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25}, - - {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, - - {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, - {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, - {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, - {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - - {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, - - {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, - {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, - {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, - {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, - - {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, - {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, - {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, - {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, - {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, - {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25}, - - {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, - - {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, - {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, - {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, - {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, - {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, - {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, - {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, - {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, - - {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, - {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, - {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, - - {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, - {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, - {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, - - {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, - {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, - {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, - {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, - - {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, - - {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, - {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, - {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, - {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - - {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, - - {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, - {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, - {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, - {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - - {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, - {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, - {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, - {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, - {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, - {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, - - {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, - - {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, - {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, - {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, - {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, - {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, - {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, - {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, - {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, - - {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, - {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, - {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, - - {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, - {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, - {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} - ] - }, - "LAYOUT_iso_split_bs_rshift": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, - - {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, - {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, - {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, - {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, - {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25}, - - {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, - - {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, - {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, - {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, - {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - - {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, - - {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, - {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, - {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, - {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - - {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, - {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, - {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, - {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, - {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, - {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, - {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25}, - - {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, - - {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, - {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, - {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, - {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, - {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, - {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, - {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, - {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, - - {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, - {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, - {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, - - {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, - {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, - {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} - ] - } } } diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md b/keyboards/mechlovin/olly/jf/keymaps/via/readme.md deleted file mode 100644 index 0453b5aef0..0000000000 --- a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Olly JF
\ No newline at end of file diff --git a/keyboards/mechlovin/olly/jf/readme.md b/keyboards/mechlovin/olly/jf/readme.md index fe9cf38cad..c40a8dfd5e 100644 --- a/keyboards/mechlovin/olly/jf/readme.md +++ b/keyboards/mechlovin/olly/jf/readme.md @@ -18,7 +18,11 @@ Flashing example for this keyboard: See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). -**Reset Key:** 3 ways to put the Olly JF into bootloader: -By keycode: Press the key mapped to `QK_BOOT` if it is available. -By Bootloader: hold ESC key while plugging in (jump to bootloader) -By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file +## Bootloader + +Enter the bootloader in 4 ways: + +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. +* **Bootloader reset**: hold ESC (0,0) key while plugging in (jump to bootloader) +* **Bootmagic reset**: hold Insert (1,14) key while pluging in (jump to bootloader and reset EEPROM) +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
\ No newline at end of file diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/info.json new file mode 100644 index 0000000000..0b6aec094f --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev1/info.json @@ -0,0 +1,675 @@ +{ + "keyboard_name": "Olly JF Rev1", + "usb": { + "pid": "0xD180", + "device_version": "0.0.1" + }, + "features": { + "backlight": true + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "rows": ["D5", "D6", "A5", "A4", "A3", "A6"], + "custom_lite": true + }, + "matrix_size": { + "cols": 19, + "rows": 6 + }, + "backlight": { + "pin": "D4", + "breathing": true + }, + "indicators": { + "caps_lock": "B0", + "num_lock": "B1", + "scroll_lock": "B2" + }, + "ws2812": { + "pin": "B3" + }, + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, + + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, + + {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, + {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, + + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, + + {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, + {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} + ] + }, + "LAYOUT_ansi_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, + + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, + + {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, + {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + + {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, + + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, + + {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, + {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} + ] + }, + "LAYOUT_iso_split_bs_rshift": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + + {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25}, + + {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5}, + + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5}, + + {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}, + {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25} + ] + } + } +} diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/keymap.c index 6209811cf2..6209811cf2 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/keymap.c diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/readme.md b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md index 0dad971bdc..0dad971bdc 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/default/readme.md +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_ansi/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi/keymap.c index f646d8aa81..f646d8aa81 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/default_ansi/keymap.c +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi/keymap.c diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_ansi_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi_split_bs_rshift/keymap.c index 3807ab0f14..3807ab0f14 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/default_ansi_split_bs_rshift/keymap.c +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi_split_bs_rshift/keymap.c diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_iso/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso/keymap.c index c97f1dbd80..c97f1dbd80 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/default_iso/keymap.c +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso/keymap.c diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso_split_bs_rshift/keymap.c index f72820394b..f72820394b 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/default_iso_split_bs_rshift/keymap.c +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso_split_bs_rshift/keymap.c diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/config.h b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/config.h index 01d7e4bc38..01d7e4bc38 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/via/config.h +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/config.h diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/keymap.c index 15f626d7ab..15f626d7ab 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/keymap.c diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/rules.mk index 36b7ba9cbc..36b7ba9cbc 100644 --- a/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk +++ b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/rules.mk diff --git a/keyboards/mechlovin/olly/jf/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c index c01879c9a5..c01879c9a5 100644 --- a/keyboards/mechlovin/olly/jf/matrix.c +++ b/keyboards/mechlovin/olly/jf/rev1/matrix.c diff --git a/keyboards/mechlovin/olly/jf/matrix_diagram.md b/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md index 6cc49f8b93..63e5476501 100644 --- a/keyboards/mechlovin/olly/jf/matrix_diagram.md +++ b/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md @@ -1,4 +1,4 @@ -# Matrix Diagram for Mechlovin.Studio Olly JF +# Matrix Diagram for Mechlovin.Studio Olly JF Rev. 1 ``` ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ diff --git a/keyboards/mechlovin/olly/jf/rev1/readme.md b/keyboards/mechlovin/olly/jf/rev1/readme.md new file mode 100644 index 0000000000..f6c114fee6 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev1/readme.md @@ -0,0 +1,27 @@ +# Mechlovin Olly JF Rev. 1 + + + +Olly JF PCB, compatible Duck Jetfire keyboard. + +* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/) +* Hardware Supported: Jetfire Korean Kustom +* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/olly/jf/rev1:default + +Flashing example for this keyboard: + + make mechlovin/olly/jf/rev1:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +By keycode: Press the key mapped to `QK_BOOT` if it is available. +By Bootloader: hold ESC key while plugging in (jump to bootloader) +By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file diff --git a/keyboards/mechlovin/olly/jf/jf.c b/keyboards/mechlovin/olly/jf/rev1/rev1.c index 3d18d7bb5a..3d18d7bb5a 100644 --- a/keyboards/mechlovin/olly/jf/jf.c +++ b/keyboards/mechlovin/olly/jf/rev1/rev1.c diff --git a/keyboards/mechlovin/olly/jf/rev1/rules.mk b/keyboards/mechlovin/olly/jf/rev1/rules.mk new file mode 100644 index 0000000000..4442aba67d --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev1/rules.mk @@ -0,0 +1,4 @@ +# Processor frequency +F_CPU = 16000000 + +SRC += matrix.c diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/rev2/config.h index 35480dc83c..e1389b1e9a 100644 --- a/keyboards/mechlovin/olly/jf/config.h +++ b/keyboards/mechlovin/olly/jf/rev2/config.h @@ -1,5 +1,5 @@ /* -Copyright 2021 mechlovin +Copyright 2023 Mechlovin' 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 @@ -17,22 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 19 +#define I2C_DRIVER I2CD2 +#define I2C1_SCL_PIN B10 +#define I2C1_SDA_PIN B11 +#define LED_MATRIX_LED_COUNT 114 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D6, A5, A4, A3, A6} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL +#define I2C1_CLOCK_SPEED 400000 +#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 + +#define WEAR_LEVELING_BACKING_SIZE 4096 +#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/olly/jf/rev2/halconf.h b/keyboards/mechlovin/olly/jf/rev2/halconf.h new file mode 100644 index 0000000000..090c0b3d3b --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/halconf.h @@ -0,0 +1,25 @@ +/* Copyright 2023 QMK + * + * 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 HAL_USE_I2C TRUE + +#define HAL_USE_SPI TRUE + + +#include_next <halconf.h> + diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/info.json new file mode 100644 index 0000000000..da86fbb075 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/info.json @@ -0,0 +1,702 @@ +{ + "keyboard_name": "Olly JF Rev2", + "bootloader": "stm32duino", + "features": { + "command": true, + "console": true, + "led_matrix": true, + "nkro": true + }, + "led_matrix": { + "animations": { + "alphas_mods": true, + "band": true, + "band_pinwheel": true, + "band_spiral": true, + "breathing": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_up_down": true, + "dual_beacon": true, + "solid_multisplash": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "wave_left_right": true, + "wave_up_down": true + }, + "driver": "is31fl3731", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 49, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 74, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 99, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 122, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 186, "y": 0, "flags": 4}, + {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4}, + {"matrix": [0, 17], "x": 211, "y": 0, "flags": 4}, + {"matrix": [0, 18], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4}, + {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 24, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 49, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 74, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4}, + {"matrix": [1, 8], "x": 99, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 122, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 140, "y": 13, "flags": 4}, + {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4}, + {"matrix": [1, 14], "x": 174, "y": 13, "flags": 4}, + {"matrix": [1, 15], "x": 186, "y": 13, "flags": 4}, + {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4}, + {"matrix": [1, 17], "x": 211, "y": 13, "flags": 4}, + {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4}, + {"matrix": [2, 1], "x": 12, "y": 25, "flags": 4}, + {"matrix": [2, 2], "x": 24, "y": 25, "flags": 4}, + {"matrix": [2, 3], "x": 37, "y": 25, "flags": 4}, + {"matrix": [2, 4], "x": 49, "y": 25, "flags": 4}, + {"matrix": [2, 5], "x": 62, "y": 25, "flags": 4}, + {"matrix": [2, 6], "x": 74, "y": 25, "flags": 4}, + {"matrix": [2, 7], "x": 87, "y": 25, "flags": 4}, + {"matrix": [2, 8], "x": 99, "y": 25, "flags": 4}, + {"matrix": [2, 9], "x": 122, "y": 25, "flags": 4}, + {"matrix": [2, 10], "x": 124, "y": 25, "flags": 4}, + {"matrix": [2, 11], "x": 137, "y": 25, "flags": 4}, + {"matrix": [2, 12], "x": 140, "y": 25, "flags": 4}, + {"matrix": [2, 13], "x": 162, "y": 25, "flags": 4}, + {"matrix": [2, 14], "x": 174, "y": 25, "flags": 4}, + {"matrix": [2, 15], "x": 186, "y": 25, "flags": 4}, + {"matrix": [2, 16], "x": 199, "y": 25, "flags": 4}, + {"matrix": [2, 17], "x": 211, "y": 25, "flags": 4}, + {"matrix": [2, 18], "x": 224, "y": 25, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 12, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 24, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 49, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 74, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 99, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 122, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4}, + {"matrix": [3, 12], "x": 140, "y": 38, "flags": 4}, + {"matrix": [3, 13], "x": 162, "y": 38, "flags": 4}, + {"matrix": [3, 15], "x": 186, "y": 38, "flags": 4}, + {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4}, + {"matrix": [3, 17], "x": 211, "y": 38, "flags": 4}, + {"matrix": [3, 18], "x": 224, "y": 38, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4}, + {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 24, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 49, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 74, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 99, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 122, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4}, + {"matrix": [4, 12], "x": 140, "y": 51, "flags": 4}, + {"matrix": [4, 13], "x": 162, "y": 51, "flags": 4}, + {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4}, + {"matrix": [4, 15], "x": 186, "y": 51, "flags": 4}, + {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4}, + {"matrix": [4, 17], "x": 211, "y": 51, "flags": 4}, + {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 12, "y": 64, "flags": 4}, + {"matrix": [5, 3], "x": 37, "y": 64, "flags": 4}, + {"matrix": [5, 6], "x": 74, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 124, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 137, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 140, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4}, + {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 186, "y": 64, "flags": 4}, + {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4}, + {"matrix": [5, 17], "x": 211, "y": 64, "flags": 4}, + {"matrix": [5, 18], "x": 224, "y": 64, "flags": 4} + ] + }, + "matrix_pins": { + "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A8", "A15", "B3", "B4", "C15", "C14", "C13", "B9", "B8", "B7", "B6"], + "rows": ["B0", "B1", "B2", "B15", "B14", "B13"] + }, + "processor": "STM32F103", + "usb": { + "device_version": "0.0.2", + "pid": "0xD182" + }, + "ws2812": { + "driver": "spi", + "pin": "B5" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [2, 13], "x": 14, "y": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5} + ] + }, + "LAYOUT_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [2, 13], "x": 14, "y": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5} + ] + }, + "LAYOUT_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [2, 13], "x": 14, "y": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5} + ] + } + } +}
\ No newline at end of file diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c new file mode 100644 index 0000000000..e2a5ef0d0d --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2023 Mechlovin' + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c new file mode 100644 index 0000000000..2cc1518fee --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2023 Mechlovin' + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c new file mode 100644 index 0000000000..b28913c49b --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2023 Mechlovin' + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi_split_bs_rshift( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c new file mode 100644 index 0000000000..9a59431a64 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2023 Mechlovin' + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c new file mode 100644 index 0000000000..196b855ceb --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2023 Mechlovin' + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_iso_split_bs_rshift( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c new file mode 100644 index 0000000000..477d7bac2a --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2023 Mechlovin' + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk new file mode 100644 index 0000000000..36b7ba9cbc --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md b/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md new file mode 100644 index 0000000000..776bba84f8 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md @@ -0,0 +1,37 @@ +# Matrix Diagram for Mechlovin.Studio Olly JF Rev. 2 + +``` +┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ +│00 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E ││0F │0G │0H │0I │ +└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┘└───┴───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ ┌───────┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E ││1F │1G │1H │1I │ │1D │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤ └─┬─────┤ ┌───┐ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3C ││2E ││2F │2G │2H │2I │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤ ┌──┴┐3D │ │3I │ 2u Numpad Plus +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │ │3F │3G │3H │3I │ │3C │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ├───┼───┼───┼───┤ └───┴────┘ ├───┤ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │┌───┐│4F │4G │4H │4I │ ISO Enter │ │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│4E │└───┼───┼───┼───┤ │5I │ 2u Numpad Enter +│50 │51 │53 │56 │5A │5B │5C │┌───┼───┼───┐│5G │5H │5I │ │ │ +└─────┴───┴─────┴────────────────────────┴────┴────┴────┘│5D │5E │5F │└───┴───┴───┘ └───┘ + └───┴───┴───┘ +┌────────┐ ┌──────────┐ ┌───────┐ +│40 │ 2.25u LShift 2.75u RShift │4C │ │5G │ 2u Numpad Zero +└────────┘ └──────────┘ └───────┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐ +│50 │51 │53 │56 │5A │5B │5C │ +└────┴────┴────┴────────────────────────┴─────┴─────┴───┘ +┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐ +│50 │51 │53 │56 │5A │5B │5C │ +└────┴────┴────┴────────────────────────┴─────┴───┴─────┘ +┌────┬────┬────┬────────────────────────┬─────┬────┬────┐ +│50 │51 │53 │56 │5A │5B │5C │ +└────┴────┴────┴────────────────────────┴─────┴────┴────┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐ +│50 │51 │53 │56 │5A │5B │5C │ +└────┴────┴────┴────────────────────────┴─────┴─────┴───┘ +┌─────┬───┬─────┬──────────────────────────┬─────┬──────┐ +│50 │51 │53 │56 │5B │5C │ RWKL +└─────┴───┴─────┴──────────────────────────┴─────┴──────┘ +``` diff --git a/keyboards/mechlovin/olly/jf/rev2/mcuconf.h b/keyboards/mechlovin/olly/jf/rev2/mcuconf.h new file mode 100644 index 0000000000..b987f486b9 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/mcuconf.h @@ -0,0 +1,27 @@ +/* Copyright 2023 QMK + * + * 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 + +#include_next <mcuconf.h> + + +#undef STM32_SPI_USE_SPI1 +#define STM32_SPI_USE_SPI1 TRUE + +#undef STM32_I2C_USE_I2C2 +#define STM32_I2C_USE_I2C2 TRUE diff --git a/keyboards/mechlovin/olly/jf/rev2/readme.md b/keyboards/mechlovin/olly/jf/rev2/readme.md new file mode 100644 index 0000000000..b165c35778 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/readme.md @@ -0,0 +1,27 @@ +# Mechlovin Olly jf/rev2 + + + +Olly jf/rev2 PCB, compatible Duck Jetfire keyboard. + +* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/) +* Hardware Supported: Jetfire Korean Kustom +* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/olly/jf/rev2:default + +Flashing example for this keyboard: + + make mechlovin/olly/jf/rev2:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +By keycode: Press the key mapped to `QK_BOOT` if it is available. +By Bootloader: hold ESC key while plugging in (jump to bootloader) +By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file diff --git a/keyboards/mechlovin/olly/jf/rev2/rev2.c b/keyboards/mechlovin/olly/jf/rev2/rev2.c new file mode 100644 index 0000000000..04cf3b836d --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/rev2.c @@ -0,0 +1,92 @@ +/* Copyright 2023 Mechlovin' + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "quantum.h" + +void board_init(void) { + AFIO->MAPR |= AFIO_MAPR_SPI1_REMAP; +} + +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | LED address + * | | */ + { 0, C1_8 }, { 0, C3_8 }, { 0, C4_8 }, { 0, C5_8 }, { 0, C6_8 }, { 0, C7_8 }, { 0, C8_8 }, { 0, C9_8 }, { 0, C1_9 }, { 0, C2_9 }, { 0, C3_9 }, { 0, C4_9 }, { 0, C5_9 }, { 0, C6_9 }, { 0, C7_9 }, { 0, C8_9 }, { 0, C9_9 }, { 0, C1_16 }, + { 0, C1_7 }, { 0, C2_7 }, { 0, C3_7 }, { 0, C4_7 }, { 0, C5_7 }, { 0, C6_7 }, { 0, C7_7 }, { 0, C8_7 }, { 0, C9_7 }, { 0, C1_10 }, { 0, C2_10 }, { 0, C3_10 }, { 0, C4_10 }, { 0, C5_10 }, { 0, C6_10 }, { 0, C7_10 }, { 0, C8_10 }, { 0, C9_10 }, { 0, C2_16 }, + { 0, C1_6 }, { 0, C2_6 }, { 0, C3_6 }, { 0, C4_6 }, { 0, C5_6 }, { 0, C6_6 }, { 0, C7_6 }, { 0, C8_6 }, { 0, C9_6 }, { 0, C1_11 }, { 0, C2_11 }, { 0, C3_11 }, { 0, C4_11 }, { 0, C5_11 }, { 0, C6_11 }, { 0, C7_11 }, { 0, C8_11 }, { 0, C9_11 }, { 0, C3_16 }, + { 0, C1_5 }, { 0, C2_5 }, { 0, C3_5 }, { 0, C4_5 }, { 0, C5_5 }, { 0, C6_5 }, { 0, C7_5 }, { 0, C8_5 }, { 0, C9_5 }, { 0, C1_12 }, { 0, C2_12 }, { 0, C3_12 }, { 0, C4_12 }, { 0, C5_12 }, { 0, C7_12 }, { 0, C8_12 }, { 0, C9_12 }, { 0, C4_16 }, + { 0, C1_4 }, { 0, C2_4 }, { 0, C3_4 }, { 0, C4_4 }, { 0, C5_4 }, { 0, C6_4 }, { 0, C7_4 }, { 0, C8_4 }, { 0, C9_4 }, { 0, C1_13 }, { 0, C2_13 }, { 0, C3_13 }, { 0, C4_13 }, { 0, C5_13 }, { 0, C6_13 }, { 0, C7_13 }, { 0, C8_13 }, { 0, C9_13 }, { 0, C5_16 }, + { 0, C1_3 }, { 0, C2_3 }, { 0, C4_3 }, { 0, C7_3 }, { 0, C2_14 }, { 0, C3_14 }, { 0, C4_14 }, { 0, C5_14 }, { 0, C6_14 }, { 0, C7_14 }, { 0, C8_15 }, { 0, C9_15 }, { 0, C7_16 }, + { 0, C2_1 }, { 0, C1_1 }, { 0, C9_1 }, // Lock LED Indicator + { 0, C7_15 }, { 0, C6_15 }, { 0, C9_16 }, { 0, C8_16 }, { 0, C1_15 }, // Layer LED Indicator +}; + + + +bool led_matrix_indicators_kb(void) { + if (!led_matrix_indicators_user()) { return false; } + if (host_keyboard_led_state().caps_lock) { + led_matrix_set_value(106, 0xFF); + led_matrix_set_value(56, 0xFF); + } else { + led_matrix_set_value(106, 0x00); + } + if (host_keyboard_led_state().num_lock) { + led_matrix_set_value(107, 0xFF); + led_matrix_set_value(33, 0xFF); + } else { + led_matrix_set_value(107, 0x00); + } + if (host_keyboard_led_state().scroll_lock) { + led_matrix_set_value(108, 0xFF); + } else { + led_matrix_set_value(108, 0x00); + } + // if on layer 0, turn on L1 LED, otherwise off. + if (layer_state_is(0)) { + led_matrix_set_value(109, 0xFF); + } else { + led_matrix_set_value(109, 0x00); + } + // if on layer 1, turn on L2 LED, otherwise off. + if (layer_state_is(1)) { + led_matrix_set_value(110, 0xFF); + } else { + led_matrix_set_value(110, 0x00); + } + + // if on layer 2, turn on L3 LED, otherwise off. + if (layer_state_is(2)) { + led_matrix_set_value(111, 0xFF); + } else { + led_matrix_set_value(111, 0x00); + } + + // if on layer 3, turn on L4 LED, otherwise off. + if (layer_state_is(3)) { + led_matrix_set_value(112, 0xFF); + } else { + led_matrix_set_value(112, 0x00); + } + // if on layer 4, turn on L5 LED, otherwise off. + if (layer_state_is(4)) { + led_matrix_set_value(113, 0xFF); + } else { + led_matrix_set_value(114, 0x00); + } + + return true; +} diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/mechlovin/olly/jf/rev2/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk index 1d15495eef..fa0eceeb8a 100644 --- a/keyboards/mechlovin/olly/jf/rules.mk +++ b/keyboards/mechlovin/olly/jf/rules.mk @@ -1,18 +1 @@ -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -CUSTOM_MATRIX = lite - -SRC += matrix.c +DEFAULT_FOLDER = mechlovin/olly/jf/rev1 diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h index 88918506eb..6f9d5f9a02 100644 --- a/keyboards/mechlovin/olly/octagon/config.h +++ b/keyboards/mechlovin/olly/octagon/config.h @@ -17,37 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#ifdef LED_MATRIX_ENABLE #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA + +#define LED_MATRIX_LED_COUNT 94 + #define I2C_DRIVER I2CD2 #define I2C1_SCL_PIN B10 #define I2C1_SDA_PIN B11 -#define LED_MATRIX_LED_COUNT 94 -#define LED_MATRIX_KEYPRESSES // reacts to keypresses -#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects -#define ENABLE_LED_MATRIX_ALPHAS_MODS -#define ENABLE_LED_MATRIX_BREATHING -#define ENABLE_LED_MATRIX_BAND -#define ENABLE_LED_MATRIX_BAND_PINWHEEL -#define ENABLE_LED_MATRIX_BAND_SPIRAL -#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN -#define ENABLE_LED_MATRIX_CYCLE_OUT_IN -#define ENABLE_LED_MATRIX_DUAL_BEACON -#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_WAVE_UP_DOWN -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_LED_MATRIX_SOLID_SPLASH -#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH - #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -#endif diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 3621f491d8..3ef290d351 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -29,7 +29,30 @@ "pin": "A7" }, "led_matrix": { - "driver": "is31fl3731" + "animations":{ + "alphas_mods": true, + "breathing": true, + "band": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "wave_left_right": true, + "wave_up_down": true + }, + "driver": "is31fl3731", + "react_on_keyup": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c index b5eb828bc8..185ee32a3e 100644 --- a/keyboards/mechlovin/olly/octagon/octagon.c +++ b/keyboards/mechlovin/olly/octagon/octagon.c @@ -16,7 +16,7 @@ #include "quantum.h" -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | LED address diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h index 811841d7fe..e31259438a 100644 --- a/keyboards/mechlovin/zed65/mono_led/config.h +++ b/keyboards/mechlovin/zed65/mono_led/config.h @@ -17,38 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#ifdef LED_MATRIX_ENABLE #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA + #define I2C_DRIVER I2CD2 #define I2C1_SCL_PIN B10 #define I2C1_SDA_PIN B11 -#define LED_MATRIX_LED_COUNT 70 -#define LED_MATRIX_KEYPRESSES // reacts to keypresses -#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects -#define ENABLE_LED_MATRIX_ALPHAS_MODS -#define ENABLE_LED_MATRIX_BREATHING -#define ENABLE_LED_MATRIX_BAND -#define ENABLE_LED_MATRIX_BAND_PINWHEEL -#define ENABLE_LED_MATRIX_BAND_SPIRAL -#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN -#define ENABLE_LED_MATRIX_CYCLE_OUT_IN -#define ENABLE_LED_MATRIX_DUAL_BEACON -#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT -#define ENABLE_LED_MATRIX_WAVE_UP_DOWN -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_LED_MATRIX_SOLID_SPLASH -#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH - #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -#define VIA_QMK_LED_MATRIX_ENABLE -#endif diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index 228d2c50d5..aa46b1bd8b 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -30,7 +30,30 @@ "pin": "A7" }, "led_matrix": { - "driver": "is31fl3731" + "animations":{ + "alphas_mods": true, + "breathing": true, + "band": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "wave_left_right": true, + "wave_up_down": true + }, + "driver": "is31fl3731", + "react_on_keyup": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], diff --git a/keyboards/mechlovin/zed65/mono_led/mono_led.c b/keyboards/mechlovin/zed65/mono_led/mono_led.c index f66c4b1359..d8570fa0a6 100644 --- a/keyboards/mechlovin/zed65/mono_led/mono_led.c +++ b/keyboards/mechlovin/zed65/mono_led/mono_led.c @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | LED address diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json index b7d873dcb0..4b3ed831c5 100644 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json @@ -1,24 +1,24 @@ { - "keyboard_name": "Cor65", "manufacturer": "Mechlovin Studio", - "url": "", + "keyboard_name": "Cor65", "maintainer": "Mechlovin' Studio", - "usb": { - "vid": "0x4D4C", - "pid": "0x6504", - "device_version": "0.0.1" + "diode_direction": "COL2ROW", + "indicators": { + "caps_lock": "B9", + "on_state": 0 }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"], "rows": ["B12", "B13", "B14", "B15", "A1"] }, - "diode_direction": "COL2ROW", - "indicators": { - "caps_lock": "B9", - "on_state": 0 + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x6504", + "vid": "0x4D4C" }, "layouts": { - "LAYOUT_all": { + "LAYOUT_65_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1.25, "y": 0}, @@ -34,10 +34,8 @@ {"matrix": [0, 11], "x": 11.25, "y": 0}, {"matrix": [0, 12], "x": 12.25, "y": 0}, {"matrix": [0, 13], "x": 13.25, "y": 0}, - {"matrix": [0, 14], "x": 14.25, "y": 0}, - {"matrix": [2, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2}, {"matrix": [0, 15], "x": 16.75, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, {"matrix": [1, 2], "x": 2.75, "y": 1}, @@ -54,7 +52,6 @@ {"matrix": [1, 13], "x": 13.75, "y": 1}, {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5}, {"matrix": [1, 15], "x": 16.75, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, {"matrix": [2, 2], "x": 3, "y": 2}, @@ -70,7 +67,6 @@ {"matrix": [2, 12], "x": 13, "y": 2}, {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, {"matrix": [2, 15], "x": 16.75, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, {"matrix": [3, 3], "x": 3.5, "y": 3}, @@ -84,10 +80,8 @@ {"matrix": [3, 11], "x": 11.5, "y": 3}, {"matrix": [3, 12], "x": 12.5, "y": 3}, {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 16.75, "y": 3}, - - {"matrix": [3, 15], "x": 15.5, "y": 3.25}, - + {"matrix": [3, 15], "x": 16.75, "y": 3}, + {"matrix": [3, 14], "x": 15.5, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, @@ -95,13 +89,12 @@ {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25}, {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 13], "x": 14.5, "y": 4.25}, {"matrix": [4, 14], "x": 15.5, "y": 4.25}, {"matrix": [4, 15], "x": 16.5, "y": 4.25} ] }, - "LAYOUT_65_ansi": { + "LAYOUT_all": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1.25, "y": 0}, @@ -117,9 +110,9 @@ {"matrix": [0, 11], "x": 11.25, "y": 0}, {"matrix": [0, 12], "x": 12.25, "y": 0}, {"matrix": [0, 13], "x": 13.25, "y": 0}, - {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [2, 13], "x": 15.25, "y": 0}, {"matrix": [0, 15], "x": 16.75, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, {"matrix": [1, 2], "x": 2.75, "y": 1}, @@ -136,7 +129,6 @@ {"matrix": [1, 13], "x": 13.75, "y": 1}, {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5}, {"matrix": [1, 15], "x": 16.75, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, {"matrix": [2, 2], "x": 3, "y": 2}, @@ -152,7 +144,6 @@ {"matrix": [2, 12], "x": 13, "y": 2}, {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, {"matrix": [2, 15], "x": 16.75, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, {"matrix": [3, 3], "x": 3.5, "y": 3}, @@ -166,10 +157,8 @@ {"matrix": [3, 11], "x": 11.5, "y": 3}, {"matrix": [3, 12], "x": 12.5, "y": 3}, {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 16.75, "y": 3}, - - {"matrix": [3, 15], "x": 15.5, "y": 3.25}, - + {"matrix": [3, 15], "x": 16.75, "y": 3}, + {"matrix": [3, 14], "x": 15.5, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, @@ -177,7 +166,6 @@ {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25}, {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 13], "x": 14.5, "y": 4.25}, {"matrix": [4, 14], "x": 15.5, "y": 4.25}, {"matrix": [4, 15], "x": 16.5, "y": 4.25} @@ -201,7 +189,6 @@ {"matrix": [0, 13], "x": 13.25, "y": 0}, {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2}, {"matrix": [0, 15], "x": 16.75, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, {"matrix": [1, 2], "x": 2.75, "y": 1}, @@ -218,7 +205,6 @@ {"matrix": [1, 13], "x": 13.75, "y": 1}, {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5}, {"matrix": [1, 15], "x": 16.75, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, {"matrix": [2, 2], "x": 3, "y": 2}, @@ -234,7 +220,6 @@ {"matrix": [2, 12], "x": 13, "y": 2}, {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, {"matrix": [2, 15], "x": 16.75, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, {"matrix": [3, 3], "x": 3.5, "y": 3}, @@ -248,20 +233,17 @@ {"matrix": [3, 11], "x": 11.5, "y": 3}, {"matrix": [3, 12], "x": 12.5, "y": 3}, {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 16.75, "y": 3}, - - {"matrix": [3, 15], "x": 15.5, "y": 3.25}, - + {"matrix": [3, 15], "x": 16.75, "y": 3}, + {"matrix": [3, 14], "x": 15.5, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5}, {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7}, {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5}, - {"matrix": [4, 13], "x": 14.5, "y": 4.25}, {"matrix": [4, 14], "x": 15.5, "y": 4.25}, {"matrix": [4, 15], "x": 16.5, "y": 4.25} ] } } -} +}
\ No newline at end of file |