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

Updates bootloader settings, adds file size check #2029

Merged
merged 13 commits into from
Nov 28, 2017
Merged

Updates bootloader settings, adds file size check #2029

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ec256c3
pull fuse settings for bootloader jump
jackhumbert Nov 17, 2017
bc46f57
fix 32a chips
jackhumbert Nov 17, 2017
d5e75d2
make automatic bootloader selection optional
jackhumbert Nov 18, 2017
54f4201
quantify bootloaders
jackhumbert Nov 18, 2017
9ab3aeb
fixs #164, speeds up dfu reset
jackhumbert Nov 19, 2017
4f4383a
fix for chips w/o usb
jackhumbert Nov 19, 2017
0312b31
missing an n
jackhumbert Nov 19, 2017
a73a068
fix bootloader sizes, use words for addresses
jackhumbert Nov 20, 2017
bb2fb52
fix bmini, pearl, and [[ issue, make things quiet
jackhumbert Nov 20, 2017
66e05b5
ignore avr errors on arm for now
jackhumbert Nov 20, 2017
f4dd4ed
update settings for the light
jackhumbert Nov 21, 2017
d68b42f
document bootloader stuff
jackhumbert Nov 21, 2017
0a19469
add bootloader title
jackhumbert Nov 21, 2017
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
Next Next commit
missing an n
  • Loading branch information
@jackhumbert
jackhumbert committed Nov 21, 2017
commit 0312b31c50fac23e10e754771e65ed470d954d4b
2 changes: 1 addition & 1 deletion tmk_core/common/avr/bootloader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void bootloader_jump(void) {

#else // Assume remaining boards are DFU, even if the flag isn't set

#ifdef __AVR_ATmega32A__ // no USB - maybe BOOTLOADER_BOOTLOADHID instead though?
#ifndef __AVR_ATmega32A__ // no USB - maybe BOOTLOADER_BOOTLOADHID instead though?
UDCON = 1;
USBCON = (1<<FRZCLK); // disable USB
UCSR1B = 0;
Expand Down