Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

QMK DFU bootloader generation (#2009)

Browse source 
* 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
This commit is contained in:
Jack Humbert 2017-11-14 16:11:29 -05:00 • committed by GitHub
parent 3c15c48e6a
commit ec3e065f0d
Failed to generate hash of commit
27 changed files with 171 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/lufa/Bootloaders/DFU/BootloaderDFU.c
View file

@ -196,7 +196,7 @@ int main(void)
while (RunBootloader || WaitForExit) {
USB_USBTask();
#if (BOARD == BOARD_QMK)
bool pressed = (PIN(QMK_ESC_ROW) & NUM(QMK_ESC_ROW));
bool pressed = (PIN(QMK_ESC_INPUT) & NUM(QMK_ESC_INPUT));
if ((DFU_State == dfuIDLE) && (keypress > 5000) && pressed) {
break;
}
@ -231,12 +231,12 @@ static void SetupHardware(void)
MCUCR = (1 << IVSEL);
#if (BOARD == BOARD_QMK)
// column setup
DDR(QMK_ESC_COL) |= NUM(QMK_ESC_COL);
PORT(QMK_ESC_COL) |= NUM(QMK_ESC_COL);
// output setup
DDR(QMK_ESC_OUTPUT) |= NUM(QMK_ESC_OUTPUT);
PORT(QMK_ESC_OUTPUT) |= NUM(QMK_ESC_OUTPUT);
// row setup
DDR(QMK_ESC_ROW) |= NUM(QMK_ESC_ROW);
// input setup
DDR(QMK_ESC_INPUT) |= NUM(QMK_ESC_INPUT);
#endif
/* Initialize the USB and other board hardware drivers */
@ -265,7 +265,7 @@ static void ResetHardware(void)
MCUCR = 0;
#if (BOARD == BOARD_QMK)
DDR(QMK_ESC_COL) = PORT(QMK_ESC_COL) = DDR(QMK_ESC_ROW) = PORT(QMK_ESC_ROW) = 0;
DDR(QMK_ESC_OUTPUT) = PORT(QMK_ESC_OUTPUT) = DDR(QMK_ESC_INPUT) = PORT(QMK_ESC_INPUT) = 0;
#endif
}