mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-18 01:46:09 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
630de240b4
25 changed files with 14 additions and 90 deletions
|
@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define DRIVER_LED_TOTAL 62
|
||||
#define ISSI_PWM_FREQUENCY 0b010
|
||||
|
||||
#define STM32_HSECLK 8000000
|
||||
|
||||
#define RGB_MATRIX_STARTUP_VAL 80
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
|
||||
|
|
|
@ -22,19 +22,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 168
|
||||
#define STM32_PLLP_VALUE 4
|
||||
#define STM32_PLLQ_VALUE 7
|
||||
#define STM32_PPRE1 STM32_PPRE1_DIV2
|
||||
#define STM32_PPRE2 STM32_PPRE2_DIV1
|
||||
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
#define STM32_I2C_USE_I2C1 TRUE
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F411
|
||||
BOARD = GENERIC_STM32_F411XE
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -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
|
||||
|
||||
#define RGB_DI_PIN B15
|
||||
#define DRIVER_LED_TOTAL 87
|
||||
|
||||
|
|
|
@ -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 168
|
||||
#define STM32_PLLP_VALUE 4
|
||||
#define STM32_PLLQ_VALUE 7
|
||||
#define STM32_PPRE1 STM32_PPRE1_DIV2
|
||||
#define STM32_PPRE2 STM32_PPRE2_DIV1
|
||||
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
#define STM32_I2C_USE_I2C1 TRUE
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = GENERIC_STM32_F401XC
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||
|
||||
#define STM32_HSECLK 8000000
|
||||
|
||||
#define RGB_DI_PIN B15
|
||||
#define DRIVER_LED_TOTAL 86
|
||||
|
||||
|
|
|
@ -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 168
|
||||
#define STM32_PLLP_VALUE 4
|
||||
#define STM32_PLLQ_VALUE 7
|
||||
#define STM32_PPRE1 STM32_PPRE1_DIV2
|
||||
#define STM32_PPRE2 STM32_PPRE2_DIV1
|
||||
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
#define STM32_I2C_USE_I2C1 TRUE
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = GENERIC_STM32_F401XC
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
|
||||
|
||||
#define STM32_HSECLK 8000000
|
||||
|
||||
#define RGB_DI_PIN B15
|
||||
#define DRIVER_LED_TOTAL 87
|
||||
|
||||
|
|
|
@ -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 168
|
||||
#define STM32_PLLP_VALUE 4
|
||||
#define STM32_PLLQ_VALUE 7
|
||||
#define STM32_PPRE1 STM32_PPRE1_DIV2
|
||||
#define STM32_PPRE2 STM32_PPRE2_DIV1
|
||||
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
#define STM32_I2C_USE_I2C1 TRUE
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = GENERIC_STM32_F401XC
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -41,8 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define BREATHING_PERIOD 5
|
||||
#define BACKLIGHT_ON_STATE 0
|
||||
|
||||
#define STM32_HSECLK 8000000
|
||||
|
||||
#define RGB_DI_PIN B15
|
||||
#define RGBLED_NUM 34
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F411
|
||||
BOARD = GENERIC_STM32_F411XE
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define BACKLIGHT_BREATHING
|
||||
#define BREATHING_PERIOD 5
|
||||
|
||||
#define STM32_HSECLK 8000000
|
||||
|
||||
#define RGB_DI_PIN B15
|
||||
#define RGBLED_NUM 34
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
|
|
|
@ -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 168
|
||||
#define STM32_PLLP_VALUE 4
|
||||
#define STM32_PLLQ_VALUE 7
|
||||
#define STM32_PPRE1 STM32_PPRE1_DIV2
|
||||
#define STM32_PPRE2 STM32_PPRE2_DIV1
|
||||
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
#define STM32_I2C_USE_I2C1 TRUE
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
MCU = STM32F401
|
||||
BOARD = GENERIC_STM32_F401XC
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = BLACKPILL_STM32_F401
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = BLACKPILL_STM32_F401
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = tinyuf2
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = BLACKPILL_STM32_F401
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = tinyuf2
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = BLACKPILL_STM32_F401
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = tinyuf2
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = BLACKPILL_STM32_F401
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = tinyuf2
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = GENERIC_STM32_F401XC
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# MCU name
|
||||
MCU = STM32F401
|
||||
BOARD = GENERIC_STM32_F401XC
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32-dfu
|
||||
|
|
Loading…
Reference in a new issue