mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-08 04:49:20 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
7778e6dcb0
2 changed files with 2 additions and 4 deletions
|
@ -3,8 +3,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define ENCODER_DEFAULT_POS 0x3 // enable 1:1 resolution
|
|
||||||
|
|
||||||
// Default PIO0 cases flickering in this board. Setting to PIO1 resolves this issue.
|
// Default PIO0 cases flickering in this board. Setting to PIO1 resolves this issue.
|
||||||
#define WS2812_PIO_USE_PIO1
|
#define WS2812_PIO_USE_PIO1
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"encoder": {
|
"encoder": {
|
||||||
"rotary": [
|
"rotary": [
|
||||||
{"pin_a": "GP13", "pin_b": "GP14"}
|
{"pin_a": "GP13", "pin_b": "GP14", "resolution": 2}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"features": {
|
"features": {
|
||||||
|
@ -83,4 +83,4 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue