diff options
author | QMK Bot <hello@qmk.fm> | 2020-12-30 16:35:16 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2020-12-30 16:35:16 +0000 |
commit | f231f24ddaac9781201a4ec9d0171c65af788839 (patch) | |
tree | 1c5b6dca036a9fd1141543f33fee09e7eb5d00c6 | |
parent | b51cc6d67a16fa2f7b6bae7094b27c7ff58bb3a4 (diff) | |
parent | 10096fc42e52e5b22acd6ceef941816401468998 (diff) | |
download | qmk_firmware-f231f24ddaac9781201a4ec9d0171c65af788839.tar.gz qmk_firmware-f231f24ddaac9781201a4ec9d0171c65af788839.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | docs/driver_installation_zadig.md | 2 | ||||
-rw-r--r-- | keyboards/keebio/bdn9/rev2/config.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md index 9b3e8fade..81b840886 100644 --- a/docs/driver_installation_zadig.md +++ b/docs/driver_installation_zadig.md | |||
@@ -71,7 +71,7 @@ The device name here is the name that appears in Zadig, and may not be what the | |||
71 | |`caterina` |Arduino Micro |`2A03:0037` |usbser | | 71 | |`caterina` |Arduino Micro |`2A03:0037` |usbser | |
72 | |`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb | | 72 | |`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb | |
73 | |`USBasp` |USBasp |`16C0:05DC` |libusbK| | 73 | |`USBasp` |USBasp |`16C0:05DC` |libusbK| |
74 | |`apm32-dfu` |??? |`314B:0106` |WinUSB | | 74 | |`apm32-dfu` |APM32 DFU ISP Mode |`314B:0106` |WinUSB | |
75 | |`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB | | 75 | |`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB | |
76 | |`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB | | 76 | |`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB | |
77 | |`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB | | 77 | |`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB | |
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h index a3716fddc..f47c8addc 100644 --- a/keyboards/keebio/bdn9/rev2/config.h +++ b/keyboards/keebio/bdn9/rev2/config.h | |||
@@ -40,7 +40,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
40 | 40 | ||
41 | // Left, Right, Middle | 41 | // Left, Right, Middle |
42 | #define ENCODERS_PAD_A { A8, B3, A10 } | 42 | #define ENCODERS_PAD_A { A8, B3, A10 } |
43 | #define ENCODERS_PAD_B { B11, A15, A9 } | 43 | #define ENCODERS_PAD_B { A4, A15, A9 } |
44 | #define TAP_CODE_DELAY 10 | ||
44 | 45 | ||
45 | #define RGB_DI_PIN B15 | 46 | #define RGB_DI_PIN B15 |
46 | #ifdef RGB_DI_PIN | 47 | #ifdef RGB_DI_PIN |