mirror of
https://github.com/firewalkwithm3/qmk_firmware.git
synced 2024-11-22 19:40:29 +08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
6d93d8b56a
|
@ -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
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
VIA_ENABLE = yes
|
||||
CONSOLE_ENABLE = no
|
||||
LTO_ENABLE = yes
|
||||
ENCODER_MAP_ENABLE = yes
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
"maintainer": "nooges",
|
||||
"usb": {
|
||||
"vid": "0xCB10",
|
||||
"pid": "0x1258",
|
||||
"pid": "0x1358",
|
||||
"device_version": "1.0.0"
|
||||
},
|
||||
"matrix_pins": {
|
||||
|
|
Loading…
Reference in a new issue