diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:36:03 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:55:32 -0700 |
| commit | a5e62ff2517e4add49ec67c1844b93e38144ea31 (patch) | |
| tree | d5e7391286399f96b97d5ad196c01ecb32728395 /Bootloaders/DFU/BootloaderDFU.c | |
| parent | 110622eaa2787cc54818083d4243653b088e5b5a (diff) | |
| download | lufa-a5e62ff2517e4add49ec67c1844b93e38144ea31.tar.gz lufa-a5e62ff2517e4add49ec67c1844b93e38144ea31.tar.bz2 lufa-a5e62ff2517e4add49ec67c1844b93e38144ea31.zip | |
QMK Lufa Bootloader Generation (qmk#2009)
This re-implements the code changes into QMK's LUFA repo
Diffstat (limited to 'Bootloaders/DFU/BootloaderDFU.c')
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 10396f012..883afef03 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -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; } @@ -234,12 +234,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); + DDR(QMK_ESC_INPUT) |= NUM(QMK_ESC_INPUT); #endif /* Initialize the USB and other board hardware drivers */ @@ -268,7 +268,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 } |