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

This commit is contained in:
QMK Bot 2023-05-24 18:49:12 +00:00
commit 345659296e
3 changed files with 11 additions and 1 deletions

View File

@ -46,3 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
[3] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
};
#endif

View File

@ -1,3 +1,4 @@
VIA_ENABLE = yes
CONSOLE_ENABLE = no
LTO_ENABLE = yes
ENCODER_MAP_ENABLE = yes

View File

@ -5,7 +5,7 @@
"maintainer": "nooges",
"usb": {
"vid": "0xCB10",
"pid": "0x1258",
"pid": "0x1358",
"device_version": "1.0.0"
},
"matrix_pins": {