~ruther/qmk_firmware

904df296b015419a53177af244acac074be079c6 — QMK Bot 3 years ago 5021cf5 + e44b624
Merge remote-tracking branch 'origin/master' into develop
M keyboards/acheron/apollo/87h/gamma/config.h => keyboards/acheron/apollo/87h/gamma/config.h +0 -2
@@ 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


M keyboards/acheron/apollo/87h/gamma/mcuconf.h => keyboards/acheron/apollo/87h/gamma/mcuconf.h +0 -13
@@ 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

M keyboards/acheron/apollo/87h/gamma/rules.mk => keyboards/acheron/apollo/87h/gamma/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F411
BOARD = GENERIC_STM32_F411XE

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk => keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411

# Bootloader selection
# BOOTLOADER = stm32-dfu

M keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk => keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +1 -0
@@ 3,6 3,7 @@

# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411

# Bootloader selection
BOOTLOADER = tinyuf2

M keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk => keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411

# Bootloader selection
BOOTLOADER = tinyuf2

M keyboards/mechwild/bbs/rules.mk => keyboards/mechwild/bbs/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/mlego/m60_split/rev1/rules.mk => keyboards/mlego/m60_split/rev1/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401

# Bootloader selection
BOOTLOADER = tinyuf2

M keyboards/phoenix/rules.mk => keyboards/phoenix/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/xelus/rs108/rules.mk => keyboards/xelus/rs108/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/xelus/rs60/rev2/rules.mk => keyboards/xelus/rs60/rev2/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk => keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F411
BOARD = GENERIC_STM32_F401XC

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk => keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk +1 -0
@@ 1,5 1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC

# Bootloader selection
BOOTLOADER = stm32-dfu