diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /keyboards/keychron/k6_pro/mcuconf.h | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'keyboards/keychron/k6_pro/mcuconf.h')
| -rw-r--r-- | keyboards/keychron/k6_pro/mcuconf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/keychron/k6_pro/mcuconf.h b/keyboards/keychron/k6_pro/mcuconf.h index 7cb0bde3c5..3bf30a74af 100644 --- a/keyboards/keychron/k6_pro/mcuconf.h +++ b/keyboards/keychron/k6_pro/mcuconf.h @@ -19,11 +19,17 @@ #include_next <mcuconf.h> +<<<<<<< HEAD:keyboards/keychron/k6_pro/mcuconf.h /* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and * lower power comsumption for bluetooth. Will use dynamic * clock when STM32L4 is supported in ChibiOS */ #undef STM32_PLLM_VALUE #define STM32_PLLM_VALUE 2 +======= +/* TIM1 PWM used for audio driver */ +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE +>>>>>>> master:keyboards/yanghu/unicorne/f411/mcuconf.h #undef STM32_PLLN_VALUE #define STM32_PLLN_VALUE 12 |