tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2020-12-30 16:35:16 +00:00
parent b51cc6d67a 10096fc42e
commit f231f24dda
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/driver_installation_zadig.md
View File

@ -71,7 +71,7 @@ The device name here is the name that appears in Zadig, and may not be what the
|`caterina` |Arduino Micro |`2A03:0037` |usbser | |`caterina` |Arduino Micro |`2A03:0037` |usbser |
|`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb | |`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb |
|`USBasp` |USBasp |`16C0:05DC` |libusbK| |`USBasp` |USBasp |`16C0:05DC` |libusbK|
|`apm32-dfu` |??? |`314B:0106` |WinUSB | |`apm32-dfu` |APM32 DFU ISP Mode |`314B:0106` |WinUSB |
|`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB | |`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB |
|`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB | |`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB |
|`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB | |`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB |

3
keyboards/keebio/bdn9/rev2/config.h
View File

@ -40,7 +40,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Left, Right, Middle // Left, Right, Middle
#define ENCODERS_PAD_A { A8, B3, A10 } #define ENCODERS_PAD_A { A8, B3, A10 }
#define ENCODERS_PAD_B { B11, A15, A9 } #define ENCODERS_PAD_B { A4, A15, A9 }
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15
#ifdef RGB_DI_PIN #ifdef RGB_DI_PIN