diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-09 03:20:08 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-09 03:20:08 +0000 |
| commit | ac4849df133631aa11dd9c61eacd5efb25644ebf (patch) | |
| tree | e981119d7785e1bc54b784748fe1a9cb20c5dd78 /tmk_core | |
| parent | f03e78e8880c3a5024104061dd979d08ecbfe989 (diff) | |
| parent | 6d43a5daf4225cf677840d11b151d28f49e8f9e9 (diff) | |
| download | qmk_firmware-ac4849df133631aa11dd9c61eacd5efb25644ebf.tar.gz qmk_firmware-ac4849df133631aa11dd9c61eacd5efb25644ebf.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 4e17834be..5b56e8a03 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
| @@ -1015,8 +1015,13 @@ static void setup_mcu(void) { | |||
| 1015 | MCUSR &= ~_BV(WDRF); | 1015 | MCUSR &= ~_BV(WDRF); |
| 1016 | wdt_disable(); | 1016 | wdt_disable(); |
| 1017 | 1017 | ||
| 1018 | /* Disable clock division */ | 1018 | // For boards running at 3.3V and crystal at 16 MHz |
| 1019 | #if (F_CPU == 8000000 && F_USB == 16000000) | ||
| 1020 | /* Divide clock by 2 */ | ||
| 1021 | clock_prescale_set(clock_div_2); | ||
| 1022 | #else /* Disable clock division */ | ||
| 1019 | clock_prescale_set(clock_div_1); | 1023 | clock_prescale_set(clock_div_1); |
| 1024 | #endif | ||
| 1020 | } | 1025 | } |
| 1021 | 1026 | ||
| 1022 | /** \brief Setup USB | 1027 | /** \brief Setup USB |