qmk merge 20240225 - 0.24.11 - fixes for breaking changes

This commit is contained in:
Sadek Baroudi 2024-05-22 04:24:23 -07:00
parent 00962f0876
commit 833146239e
51 changed files with 84 additions and 84 deletions

View File

@ -42,7 +42,7 @@
#define RGB_DI_PIN F4
#ifdef RGB_DI_PIN
#define RGBLED_NUM 13
#define RGBLIGHT_LED_COUNT 13
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -36,8 +36,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#undef SSD1306OLED
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
#define RGBLED_NUM 27
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 27
//#define RGBLED_SPLIT { 27, 27 }
#define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_LAYERS

View File

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN F0
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 40
#define RGBLIGHT_LED_COUNT 40
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 40
#define RGBLIGHT_LED_COUNT 40
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ANIMATIONS
#undef RGBLIGHT_ANIMATIONS
#endif
#define RGBLED_NUM 36
#define RGBLIGHT_LED_COUNT 36
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
// Use twinkle as the default rgb mode for the layers
#define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
#define RGBLED_NUM 52
#define RGBLIGHT_LED_COUNT 52
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -4,7 +4,7 @@
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 36
#define RGBLIGHT_LED_COUNT 36
#define RGBLED_SPLIT {18, 18}
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16

View File

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN B3
#ifdef WS2812_DI_PIN
#define RGBLED_NUM 13
#define RGBLIGHT_LED_COUNT 13
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
// Use twinkle as the default rgb mode for the layers
#define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
// Use twinkle as the default rgb mode for the layers
#define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
// #define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
#define RGBLED_NUM 2
#define RGBLIGHT_LED_COUNT 2
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -30,9 +30,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Use twinkle as the default rgb mode for the layers
#define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
// 6 column rgb config
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
// 5 column rgb config
// #define RGBLED_NUM 36
// #define RGBLIGHT_LED_COUNT 36
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -2,10 +2,10 @@
#ifdef FFKB_TRACKPOINT_BUILD
#undef ENCODERS_PAD_A
#undef ENCODERS_PAD_B
#ifdef RGBLED_NUM
#undef RGBLED_NUM
#ifdef RGBLIGHT_LED_COUNT
#undef RGBLIGHT_LED_COUNT
#endif
#define RGBLED_NUM 7
#define RGBLIGHT_LED_COUNT 7
#define PS2_CLOCK_PIN GP8
#define PS2_DATA_PIN GP7
#endif

View File

@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
// Use twinkle as the default rgb mode for the layers
#define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
#define RGBLED_NUM 19
#define RGBLIGHT_LED_COUNT 19
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 65
#define RGBLIGHT_LED_COUNT 65
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -58,7 +58,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN GP9
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 21, 21 }
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -71,7 +71,7 @@
#endif //BACKLIGHT_ENABLE
#define WS2812_DI_PIN GP25
#define RGBLED_NUM 63
#define RGBLIGHT_LED_COUNT 63
#define RGBLIGHT_DEFAULT_HUE 180
#define RGBLIGHT_DEFAULT_SAT 255

View File

@ -15,7 +15,7 @@
#define RGB_MATRIX_KEYPRESSES
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT

View File

@ -10,7 +10,7 @@
#define RGB_MATRIX_KEYPRESSES
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT

View File

@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef WS2812_DI_PIN
#define RGBLED_NUM 13
#define RGBLIGHT_LED_COUNT 13
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -54,4 +54,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define WS2812_DI_PIN D3
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 12
#define RGBLIGHT_LED_COUNT 12

View File

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef WS2812_DI_PIN
#define RGBLED_NUM 40
#define RGBLIGHT_LED_COUNT 40
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGBLED_NUM 12
#define RGBLIGHT_LED_COUNT 12
#ifdef THUMBSTICK_ENABLE
# define ANALOG_JOYSTICK_X_AXIS_PIN F4

View File

@ -19,4 +19,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0002
#define RGBLED_NUM 36
#define RGBLIGHT_LED_COUNT 36

View File

@ -74,13 +74,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// └─────────────────────────────────────────────────┘
#define WS2812_DI_PIN D3
#ifndef RGBLED_NUM
# define RGBLED_NUM 42
#ifndef RGBLIGHT_LED_COUNT
# define RGBLIGHT_LED_COUNT 42
#endif
#ifndef RGBLED_SPLIT
# define RGBLED_SPLIT { 21, 21 }
#endif
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
@ -93,7 +93,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
# define RGB_MATRIX_STARTUP_HUE 35
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_SLEEP
# define RGB_MATRIX_KEYPRESSES
#endif

View File

@ -82,7 +82,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D4
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 47
#define RGBLIGHT_LED_COUNT 47
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -52,7 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 21, 21 }
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
@ -76,7 +76,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
#define RGB_MATRIX_STARTUP_HUE 35
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYREACTIVE_ENABLED

View File

@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN GP26
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 21
#define RGBLIGHT_LED_COUNT 21
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
@ -63,7 +63,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
#define RGB_MATRIX_STARTUP_HUE 35
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYREACTIVE_ENABLED

View File

@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 21, 21 }
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
@ -68,7 +68,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
#define RGB_MATRIX_STARTUP_HUE 35
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYREACTIVE_ENABLED

View File

@ -4,7 +4,7 @@
#define MOUSE_EXTENDED_REPORT
#define RGB_MATRIX_KEYPRESSES
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT

View File

@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 66
#define RGBLIGHT_LED_COUNT 66
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -53,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 66
#define RGBLIGHT_LED_COUNT 66
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -53,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 70
#define RGBLIGHT_LED_COUNT 70
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN GP25
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 66
#define RGBLIGHT_LED_COUNT 66
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 66
#define RGBLIGHT_LED_COUNT 66
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -30,10 +30,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#ifdef RGBLED_NUM
#undef RGBLED_NUM
#ifdef RGBLIGHT_LED_COUNT
#undef RGBLIGHT_LED_COUNT
#endif
#define RGBLED_NUM 69
#define RGBLIGHT_LED_COUNT 69
#endif
#ifdef RGB_MATRIX_ENABLE

View File

@ -62,7 +62,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 66
#define RGBLIGHT_LED_COUNT 66
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -85,8 +85,8 @@
#endif
#ifdef VIK_PER56_CIRQUE_LEDS
#ifdef RGBLED_NUM
#undef RGBLED_NUM
#ifdef RGBLIGHT_LED_COUNT
#undef RGBLIGHT_LED_COUNT
#endif
#if !defined(VIK_RETAIN_KB_WS2812_DI_PIN)
#ifdef WS2812_DI_PIN
@ -94,7 +94,7 @@
#endif
#define WS2812_DI_PIN VIK_WS2812_DI_PIN
#endif
#define RGBLED_NUM 4
#define RGBLIGHT_LED_COUNT 4
#endif
#ifdef VIK_PER56_PMW3360_LEDS
@ -103,8 +103,8 @@
#define PMW33XX_CPI 1000
#define PMW33XX_CS_DIVISOR 8
#ifdef RGBLED_NUM
#undef RGBLED_NUM
#ifdef RGBLIGHT_LED_COUNT
#undef RGBLIGHT_LED_COUNT
#endif
#if !defined(VIK_RETAIN_KB_WS2812_DI_PIN)
#ifdef WS2812_DI_PIN
@ -112,7 +112,7 @@
#endif
#define WS2812_DI_PIN VIK_WS2812_DI_PIN
#endif
#define RGBLED_NUM 4
#define RGBLIGHT_LED_COUNT 4
#endif
#ifdef VIK_PMW3360
@ -174,8 +174,8 @@
#ifdef VIK_EC11_EVQWGD001
#ifdef VIK_RGB_ONLY
#ifdef RGBLED_NUM
#undef RGBLED_NUM
#ifdef RGBLIGHT_LED_COUNT
#undef RGBLIGHT_LED_COUNT
#endif
#if !defined(VIK_RETAIN_KB_WS2812_DI_PIN)
#ifdef WS2812_DI_PIN
@ -183,7 +183,7 @@
#endif
#define WS2812_DI_PIN VIK_WS2812_DI_PIN
#endif
#define RGBLED_NUM 4
#define RGBLIGHT_LED_COUNT 4
#endif
#endif

View File

@ -99,7 +99,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN GP16
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 10 // Arbitrary number, gets overridden by the vik module stuff below
#define RGBLIGHT_LED_COUNT 10 // Arbitrary number, gets overridden by the vik module stuff below
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -47,7 +47,7 @@
#define WS2812_DI_PIN D3
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 36
#define RGBLIGHT_LED_COUNT 36
#define RGBLED_SPLIT {18, 18}
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16

View File

@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEFAULT_RGB_LAYER_MODE RGBLIGHT_MODE_TWINKLE+2
// 6 column rgb config
#define RGBLED_NUM 45
#define RGBLIGHT_LED_COUNT 45
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 16
@ -39,26 +39,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// 6 column rgb config with center leds
#ifdef FP_VM_RGB_6COL_WITH_CENTER
#undef RGBLED_NUM
#define RGBLED_NUM 49
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 49
#endif
// 5 column rgb config
#ifdef FP_VM_RGB_5COL
#undef RGBLED_NUM
#define RGBLED_NUM 39
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 39
#endif
// 5 column rgb config with center leds
#ifdef FP_VM_RGB_5COL_WITH_CENTER
#undef RGBLED_NUM
#define RGBLED_NUM 43
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 43
#endif
// VIK only rgb config
#ifdef FP_VM_RGB_CENTER_ONLY
#undef RGBLED_NUM
#define RGBLED_NUM 4
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 4
#undef RGBLIGHT_LIMIT_VAL
#define RGBLIGHT_LIMIT_VAL 255
#endif

View File

@ -39,11 +39,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SPLIT
#if defined(VIK_PER56_CIRQUE_LEDS) || defined(VIK_PER56_PMW3360_LEDS) || defined(VIK_EC11_EVQWGD001)
#define RGBLED_SPLIT { 10, 6 }
#define RGBLED_NUM 16
#define RGBLIGHT_LED_COUNT 16
#define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
#else
#define RGBLED_SPLIT { 6, 6 }
#define RGBLED_NUM 12
#define RGBLIGHT_LED_COUNT 12
#define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0, 6, 7, 8, 9, 10, 11 }
#endif
#define RGBLIGHT_HUE_STEP 16
@ -67,7 +67,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_SPLIT { 6, 6 }
#define RGB_MATRIX_LED_COUNT 12
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYREACTIVE_ENABLED

View File

@ -54,7 +54,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 21, 21 }
#define RGBLED_NUM 42
#define RGBLIGHT_LED_COUNT 42
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16
@ -78,7 +78,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
#define RGB_MATRIX_STARTUP_HUE 35
#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYREACTIVE_ENABLED

View File

@ -108,7 +108,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DI_PIN GP16
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 10 // Arbitrary number, gets overridden by the vik module stuff below
#define RGBLIGHT_LED_COUNT 10 // Arbitrary number, gets overridden by the vik module stuff below
#define RGBLIGHT_HUE_STEP 16
#define RGBLIGHT_SAT_STEP 16
#define RGBLIGHT_VAL_STEP 16

View File

@ -7,7 +7,7 @@
#define RGB_DI_PIN B3
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 18 // Number of LEDs
# define RGBLIGHT_LED_COUNT 18 // Number of LEDs
# define RGBLED_SPLIT \
{ 9, 9 }
# define RGBLIGHT_SPLIT

View File

@ -111,7 +111,7 @@ bool rgb_base_layer_keymap(layer_state_t state) {
// Instead of having two separate firmware files, you can use these two lines, but they are a bit buggier
//rgblight_sethsv_range(HSV_PURPLE, 0, 9);
//rgblight_sethsv_range(16, 255, 255, 9, RGBLED_NUM);
//rgblight_sethsv_range(16, 255, 255, 9, RGBLIGHT_LED_COUNT);
#endif
return true;

View File

@ -27,8 +27,8 @@
/* ws2812 RGB LED */
#undef RGB_DI_PIN
#define RGB_DI_PIN B3
#undef RGBLED_NUM
#define RGBLED_NUM 16 // Number of LEDs
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 16 // Number of LEDs
// See rgb_stuff.c for how these are applied - I wanted to flip these for my red themed keycaps
#define BASE_LAYER_RGB_HUE 0

View File

@ -20,6 +20,6 @@
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 11
#define RGBLIGHT_LED_COUNT 11
#endif

View File

@ -20,6 +20,6 @@
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 11
#define RGBLIGHT_LED_COUNT 11
#endif

View File

@ -172,8 +172,8 @@
// To enable this, just pass RGB_LED_RING=yes at the command line when building
#if defined(RGBLIGHT_ENABLE) && defined(RGB_LED_RING)
#undef RGBLED_NUM
#define RGBLED_NUM 12
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 12
#endif
// To enable this, just pass RGB_MATRIX_BAND_VAL_LAYERS=yes at the command line when building