drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Add keyboard_setup() and matrix_setup()

Browse source
This commit is contained in:
tmk 2015-05-17 19:34:34 +09:00
parent 9a2282157f
commit 6b588eb7f7
6 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tmk_core/protocol/lufa/lufa.c
View file

@ -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 */

2
tmk_core/protocol/pjrc/main.c
View file

@ -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.