diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-11-14 16:11:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 16:11:29 -0500 |
| commit | ec3e065f0d2c65175384699cb11fa388250fa914 (patch) | |
| tree | e66837d6af1a30b739303bfa06043edf12f9fcc1 /lib/lufa/Bootloaders/DFU/BootloaderDFU.c | |
| parent | 3c15c48e6a5c584d225d369ea458f9a3f9cd3d57 (diff) | |
| download | qmk_firmware-ec3e065f0d2c65175384699cb11fa388250fa914.tar.gz qmk_firmware-ec3e065f0d2c65175384699cb11fa388250fa914.zip | |
QMK DFU bootloader generation (#2009)
* adds :bootloader target
* update planck and preonic revisions
* remove references to .h files for planck
* update preonic keymap
* only add keyboard.h files that exist
* add production target
* hook things up with the new lufa variables
* update rules for planck/preonic
* back backlight key turn of status led when pressed
* add manufacturer/product strings to bootloader
Diffstat (limited to 'lib/lufa/Bootloaders/DFU/BootloaderDFU.c')
| -rw-r--r-- | lib/lufa/Bootloaders/DFU/BootloaderDFU.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/lufa/Bootloaders/DFU/BootloaderDFU.c b/lib/lufa/Bootloaders/DFU/BootloaderDFU.c index 928cf6fe3..a2307219e 100644 --- a/lib/lufa/Bootloaders/DFU/BootloaderDFU.c +++ b/lib/lufa/Bootloaders/DFU/BootloaderDFU.c | |||
| @@ -196,7 +196,7 @@ int main(void) | |||
| 196 | while (RunBootloader || WaitForExit) { | 196 | while (RunBootloader || WaitForExit) { |
| 197 | USB_USBTask(); | 197 | USB_USBTask(); |
| 198 | #if (BOARD == BOARD_QMK) | 198 | #if (BOARD == BOARD_QMK) |
| 199 | bool pressed = (PIN(QMK_ESC_ROW) & NUM(QMK_ESC_ROW)); | 199 | bool pressed = (PIN(QMK_ESC_INPUT) & NUM(QMK_ESC_INPUT)); |
| 200 | if ((DFU_State == dfuIDLE) && (keypress > 5000) && pressed) { | 200 | if ((DFU_State == dfuIDLE) && (keypress > 5000) && pressed) { |
| 201 | break; | 201 | break; |
| 202 | } | 202 | } |
| @@ -231,12 +231,12 @@ static void SetupHardware(void) | |||
| 231 | MCUCR = (1 << IVSEL); | 231 | MCUCR = (1 << IVSEL); |
| 232 | 232 | ||
| 233 | #if (BOARD == BOARD_QMK) | 233 | #if (BOARD == BOARD_QMK) |
| 234 | // column setup | 234 | // output setup |
| 235 | DDR(QMK_ESC_COL) |= NUM(QMK_ESC_COL); | 235 | DDR(QMK_ESC_OUTPUT) |= NUM(QMK_ESC_OUTPUT); |
| 236 | PORT(QMK_ESC_COL) |= NUM(QMK_ESC_COL); | 236 | PORT(QMK_ESC_OUTPUT) |= NUM(QMK_ESC_OUTPUT); |
| 237 | 237 | ||
| 238 | // row setup | 238 | // input setup |
| 239 | DDR(QMK_ESC_ROW) |= NUM(QMK_ESC_ROW); | 239 | DDR(QMK_ESC_INPUT) |= NUM(QMK_ESC_INPUT); |
| 240 | #endif | 240 | #endif |
| 241 | 241 | ||
| 242 | /* Initialize the USB and other board hardware drivers */ | 242 | /* Initialize the USB and other board hardware drivers */ |
| @@ -265,7 +265,7 @@ static void ResetHardware(void) | |||
| 265 | MCUCR = 0; | 265 | MCUCR = 0; |
| 266 | 266 | ||
| 267 | #if (BOARD == BOARD_QMK) | 267 | #if (BOARD == BOARD_QMK) |
| 268 | DDR(QMK_ESC_COL) = PORT(QMK_ESC_COL) = DDR(QMK_ESC_ROW) = PORT(QMK_ESC_ROW) = 0; | 268 | DDR(QMK_ESC_OUTPUT) = PORT(QMK_ESC_OUTPUT) = DDR(QMK_ESC_INPUT) = PORT(QMK_ESC_INPUT) = 0; |
| 269 | #endif | 269 | #endif |
| 270 | } | 270 | } |
| 271 | 271 | ||
