Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-06-15 12:28:11 +00:00
commit b9b64751d7
73 changed files with 25 additions and 67 deletions

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 68
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -4,4 +4,3 @@
#pragma once
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT

View File

@ -4,4 +4,3 @@
#pragma once
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT

View File

@ -5,7 +5,6 @@
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 64
# define RGBLIGHT_SPLIT
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17

View File

@ -18,7 +18,6 @@
#pragma once
#define RGBLED_NUM 38
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -29,7 +29,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLED_NUM 36
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 54 // Number of LEDs
# define RGBLIGHT_SPLIT
#endif
#ifdef RGB_MATRIX_ENABLE

View File

@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define USE_I2C
#define RGBLED_NUM 2
#define RGBLIGHT_SPLIT
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

View File

@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

View File

@ -8,6 +8,9 @@
"pid": "0x1B1E",
"device_version": "0.0.1"
},
"rgblight": {
"split": true
},
"ws2812": {
"pin": "D3"
},

View File

@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define RGBLED_NUM 16
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

View File

@ -44,8 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 28 // Number of LEDs
#define RGBLIGHT_SPLIT
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View File

@ -20,6 +20,7 @@
"pin": "D3"
},
"rgblight": {
"split": true,
"max_brightness": 120
},
"split": {

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#if !defined(RGBLED_NUM)
# define RGBLED_NUM 30
# define RGBLIGHT_SPLIT
# define RGBLIGHT_LAYERS
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// WS2812 RGB LED strip input and number of LEDs
#define RGBLED_NUM 20
#define RGBLIGHT_SPLIT
#define AUDIO_PIN C6

View File

@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define RGBLED_NUM 20
#define RGBLIGHT_SPLIT
#define DEBUG_LED_PIN C13

View File

@ -33,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 57
#define RGBLIGHT_SPLIT
#define DEBUG_LED_PIN C13

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// WS2812 RGB LED strip input and number of LEDs
#define RGBLED_NUM 20
#define RGBLIGHT_SPLIT
#define RGBLIGHT_LIMIT_VAL 80
#define DEBUG_LED_PIN D6

View File

@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MASTER_RIGHT
# define RGBLED_NUM 12
# define RGBLIGHT_SPLIT
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 1
# define RGBLIGHT_VAL_STEP 1

View File

@ -64,7 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8

View File

@ -64,7 +64,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8

View File

@ -19,7 +19,6 @@
#pragma once
#define RGBLED_NUM 38
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -19,6 +19,9 @@
"ws2812": {
"pin": "D2"
},
"rgblight": {
"split": true
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View File

@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_SLEEP
#define RGBLIGHT_SPLIT
#ifndef IOS_DEVICE_ENABLE
#if RGBLED_NUM <= 6

View File

@ -13,6 +13,9 @@
"levels": 5,
"breathing": true
},
"rgblight": {
"split": true
},
"ws2812": {
"pin": "D4"
},

View File

@ -87,7 +87,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SLEEP
#define RGBLIGHT_SPLIT
#ifndef IOS_DEVICE_ENABLE
#if RGBLED_NUM <= 6

View File

@ -12,6 +12,9 @@
"pin": "B6",
"levels": 5
},
"rgblight": {
"split": true
},
"ws2812": {
"pin": "D4"
},

View File

@ -38,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_SLEEP
#define RGBLIGHT_SPLIT
#ifndef IOS_DEVICE_ENABLE
#if RGBLED_NUM <= 6

View File

@ -12,6 +12,9 @@
"pin": "C6",
"levels": 5
},
"rgblight": {
"split": true
},
"ws2812": {
"pin": "D4"
},

View File

@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 56
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGBLIGHT_SPLIT 1
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -19,6 +19,9 @@
"split": {
"soft_serial_pin": "D0"
},
"rgblight": {
"split": true
},
"ws2812": {
"pin": "F0"
},

View File

@ -6,7 +6,6 @@
#define MASTER_LEFT
#define RGBLED_NUM 88
#define RGBLIGHT_SPLIT
#define RGB_MATRIX_LED_COUNT 88
#define RGB_MATRIX_SPLIT { 44, 44 }

View File

@ -18,7 +18,6 @@
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 60 // Total number of LEDs
# define RGBLIGHT_SPLIT
#endif
// Limit the power draw

View File

@ -21,5 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGBLED_NUM 72 // Number of LEDs
#define RGBLIGHT_SPLIT

View File

@ -21,4 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGBLED_NUM 70
#define RGBLIGHT_SPLIT

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SELECT_SOFT_SERIAL_SPEED 1
# define RGBLED_NUM 68
# define RGBLIGHT_SPLIT
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# ifndef IOS_DEVICE_ENABLE

View File

@ -9,7 +9,6 @@
#define MASTER_LEFT
//#define MASTER_RIGHT
#define RGBLIGHT_SPLIT
#define SPLIT_LAYER_STATE_ENABLE
#define SPLIT_LED_STATE_ENABLE
#define SPLIT_MODS_ENABLE

View File

@ -9,7 +9,6 @@
#define MASTER_LEFT
//#define MASTER_RIGHT
#define RGBLIGHT_SPLIT
#define SPLIT_LAYER_STATE_ENABLE
#define SPLIT_LED_STATE_ENABLE
#define SPLIT_MODS_ENABLE

View File

@ -20,7 +20,6 @@
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLED_NUM 83
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT RGBLED_NUM

View File

@ -20,7 +20,6 @@
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLED_NUM 100
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT RGBLED_NUM

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_I2C
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

View File

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LOCKING_RESYNC_ENABLE
#define RGBLED_NUM 8
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17

View File

@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
"rgblight": {
"split": true
},
"ws2812": {
"pin": "D3"
},

View File

@ -24,7 +24,6 @@
#define SERIAL_USART_SPEED 921600
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLIGHT_LAYERS
#define RGBLIGHT_DEFAULT_HUE 213

View File

@ -26,7 +26,6 @@
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SPLIT
#define RGBLIGHT_LAYERS
#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -40,7 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 20
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -40,7 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 24
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 36
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 42
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 48
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 48
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 56
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 64
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 60
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -37,7 +37,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 70
#define RGBLIGHT_SPLIT
#endif
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 70

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 70
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -36,7 +36,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 80
#define RGBLIGHT_SPLIT
#define SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/

View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_I2C
/* ws2812 RGB LED */
#define RGBLIGHT_SPLIT
#define RGBLED_NUM 2
#define RGBLIGHT_LAYERS
#define RGBLIGHT_HUE_STEP 10

View File

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SPLIT_HAND_MATRIX_GRID D4,D3
/* ws2812 RGB LED */
#define RGBLIGHT_SPLIT
#define RGBLED_NUM 84
#define RGBLIGHT_LAYERS
#define RGBLIGHT_HUE_STEP 10

View File

@ -24,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_SPLIT // sync LEDs between RIGHT and LEFT hand
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View File

@ -8,6 +8,9 @@
"pid": "0x5244",
"device_version": "1.0.0"
},
"rgblight": {
"split": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 66 // Number of LEDs
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8

View File

@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM
#define RGBLED_NUM 31
#define RGBLIGHT_SPLIT
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM
#define RGBLED_NUM 86
#define RGBLIGHT_SPLIT
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM
#define RGBLED_NUM 32
#define RGBLIGHT_SPLIT
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM
#define RGBLED_NUM 21
#define RGBLIGHT_SPLIT
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGBLED_NUM
#define RGBLED_NUM 20
#define RGBLIGHT_SPLIT
#endif
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MASTER_RIGHT
//#define RGBLIGHT_SPLIT
#define RGBLED_NUM 52
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 52

View File

@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
//#define RGBLIGHT_SPLIT
#define RGBLED_NUM 24 // Number of LEDs
/*

View File

@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8