Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Keyboard] Add Discipad, Update Zadig doc for USBaspLoader #6771

Merged
merged 17 commits into from
Sep 21, 2019
Merged

[Keyboard] Add Discipad, Update Zadig doc for USBaspLoader #6771

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3638f81
add discipad
coseyfannitutti Sep 19, 2019
0f6d71a
Update driver_installation_zadig.md
coseyfannitutti Sep 19, 2019
da31295
Update keyboards/coseyfannitutti/discipad/info.json
coseyfannitutti Sep 19, 2019
8bfff27
Update keyboards/coseyfannitutti/discipad/readme.md
coseyfannitutti Sep 19, 2019
bdb77c7
Update rules.mk
coseyfannitutti Sep 19, 2019
68a1f6c
Merge branch 'master' of https://github.com/coseyfannitutti/qmk_firmware
coseyfannitutti Sep 19, 2019
250e3e9
Update keyboards/coseyfannitutti/discipad/rules.mk
coseyfannitutti Sep 19, 2019
9d7b93b
Update docs/driver_installation_zadig.md
coseyfannitutti Sep 20, 2019
99ed304
Update keyboards/coseyfannitutti/discipad/discipad.c
coseyfannitutti Sep 20, 2019
56597b8
Update docs/driver_installation_zadig.md
coseyfannitutti Sep 20, 2019
756ab20
Update docs/driver_installation_zadig.md
coseyfannitutti Sep 20, 2019
4c64ecc
Update rules.mk
coseyfannitutti Sep 20, 2019
ec8104b
Update rules.mk
coseyfannitutti Sep 20, 2019
1921826
Update discipad.c
coseyfannitutti Sep 20, 2019
180daa5
Update driver_installation_zadig.md
coseyfannitutti Sep 20, 2019
5d22faf
Update config.h
coseyfannitutti Sep 20, 2019
7d2b1d5
Merge branch 'master' into master
coseyfannitutti Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into master
  • Loading branch information
@coseyfannitutti
coseyfannitutti committed Sep 20, 2019
commit 7d2b1d5332943d2fa9ca386b56b1cd755c0dc0c5
3 changes: 2 additions & 1 deletion docs/driver_installation_zadig.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Some keyboards may have specific instructions for entering the bootloader. For e
To put a device in bootloader mode with USBaspLoader, tap the `RESET` button while holding down the `BOOT` button.
Alternatively, hold `BOOT` while inserting the USB cable.

Zadig will automatically detect the bootloader device. You may sometimes need to check **Options -> List All Devices**.
Zadig will automatically detect the bootloader device. You may sometimes need to check **Options → List All Devices**.

- For keyboards with Atmel AVR MCUs, the bootloader will be named something similar to `ATm32U4DFU`, and have a Vendor ID of `03EB`.
- USBasp bootloaders will appear as `USBasp`, with a VID/PID of `16C0:05DC`.
- AVR keyboards flashed with the QMK-DFU bootloader will be named `<keyboard name> Bootloader` and will also have the VID `03EB`.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.