TheWanderingCrow/vial-qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qmk/master' into merge-2023-06-03

Browse source
This commit is contained in:
Ilya Zhuravlev 2023-06-03 12:35:25 -06:00
commit d6e95213e3
14389 changed files with 536595 additions and 476101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/binepad/bnr1/keymaps/default/keymap.c
View file

@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_L0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_L1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }
};

2
keyboards/binepad/bnr1/keymaps/via/keymap.c
View file

@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_L0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_L1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }
};

5
keyboards/binepad/bnr1/v1/info.json
View file

@ -13,10 +13,7 @@
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "D6",
"pin_b": "D7"
}
{"pin_a": "D6", "pin_b": "D7"}
]
}
}

5
keyboards/binepad/bnr1/v2/info.json
View file

@ -13,10 +13,7 @@
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "B3",
"pin_b": "B4"
}
{"pin_a": "B3", "pin_b": "B4"}
]
}
}