From 1c5ed20dc9695b9d0fe2c26c51c29e19a2f3989d Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Fri, 1 Dec 2023 21:49:47 +0000 Subject: [PATCH 1/6] initial testing of helix rgbmatrix with shadow306k --- keyboards/helix/rev3_5rows/info.json | 71 ++++++++++++++++++- .../helix/rev3_5rows/keymaps/via/config.h | 55 ++++++++++++++ keyboards/helix/rev3_5rows/rules.mk | 4 +- 3 files changed, 125 insertions(+), 5 deletions(-) create mode 100644 keyboards/helix/rev3_5rows/keymaps/via/config.h diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index 43cb20dd5e54..df6718b914c2 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -10,9 +10,74 @@ }, "rgb_matrix": { "driver": "ws2812", - "sat_steps": 8, - "val_steps": 8, - "speed_steps": 10 + "layout": [ + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, + {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, + {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 144, "y": 0, "flags": 4}, + {"matrix": [5, 4], "x": 160, "y": 0, "flags": 4}, + {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4}, + {"matrix": [5, 2], "x": 192, "y": 0, "flags": 4}, + {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4}, + {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4}, + {"matrix": [6, 5], "x": 144, "y": 16, "flags": 4}, + {"matrix": [6, 4], "x": 160, "y": 16, "flags": 4}, + {"matrix": [6, 3], "x": 176, "y": 16, "flags": 4}, + {"matrix": [6, 2], "x": 192, "y": 16, "flags": 4}, + {"matrix": [6, 1], "x": 208, "y": 16, "flags": 4}, + {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4}, + {"matrix": [7, 5], "x": 144, "y": 32, "flags": 4}, + {"matrix": [7, 4], "x": 160, "y": 32, "flags": 4}, + {"matrix": [7, 3], "x": 176, "y": 32, "flags": 4}, + {"matrix": [7, 2], "x": 192, "y": 32, "flags": 4}, + {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4}, + {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4}, + {"matrix": [8, 6], "x": 128, "y": 48, "flags": 4}, + {"matrix": [8, 5], "x": 144, "y": 48, "flags": 4}, + {"matrix": [8, 4], "x": 160, "y": 48, "flags": 4}, + {"matrix": [8, 3], "x": 176, "y": 48, "flags": 4}, + {"matrix": [8, 2], "x": 192, "y": 48, "flags": 4}, + {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4}, + {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4}, + {"matrix": [9, 6], "x": 128, "y": 64, "flags": 4}, + {"matrix": [9, 5], "x": 144, "y": 64, "flags": 4}, + {"matrix": [9, 4], "x": 160, "y": 64, "flags": 4}, + {"matrix": [9, 3], "x": 176, "y": 64, "flags": 4}, + {"matrix": [9, 2], "x": 192, "y": 64, "flags": 4}, + {"matrix": [9, 1], "x": 208, "y": 64, "flags": 4}, + {"matrix": [9, 0], "x": 224, "y": 64, "flags": 4} + ], + "max_brightness": 128, + "split_count": [32, 32] }, "dip_switch": { "matrix_grid": [ [0,6], [1,6], [5,6], [6,6] ] diff --git a/keyboards/helix/rev3_5rows/keymaps/via/config.h b/keyboards/helix/rev3_5rows/keymaps/via/config.h new file mode 100644 index 000000000000..150418dd0ffb --- /dev/null +++ b/keyboards/helix/rev3_5rows/keymaps/via/config.h @@ -0,0 +1,55 @@ +#pragma once + + +#ifdef RGB_MATRIX_ENABLE +# 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_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +# 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 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. +# define RGB_MATRIX_HUE_STEP 8 +# define RGB_MATRIX_SAT_STEP 8 +# define RGB_MATRIX_VAL_STEP 8 +# define RGB_MATRIX_SPD_STEP 10 + +/* Disable the animations you don't want/need. You will need to disable a good number of these * + * because they take up a lot of space. Disable until you can successfully compile your firmware. */ +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# 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_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# 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_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# 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/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk index a46f9d9c59f3..eb2282d9cd6b 100644 --- a/keyboards/helix/rev3_5rows/rules.mk +++ b/keyboards/helix/rev3_5rows/rules.mk @@ -1,7 +1,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow SPLIT_KEYBOARD = yes -RGB_MATRIX_ENABLE = no +RGB_MATRIX_ENABLE = yes OLED_ENABLE = yes ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = no From 344db0f812641dc9fb8e2a6ae04bb2ba51487bee Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Fri, 1 Dec 2023 22:40:54 +0000 Subject: [PATCH 2/6] mostly working? --- keyboards/helix/rev3_5rows/info.json | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index df6718b914c2..e7305637381e 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -17,25 +17,25 @@ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, - {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, - {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, - {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, - {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 80, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 64, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 32, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 16, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 0, "y": 16, "flags": 4}, {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, - {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, - {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, - {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 0], "x": 96, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 64, "y": 48, "flags": 4}, {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, - {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, - {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, - {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 32, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 16, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 0, "y": 48, "flags": 4}, {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, @@ -49,25 +49,25 @@ {"matrix": [5, 2], "x": 192, "y": 0, "flags": 4}, {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4}, {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4}, - {"matrix": [6, 5], "x": 144, "y": 16, "flags": 4}, - {"matrix": [6, 4], "x": 160, "y": 16, "flags": 4}, - {"matrix": [6, 3], "x": 176, "y": 16, "flags": 4}, - {"matrix": [6, 2], "x": 192, "y": 16, "flags": 4}, - {"matrix": [6, 1], "x": 208, "y": 16, "flags": 4}, - {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4}, + {"matrix": [6, 0], "x": 144, "y": 16, "flags": 4}, + {"matrix": [6, 1], "x": 160, "y": 16, "flags": 4}, + {"matrix": [6, 2], "x": 176, "y": 16, "flags": 4}, + {"matrix": [6, 3], "x": 192, "y": 16, "flags": 4}, + {"matrix": [6, 4], "x": 208, "y": 16, "flags": 4}, + {"matrix": [6, 5], "x": 224, "y": 16, "flags": 4}, {"matrix": [7, 5], "x": 144, "y": 32, "flags": 4}, {"matrix": [7, 4], "x": 160, "y": 32, "flags": 4}, {"matrix": [7, 3], "x": 176, "y": 32, "flags": 4}, {"matrix": [7, 2], "x": 192, "y": 32, "flags": 4}, {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4}, {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4}, - {"matrix": [8, 6], "x": 128, "y": 48, "flags": 4}, - {"matrix": [8, 5], "x": 144, "y": 48, "flags": 4}, - {"matrix": [8, 4], "x": 160, "y": 48, "flags": 4}, + {"matrix": [8, 0], "x": 128, "y": 48, "flags": 4}, + {"matrix": [8, 1], "x": 144, "y": 48, "flags": 4}, + {"matrix": [8, 2], "x": 160, "y": 48, "flags": 4}, {"matrix": [8, 3], "x": 176, "y": 48, "flags": 4}, - {"matrix": [8, 2], "x": 192, "y": 48, "flags": 4}, - {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4}, - {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4}, + {"matrix": [8, 4], "x": 192, "y": 48, "flags": 4}, + {"matrix": [8, 5], "x": 208, "y": 48, "flags": 4}, + {"matrix": [8, 6], "x": 224, "y": 48, "flags": 4}, {"matrix": [9, 6], "x": 128, "y": 64, "flags": 4}, {"matrix": [9, 5], "x": 144, "y": 64, "flags": 4}, {"matrix": [9, 4], "x": 160, "y": 64, "flags": 4}, From 599c86a829a2b6b17bbdf57cafd27904c97fc10d Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Fri, 1 Dec 2023 22:49:33 +0000 Subject: [PATCH 3/6] dasky to the rescue --- keyboards/helix/rev3_5rows/info.json | 48 +++++++++---------- .../helix/rev3_5rows/keymaps/via/config.h | 16 +++++++ 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index e7305637381e..cc2838741b3e 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -17,25 +17,25 @@ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 80, "y": 16, "flags": 4}, - {"matrix": [1, 1], "x": 64, "y": 16, "flags": 4}, - {"matrix": [1, 2], "x": 48, "y": 16, "flags": 4}, - {"matrix": [1, 3], "x": 32, "y": 16, "flags": 4}, - {"matrix": [1, 4], "x": 16, "y": 16, "flags": 4}, - {"matrix": [1, 5], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, - {"matrix": [3, 0], "x": 96, "y": 48, "flags": 4}, - {"matrix": [3, 1], "x": 80, "y": 48, "flags": 4}, - {"matrix": [3, 2], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, - {"matrix": [3, 4], "x": 32, "y": 48, "flags": 4}, - {"matrix": [3, 5], "x": 16, "y": 48, "flags": 4}, - {"matrix": [3, 6], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 966, "y": 48, "flags": 4}, {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, @@ -49,25 +49,25 @@ {"matrix": [5, 2], "x": 192, "y": 0, "flags": 4}, {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4}, {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4}, - {"matrix": [6, 0], "x": 144, "y": 16, "flags": 4}, - {"matrix": [6, 1], "x": 160, "y": 16, "flags": 4}, - {"matrix": [6, 2], "x": 176, "y": 16, "flags": 4}, - {"matrix": [6, 3], "x": 192, "y": 16, "flags": 4}, - {"matrix": [6, 4], "x": 208, "y": 16, "flags": 4}, - {"matrix": [6, 5], "x": 224, "y": 16, "flags": 4}, + {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4}, + {"matrix": [6, 1], "x": 208, "y": 16, "flags": 4}, + {"matrix": [6, 2], "x": 192, "y": 16, "flags": 4}, + {"matrix": [6, 3], "x": 176, "y": 16, "flags": 4}, + {"matrix": [6, 4], "x": 160, "y": 16, "flags": 4}, + {"matrix": [6, 5], "x": 144, "y": 16, "flags": 4}, {"matrix": [7, 5], "x": 144, "y": 32, "flags": 4}, {"matrix": [7, 4], "x": 160, "y": 32, "flags": 4}, {"matrix": [7, 3], "x": 176, "y": 32, "flags": 4}, {"matrix": [7, 2], "x": 192, "y": 32, "flags": 4}, {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4}, {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4}, - {"matrix": [8, 0], "x": 128, "y": 48, "flags": 4}, - {"matrix": [8, 1], "x": 144, "y": 48, "flags": 4}, - {"matrix": [8, 2], "x": 160, "y": 48, "flags": 4}, + {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4}, + {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4}, + {"matrix": [8, 2], "x": 192, "y": 48, "flags": 4}, {"matrix": [8, 3], "x": 176, "y": 48, "flags": 4}, - {"matrix": [8, 4], "x": 192, "y": 48, "flags": 4}, - {"matrix": [8, 5], "x": 208, "y": 48, "flags": 4}, - {"matrix": [8, 6], "x": 224, "y": 48, "flags": 4}, + {"matrix": [8, 4], "x": 160, "y": 48, "flags": 4}, + {"matrix": [8, 5], "x": 144, "y": 48, "flags": 4}, + {"matrix": [8, 6], "x": 128, "y": 48, "flags": 4}, {"matrix": [9, 6], "x": 128, "y": 64, "flags": 4}, {"matrix": [9, 5], "x": 144, "y": 64, "flags": 4}, {"matrix": [9, 4], "x": 160, "y": 64, "flags": 4}, diff --git a/keyboards/helix/rev3_5rows/keymaps/via/config.h b/keyboards/helix/rev3_5rows/keymaps/via/config.h index 150418dd0ffb..e96340e221a8 100644 --- a/keyboards/helix/rev3_5rows/keymaps/via/config.h +++ b/keyboards/helix/rev3_5rows/keymaps/via/config.h @@ -1,3 +1,19 @@ +/* Copyright 2023 keyboard-magpie + * + * 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 . + */ + #pragma once From 9c30c1a5f0a73481c678e970444912797729e62c Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Fri, 1 Dec 2023 22:53:06 +0000 Subject: [PATCH 4/6] typo fix --- keyboards/helix/rev3_5rows/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index cc2838741b3e..7c54b8d466b0 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -35,7 +35,7 @@ {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, - {"matrix": [3, 6], "x": 966, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, From 18fab4f746dd17e18a3c2d992eb40bca7ff57b98 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Fri, 1 Dec 2023 23:07:39 +0000 Subject: [PATCH 5/6] tidy for PR --- .../helix/rev3_5rows/keymaps/via/config.h | 71 ------------------- keyboards/helix/rev3_5rows/rules.mk | 4 +- 2 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 keyboards/helix/rev3_5rows/keymaps/via/config.h diff --git a/keyboards/helix/rev3_5rows/keymaps/via/config.h b/keyboards/helix/rev3_5rows/keymaps/via/config.h deleted file mode 100644 index e96340e221a8..000000000000 --- a/keyboards/helix/rev3_5rows/keymaps/via/config.h +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright 2023 keyboard-magpie - * - * 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 . - */ - -#pragma once - - -#ifdef RGB_MATRIX_ENABLE -# 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_FRAMEBUFFER_EFFECTS -# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -# 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 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -# define RGB_MATRIX_HUE_STEP 8 -# define RGB_MATRIX_SAT_STEP 8 -# define RGB_MATRIX_VAL_STEP 8 -# define RGB_MATRIX_SPD_STEP 10 - -/* Disable the animations you don't want/need. You will need to disable a good number of these * - * because they take up a lot of space. Disable until you can successfully compile your firmware. */ -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# 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_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# 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_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# 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/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk index eb2282d9cd6b..a46f9d9c59f3 100644 --- a/keyboards/helix/rev3_5rows/rules.mk +++ b/keyboards/helix/rev3_5rows/rules.mk @@ -1,7 +1,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow SPLIT_KEYBOARD = yes -RGB_MATRIX_ENABLE = yes +RGB_MATRIX_ENABLE = no OLED_ENABLE = yes ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = no From e8e1830c3fe75e26dceebdba77ee7140d0b61bc1 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Fri, 1 Dec 2023 23:11:13 +0000 Subject: [PATCH 6/6] tidy for PR --- keyboards/helix/rev3_5rows/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index 7c54b8d466b0..0ba9c45476af 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -10,6 +10,9 @@ }, "rgb_matrix": { "driver": "ws2812", + "sat_steps": 8, + "val_steps": 8, + "speed_steps": 10 "layout": [ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},