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 /users | |
| parent | 9113f3387a670373919fe62899b0ab27e9d89eba (diff) | |
| download | qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.tar.gz qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.zip | |
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 'users')
| -rw-r--r-- | users/drashna/drashna.c | 2 | ||||
| -rw-r--r-- | users/drashna/template.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 31f58a430c..1bf029163c 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -428,7 +428,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_MAKE: if (!record->event.pressed) { SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); -#ifndef CATERINA_BOOTLOADER +#ifndef BOOTLOADER_CATERINA SEND_STRING(":teensy "); #else SEND_STRING(" "); diff --git a/users/drashna/template.c b/users/drashna/template.c index 027c780e95..f377d64f7a 100644 --- a/users/drashna/template.c +++ b/users/drashna/template.c @@ -43,7 +43,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_MAKE: if (!record->event.pressed) { SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); -#ifndef CATERINA_BOOTLOADER +#ifndef BOOTLOADER_CATERINA SEND_STRING(":teensy "); #else SEND_STRING(" "); |