diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-05-17 19:34:34 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-05-19 00:39:43 +0900 |
| commit | 6b588eb7f7893500e18686e673dbf12b511dc975 (patch) | |
| tree | 62d7a75008d3407f318ae650c7a45643944eee31 /tmk_core/protocol | |
| parent | 9a2282157fbdf57ef0a50d4fea7da72505906588 (diff) | |
| download | qmk_firmware-6b588eb7f7893500e18686e673dbf12b511dc975.tar.gz qmk_firmware-6b588eb7f7893500e18686e673dbf12b511dc975.zip | |
Add keyboard_setup() and matrix_setup()
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 9 | ||||
| -rw-r--r-- | tmk_core/protocol/pjrc/main.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index cdfc7bc6ad..391064c9b2 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -544,7 +544,7 @@ int8_t sendchar(uint8_t c) /******************************************************************************* * main ******************************************************************************/ -static void SetupHardware(void) +static void setup_mcu(void) { /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); @@ -552,7 +552,10 @@ static void SetupHardware(void) /* Disable clock division */ clock_prescale_set(clock_div_1); +} +static void setup_usb(void) +{ // Leonardo needs. Without this USB device is not recognized. USB_Disable(); @@ -566,7 +569,9 @@ static void SetupHardware(void) int main(void) __attribute__ ((weak)); int main(void) { - SetupHardware(); + setup_mcu(); + keyboard_setup(); + setup_usb(); sei(); /* wait for USB startup & debug output */ diff --git a/tmk_core/protocol/pjrc/main.c b/tmk_core/protocol/pjrc/main.c index e7bdcc059a..45eb17d4cd 100644 --- a/tmk_core/protocol/pjrc/main.c +++ b/tmk_core/protocol/pjrc/main.c @@ -46,6 +46,8 @@ int main(void) // set for 16 MHz clock CPU_PRESCALE(0); + keyboard_setup(); + // Initialize the USB, and then wait for the host to set configuration. // If the Teensy is powered without a PC connected to the USB port, // this will wait forever. |