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

This commit is contained in:
QMK Bot 2022-12-14 02:49:39 +00:00
commit 0fcf481cdd
6 changed files with 25 additions and 22 deletions

View file

@ -2,12 +2,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
#define RGB_MATRIX_LED_COUNT 70
#define RGB_MATRIX_SPLIT { 35, 35 }
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_BAND_VAL

View file

@ -9,7 +9,8 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"oled": true
"oled": true,
"encoder": true
},
"url": "https://boardsource.xyz/projects/60de24d6847112054777bbdd",
"usb": {
@ -20,15 +21,18 @@
"split": {
"enabled": true
},
"encoder": {
"enabled": true
},
"matrix_size": {
"cols": 6,
"rows": 10
},
"rgb_matrix": {
"driver": "WS2812",
"split_count": [35, 35],
"max_brightness": 150,
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true
},
"layout": [
{ "flags": 2, "x": 86, "y": 55 },
{ "flags": 2, "x": 51, "y": 55 },

View file

@ -5,8 +5,8 @@
enum layers {
_QWERTY,
_RAISE,
_LOWER,
_RAISE,
_ADJUST
};
@ -102,3 +102,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______
)
};
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
[_LOWER] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[_RAISE] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
[_ADJUST] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
};
#endif

View file

@ -1 +1,2 @@
VIA_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes

View file

@ -9,3 +9,4 @@
#define I2C_DRIVER I2CD1
#define I2C1_SDA_PIN GP22
#define I2C1_SCL_PIN GP23
#define RGB_DI_PIN GP29

View file

@ -5,10 +5,6 @@
"rows": ["GP14", "GP15", "GP16", "GP17", "GP18"]
},
"processor": "RP2040",
"rgblight": {
"pin": "GP29",
"led_count": 70
},
"encoder": {
"rotary": [
{ "pin_a": "GP8", "pin_b": "GP9" }