From 8812a095814fdad3ab245fa2c00e29cb50ee2e92 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 20 Dec 2023 13:31:50 +1100 Subject: Rename `RGB_DISABLE_WHEN_USB_SUSPENDED` -> `RGB_MATRIX_SLEEP` (#22682) --- keyboards/controllerworks/mini36/keymaps/default/config.h | 2 +- keyboards/controllerworks/mini36/keymaps/via/config.h | 2 +- keyboards/controllerworks/mini42/keymaps/default/config.h | 2 +- keyboards/controllerworks/mini42/keymaps/via/config.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/controllerworks') diff --git a/keyboards/controllerworks/mini36/keymaps/default/config.h b/keyboards/controllerworks/mini36/keymaps/default/config.h index 77da61828c..aeca5716c0 100644 --- a/keyboards/controllerworks/mini36/keymaps/default/config.h +++ b/keyboards/controllerworks/mini36/keymaps/default/config.h @@ -21,7 +21,7 @@ # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_SLEEP // 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) diff --git a/keyboards/controllerworks/mini36/keymaps/via/config.h b/keyboards/controllerworks/mini36/keymaps/via/config.h index 77da61828c..aeca5716c0 100644 --- a/keyboards/controllerworks/mini36/keymaps/via/config.h +++ b/keyboards/controllerworks/mini36/keymaps/via/config.h @@ -21,7 +21,7 @@ # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_SLEEP // 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) diff --git a/keyboards/controllerworks/mini42/keymaps/default/config.h b/keyboards/controllerworks/mini42/keymaps/default/config.h index 77da61828c..aeca5716c0 100644 --- a/keyboards/controllerworks/mini42/keymaps/default/config.h +++ b/keyboards/controllerworks/mini42/keymaps/default/config.h @@ -21,7 +21,7 @@ # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_SLEEP // 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) diff --git a/keyboards/controllerworks/mini42/keymaps/via/config.h b/keyboards/controllerworks/mini42/keymaps/via/config.h index e11d5aa37f..5e70c09343 100644 --- a/keyboards/controllerworks/mini42/keymaps/via/config.h +++ b/keyboards/controllerworks/mini42/keymaps/via/config.h @@ -22,7 +22,7 @@ # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_SLEEP // 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) -- cgit v1.2.3 From 9e50faedae5c9c7e8a138050773b06d810505908 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 28 Dec 2023 17:07:40 +0000 Subject: Remove incorrect use of WS2812_PIO_USE_PIO1 (#22771) --- keyboards/controllerworks/city42/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/controllerworks') diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 4e161532f2..7633a27c40 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -17,7 +17,6 @@ #pragma once -#define WS2812_PIO_USE_PIO1 #define RGB_MATRIX_LED_COUNT 42 #define SPI_SCK_PIN GP18 -- cgit v1.2.3 From a5f1438f58d42a452aaeb2df4cc0b4e01b79608e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 4 Jan 2024 06:00:47 +0000 Subject: Migrate RGB Matrix config to info.json - C (#22807) --- keyboards/controllerworks/city42/config.h | 4 +--- keyboards/controllerworks/mini36/config.h | 3 --- keyboards/controllerworks/mini36/info.json | 3 ++- keyboards/controllerworks/mini42/config.h | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) (limited to 'keyboards/controllerworks') diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 7633a27c40..6c42809eaf 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -17,8 +17,6 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 42 - #define SPI_SCK_PIN GP18 #define SPI_MOSI_PIN GP19 #define SPI_MISO_PIN GP16 @@ -28,4 +26,4 @@ #define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h index 4a0c48b1b0..5c22bb2559 100644 --- a/keyboards/controllerworks/mini36/config.h +++ b/keyboards/controllerworks/mini36/config.h @@ -18,9 +18,6 @@ #pragma once #define WS2812_PIO_USE_PIO1 -#define RGB_MATRIX_LED_COUNT 48 -#define RGB_MATRIX_SPLIT \ - { 24, 24 } #define I2C_DRIVER I2CD0 #define I2C1_SCL_PIN GP25 diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json index 3a49b210ac..a3b5365109 100644 --- a/keyboards/controllerworks/mini36/info.json +++ b/keyboards/controllerworks/mini36/info.json @@ -111,7 +111,8 @@ {"flags": 4, "matrix": [6, 4], "x": 217, "y": 41}, {"flags": 4, "matrix": [5, 4], "x": 217, "y": 24}, {"flags": 4, "matrix": [4, 4], "x": 217, "y": 7} - ] + ], + "split_count": [24, 24] }, "community_layouts": ["split_3x5_3"], "layouts": { diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h index 20b6bbac8d..3e5f7fd357 100644 --- a/keyboards/controllerworks/mini42/config.h +++ b/keyboards/controllerworks/mini42/config.h @@ -18,7 +18,6 @@ #pragma once #define WS2812_PIO_USE_PIO1 -#define RGB_MATRIX_LED_COUNT 54 #undef I2C_DRIVER #define I2C_DRIVER I2CD0 -- cgit v1.2.3 From bfcf3c139d461a6d95b4fa83521eb2b5bce8856e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 31 Jan 2024 10:03:24 +0000 Subject: Remove always enabled effects from lighting animation list (#22992) * Remove 'solid_color' from animation list * Remove 'solid'/'none' from animation list --- keyboards/controllerworks/city42/info.json | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/controllerworks') diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index 2976021b11..bff73f7e6f 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -23,7 +23,6 @@ "processor": "RP2040", "rgb_matrix": { "animations": { - "solid_color": true, "alphas_mods": true, "gradient_up_down": true, "gradient_left_right": true, -- cgit v1.2.3