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

master
QMK Bot 2022-08-15 17:55:58 +00:00
commit 904df296b0
13 changed files with 11 additions and 15 deletions

View File

@ -44,8 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define STM32_HSECLK 8000000
// RGB Matrix defines
#define DRIVER_ADDR_1 0b0110000

View File

@ -17,19 +17,6 @@
#pragma once
#include_next <mcuconf.h>
#undef STM32_PLLM_VALUE
#undef STM32_PLLN_VALUE
#undef STM32_PLLP_VALUE
#undef STM32_PLLQ_VALUE
#undef STM32_PPRE1
#undef STM32_PPRE2
#define STM32_PLLM_VALUE 4
#define STM32_PLLN_VALUE 96
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 4
#define STM32_PPRE1 STM32_PPRE1_DIV2
#define STM32_PPRE2 STM32_PPRE2_DIV1
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = GENERIC_STM32_F411XE
# Bootloader selection
BOOTLOADER = stm32-dfu

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411
# Bootloader selection
# BOOTLOADER = stm32-dfu

View File

@ -3,6 +3,7 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411
# Bootloader selection
BOOTLOADER = tinyuf2

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411
# Bootloader selection
BOOTLOADER = tinyuf2

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = stm32-dfu

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = tinyuf2

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = stm32-dfu

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu

View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu