mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-18 01:46:09 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
ac4849df13
1 changed files with 6 additions and 1 deletions
|
@ -1015,8 +1015,13 @@ static void setup_mcu(void) {
|
||||||
MCUSR &= ~_BV(WDRF);
|
MCUSR &= ~_BV(WDRF);
|
||||||
wdt_disable();
|
wdt_disable();
|
||||||
|
|
||||||
/* Disable clock division */
|
// For boards running at 3.3V and crystal at 16 MHz
|
||||||
|
#if (F_CPU == 8000000 && F_USB == 16000000)
|
||||||
|
/* Divide clock by 2 */
|
||||||
|
clock_prescale_set(clock_div_2);
|
||||||
|
#else /* Disable clock division */
|
||||||
clock_prescale_set(clock_div_1);
|
clock_prescale_set(clock_div_1);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief Setup USB
|
/** \brief Setup USB
|
||||||
|
|
Loading…
Reference in a new issue