Merge remote-tracking branch 'origin/master' into develop

4 years ago · ac4849df13
parent f03e78e888 6d43a5daf4
commit ac4849df13
1 changed files with 6 additions and 1 deletions
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@ -1015,8 +1015,13 @@ static void setup_mcu(void) {
    MCUSR &= ~_BV(WDRF);
    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);
+#endif
 }

 /** \brief Setup USB