diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-11-27 23:08:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 23:08:21 -0500 |
| commit | 9fdc27626097ae03b767a09427efc90475d90955 (patch) | |
| tree | a555c38f1b714af6e2c2c96187552757d08224b9 /quantum | |
| parent | 9113f3387a670373919fe62899b0ab27e9d89eba (diff) | |
Updates bootloader settings, adds file size check (#2029)
* pull fuse settings for bootloader jump
* fix 32a chips
* make automatic bootloader selection optional
* quantify bootloaders
* fixs #164, speeds up dfu reset
* fix for chips w/o usb
* missing an n
* fix bootloader sizes, use words for addresses
* fix bmini, pearl, and [[ issue, make things quiet
* ignore avr errors on arm for now
* update settings for the light
* document bootloader stuff
* add bootloader title
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 0992015966..9232cf4411 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -143,7 +143,8 @@ void reset_keyboard(void) { #else wait_ms(250); #endif -#ifdef CATERINA_BOOTLOADER +// this is also done later in bootloader.c - not sure if it's neccesary here +#ifdef BOOTLOADER_CATERINA *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific #endif bootloader_jump(); |