mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-13 03:54:42 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
c24d29ef54
2 changed files with 14 additions and 4 deletions
|
@ -17,8 +17,13 @@
|
||||||
|
|
||||||
#define BOARD_OTG_NOVBUSSENS 1
|
#define BOARD_OTG_NOVBUSSENS 1
|
||||||
|
|
||||||
#define STM32_LSECLK 32768U
|
#ifndef STM32_LSECLK
|
||||||
#define STM32_HSECLK 25000000U
|
# define STM32_LSECLK 32768U
|
||||||
|
#endif // STM32_LSECLK
|
||||||
|
|
||||||
|
#ifndef STM32_HSECLK
|
||||||
|
# define STM32_HSECLK 25000000U
|
||||||
|
#endif // STM32_HSECLK
|
||||||
|
|
||||||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||||
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||||
|
|
|
@ -17,8 +17,13 @@
|
||||||
|
|
||||||
#define BOARD_OTG_NOVBUSSENS 1
|
#define BOARD_OTG_NOVBUSSENS 1
|
||||||
|
|
||||||
#define STM32_LSECLK 32768U
|
#ifndef STM32_LSECLK
|
||||||
#define STM32_HSECLK 25000000U
|
# define STM32_LSECLK 32768U
|
||||||
|
#endif // STM32_LSECLK
|
||||||
|
|
||||||
|
#ifndef STM32_HSECLK
|
||||||
|
# define STM32_HSECLK 25000000U
|
||||||
|
#endif // STM32_HSECLK
|
||||||
|
|
||||||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||||
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||||
|
|
Loading…
Reference in a new issue