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

Usbasploader bootloader option addition #6304

Merged
merged 7 commits into from
Jul 16, 2019
Merged

Usbasploader bootloader option addition #6304

merged 7 commits into from
Jul 16, 2019

Conversation

yiancar
Copy link
Contributor

@yiancar yiancar commented Jul 10, 2019 •
edited
Loading

  • Added USBasploader bootloader option
  • Added documentation

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@yiancar
Copy link
Contributor Author

yiancar commented Jul 10, 2019

@drashna pinging you as requested.
This is probably a good time to add the :usbasp target in the makefile for automatic flashing. this is very similar to the :avrdude target but with the -c usbasp instead of the -c avr109 option.

zvecr
zvecr reviewed Jul 10, 2019
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are also flashing references within docs/getting_started_make_guide.md and docs/newbs_flashing.md (noticed during #5587).

@yiancar
Copy link
Contributor Author

yiancar commented Jul 10, 2019

Both files refer to the make target. They should be appended when :usbasp is added.

@zvecr
Copy link
Member

zvecr commented Jul 11, 2019 •
edited
Loading

I agree with you now the scope of this PR seems a bit clearer.

@drashna
Copy link
Member

drashna commented Jul 11, 2019

oh no.... I set that to "new branch" not "commit". WTF github.....

But either way, that should be all you need to add a :usbasp target.

Also, the reason I wanted to be tagged, was this PR: #6224

In theory, that should remove the need for any documentation for how to flash. As long as the bootloader is set correctly, it should detect and use the correct method.

zvecr
zvecr requested changes Jul 14, 2019
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now this PR also has the flash target, we should make the docs consistent and add the missing sections.

@yiancar
Copy link
Contributor Author

yiancar commented Jul 14, 2019

@drashna can you do the doc or should I?:)

fauxpark
fauxpark requested changes Jul 14, 2019
View reviewed changes
docs/flashing.md Outdated Show resolved Hide resolved
docs/flashing.md Outdated Show resolved Hide resolved
docs/flashing.md

To ensure compatibility with the USBasploader bootloader, make sure this block is present your `rules.mk`:

# Bootloader
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block should be triple-backticked, so it can be syntax highlighted.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I followed what the other sections followed. which is not triple-backtick

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fauxpark I think this can be put off to later. I want to do a big overhaul of the flashing docs (not just this file), once both this, and my :flash target PR get merged.

docs/flashing.md Outdated Show resolved Hide resolved
yiancar and others added 3 commits July 15, 2019 00:44
@yiancar @fauxpark
Update docs/flashing.md
bac3d12 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@yiancar @fauxpark
Update docs/flashing.md
fa1451a 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@yiancar @fauxpark
Update docs/flashing.md
650d17f 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@drashna
Copy link
Member

drashna commented Jul 15, 2019 •
edited
Loading

I can see about updating docs, if you haven't already.

But honestly, I think a separate PR should handle that, since there are a LOT of instances what could/should be changed.

@yiancar
Copy link
Contributor Author

yiancar commented Jul 15, 2019

Up to you people. Let me know what you want me to do to merge this ty.

@drashna drashna merged commit 3538955 into qmk:master Jul 16, 2019
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request Jul 16, 2019
@yiancar @fauxpark @drashna
Usbasploader bootloader option addition (qmk#6304)
9d9221e 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jul 19, 2019
@yiancar @fauxpark @fdidron
Usbasploader bootloader option addition (qmk#6304)
7f75ee8 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
@yiancar @fauxpark @doughsay
Usbasploader bootloader option addition (qmk#6304)
fc73563 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
swanmatch pushed a commit to swanmatch/qmk_firmware that referenced this pull request Sep 3, 2019
@yiancar @fauxpark @drashna
Usbasploader bootloader option addition (qmk#6304)
10a1089 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
@yiancar @fauxpark
Usbasploader bootloader option addition (qmk#6304)
46d1e6a 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
@yiancar @fauxpark @drashna
Usbasploader bootloader option addition (qmk#6304)
0ebdafa 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
swamp09 pushed a commit to swamp09/qmk_firmware that referenced this pull request Mar 11, 2020
@yiancar @fauxpark @swamp09
Usbasploader bootloader option addition (qmk#6304)
a8b05fa 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@yiancar yiancar deleted the usbasploader branch June 12, 2021 00:33
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@yiancar @fauxpark @drashna
Usbasploader bootloader option addition (qmk#6304)
8e431f7 
* Added USBasp bootloader option for USBasploader

* author comment

* ifdef fix :)

* Add usbasp target

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update docs/flashing.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark requested changes

@drashna drashna drashna approved these changes

@yanfali yanfali Awaiting requested review from yanfali

@jackhumbert jackhumbert Awaiting requested review from jackhumbert

@mechmerlin mechmerlin Awaiting requested review from mechmerlin

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

@skullydazed skullydazed Awaiting requested review from skullydazed

@zvecr zvecr Awaiting requested review from zvecr

Assignees
No one assigned
Labels
core documentation enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yiancar @zvecr @drashna @fauxpark