kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'add_preonic' of github.com:shurikai/zmk into add_preonic

Browse source
This commit is contained in:
Jason Chestnut 2020-09-25 11:28:30 -04:00
commit bf6ffdce3a
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/boards/arm/preonic/preonic_rev3_defconfig
View file

@ -26,4 +26,7 @@ CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
CONFIG_CLOCK_STM32_AHB_PRESCALER=1 CONFIG_CLOCK_STM32_AHB_PRESCALER=1
CONFIG_CLOCK_STM32_APB1_PRESCALER=2 CONFIG_CLOCK_STM32_APB1_PRESCALER=2
CONFIG_CLOCK_STM32_APB2_PRESCALER=1 CONFIG_CLOCK_STM32_APB2_PRESCALER=1
<<<<<<< HEAD
CONFIG_ZMK_KSCAN_MATRIX_POLLING=y CONFIG_ZMK_KSCAN_MATRIX_POLLING=y
=======
>>>>>>> aad447758e88ce839bdbd8f94259d1402ab1c8e1