diff options
Diffstat (limited to 'keyboards/matrix')
-rw-r--r-- | keyboards/matrix/abelx/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/abelx/info.json | 3 | ||||
-rw-r--r-- | keyboards/matrix/cain_re/config.h | 4 | ||||
-rw-r--r-- | keyboards/matrix/cain_re/info.json | 5 | ||||
-rw-r--r-- | keyboards/matrix/falcon/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/falcon/info.json | 3 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev1/config.h | 3 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev1/info.json | 4 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev2/config.h | 2 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev2/info.json | 4 | ||||
-rw-r--r-- | keyboards/matrix/m20add/config.h | 3 | ||||
-rw-r--r-- | keyboards/matrix/m20add/info.json | 3 | ||||
-rw-r--r-- | keyboards/matrix/me/config.h | 1 | ||||
-rw-r--r-- | keyboards/matrix/me/info.json | 3 | ||||
-rw-r--r-- | keyboards/matrix/noah/config.h | 7 | ||||
-rw-r--r-- | keyboards/matrix/noah/info.json | 3 |
16 files changed, 29 insertions, 21 deletions
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h index a1eaecf36e..7f6793b979 100644 --- a/keyboards/matrix/abelx/config.h +++ b/keyboards/matrix/abelx/config.h @@ -90,7 +90,6 @@ // rgb light setting -#define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json index 60a272dc1f..f020f429d6 100644 --- a/keyboards/matrix/abelx/info.json +++ b/keyboards/matrix/abelx/info.json @@ -8,6 +8,9 @@ "pid": "0xAB87", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 9 + }, "ws2812": { "pin": "B4" }, diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 017961460c..b7ae408242 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -30,13 +30,9 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP -#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 } #define CAPS_PIN D3 #define NUM_PIN F7 diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index 5b89ed83ef..b2ceda7e65 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -8,6 +8,11 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 14, + "sleep": true, + "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3] + }, "ws2812": { "pin": "E6" }, diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h index d817e8b6f2..4d7eb62efa 100644 --- a/keyboards/matrix/falcon/config.h +++ b/keyboards/matrix/falcon/config.h @@ -27,7 +27,6 @@ //#define NO_PRINT //rgb light setting -#define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json index 6c0bb7b085..86cfbe66fe 100644 --- a/keyboards/matrix/falcon/info.json +++ b/keyboards/matrix/falcon/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "E2" }, + "rgblight": { + "led_count": 4 + }, "ws2812": { "pin": "D1" }, diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h index f0ad633575..5ed4aa0075 100644 --- a/keyboards/matrix/m12og/rev1/config.h +++ b/keyboards/matrix/m12og/rev1/config.h @@ -42,7 +42,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define RGBLED_NUM 16 -#define RGBLIGHT_SLEEP #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json index b74c059008..8187c81539 100644 --- a/keyboards/matrix/m12og/rev1/info.json +++ b/keyboards/matrix/m12og/rev1/info.json @@ -12,6 +12,10 @@ "caps_lock": "B6", "scroll_lock": "B5" }, + "rgblight": { + "led_count": 16, + "sleep": true + }, "ws2812": { "pin": "B8" }, diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h index 7fb34f5001..353521e6b8 100644 --- a/keyboards/matrix/m12og/rev2/config.h +++ b/keyboards/matrix/m12og/rev2/config.h @@ -14,9 +14,7 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json index e6e77ba1ee..7eb5c328d5 100644 --- a/keyboards/matrix/m12og/rev2/info.json +++ b/keyboards/matrix/m12og/rev2/info.json @@ -8,6 +8,10 @@ "pid": "0x8712", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 16, + "sleep": true + }, "ws2812": { "pin": "B3" }, diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 421773affc..5e301cf1c4 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -79,7 +79,6 @@ #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 // rgb light setting -#define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -94,4 +93,4 @@ #define DRIVER_ADDR_1 0b1110100 #define DRIVER_COUNT 1 -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT 20 diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json index 7d88bb81f5..25abd25827 100644 --- a/keyboards/matrix/m20add/info.json +++ b/keyboards/matrix/m20add/info.json @@ -8,6 +8,9 @@ "pid": "0x20AD", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 20 + }, "ws2812": { "pin": "B4" }, diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h index 8ee1b57bde..2ba6684fd7 100644 --- a/keyboards/matrix/me/config.h +++ b/keyboards/matrix/me/config.h @@ -27,7 +27,6 @@ //#define NO_PRINT //rgb light setting -#define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json index 935035317c..2cc91e3220 100644 --- a/keyboards/matrix/me/info.json +++ b/keyboards/matrix/me/info.json @@ -17,6 +17,9 @@ "caps_lock": "E6", "scroll_lock": "D2" }, + "rgblight": { + "led_count": 4 + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 5a74ab5206..4a3e4d83c9 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -75,7 +75,6 @@ # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH /* indicator rgb */ -#define RGBLED_NUM 7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -86,9 +85,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - - -// tapping setting -//#define TAPPING_TERM 200 -//#define RETRO_TAPPING -//#define PERMISSIVE_HOLD diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index 33dedc6bce..67c5fe0221 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -8,6 +8,9 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 7 + }, "ws2812": { "pin": "B1" }, |