g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-08-14 23:26:34 +00:00
parent 463fb72d29 93fb69fbda
commit 630de240b4
25 changed files with 14 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/4pplet/perk60_iso/rev_a/config.h
View File

@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DRIVER_LED_TOTAL 62 #define DRIVER_LED_TOTAL 62
#define ISSI_PWM_FREQUENCY 0b010 #define ISSI_PWM_FREQUENCY 0b010
#define STM32_HSECLK 8000000
#define RGB_MATRIX_STARTUP_VAL 80 #define RGB_MATRIX_STARTUP_VAL 80
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES

13
keyboards/4pplet/perk60_iso/rev_a/mcuconf.h
View File

@ -22,19 +22,6 @@
#pragma once #pragma once
#include_next <mcuconf.h> #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 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C1 TRUE

1
keyboards/4pplet/perk60_iso/rev_a/rules.mk
View File

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

2
keyboards/acheron/apollo/87h/delta/config.h
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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define STM32_HSECLK 8000000
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15
#define DRIVER_LED_TOTAL 87 #define DRIVER_LED_TOTAL 87

13
keyboards/acheron/apollo/87h/delta/mcuconf.h
View File

@ -17,19 +17,6 @@
#pragma once #pragma once
#include_next <mcuconf.h> #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 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C1 TRUE

1
keyboards/acheron/apollo/87h/delta/rules.mk
View File

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

2
keyboards/acheron/apollo/87htsc/config.h
View File

@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define STM32_HSECLK 8000000
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15
#define DRIVER_LED_TOTAL 86 #define DRIVER_LED_TOTAL 86

13
keyboards/acheron/apollo/87htsc/mcuconf.h
View File

@ -17,19 +17,6 @@
#pragma once #pragma once
#include_next <mcuconf.h> #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 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C1 TRUE

1
keyboards/acheron/apollo/87htsc/rules.mk
View File

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

2
keyboards/acheron/apollo/88htsc/config.h
View File

@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define STM32_HSECLK 8000000
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15
#define DRIVER_LED_TOTAL 87 #define DRIVER_LED_TOTAL 87

13
keyboards/acheron/apollo/88htsc/mcuconf.h
View File

@ -17,19 +17,6 @@
#pragma once #pragma once
#include_next <mcuconf.h> #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 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C1 TRUE

1
keyboards/acheron/apollo/88htsc/rules.mk
View File

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

2
keyboards/acheron/athena/alpha/config.h
View File

@ -41,8 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BREATHING_PERIOD 5 #define BREATHING_PERIOD 5
#define BACKLIGHT_ON_STATE 0 #define BACKLIGHT_ON_STATE 0
#define STM32_HSECLK 8000000
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15
#define RGBLED_NUM 34 #define RGBLED_NUM 34
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING

13
keyboards/acheron/athena/alpha/mcuconf.h
View File

@ -17,19 +17,6 @@
#pragma once #pragma once
#include_next <mcuconf.h> #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 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C1 TRUE

2
keyboards/acheron/athena/alpha/rules.mk
View File

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

2
keyboards/acheron/athena/beta/config.h
View File

@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_BREATHING #define BACKLIGHT_BREATHING
#define BREATHING_PERIOD 5 #define BREATHING_PERIOD 5
#define STM32_HSECLK 8000000
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15
#define RGBLED_NUM 34 #define RGBLED_NUM 34
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING

13
keyboards/acheron/athena/beta/mcuconf.h
View File

@ -17,19 +17,6 @@
#pragma once #pragma once
#include_next <mcuconf.h> #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 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C1 TRUE

1
keyboards/acheron/athena/beta/rules.mk
View File

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

1
keyboards/mechwild/puckbuddy/rules.mk
View File

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

1
keyboards/mlego/m48/rev1/rules.mk
View File

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

1
keyboards/mlego/m60/rev1/rules.mk
View File

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

1
keyboards/mlego/m65/rev3/rules.mk
View File

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

1
keyboards/mlego/m65/rev4/rules.mk
View File

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

1
keyboards/yandrstudio/nz64/rules.mk
View File

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

1
keyboards/yandrstudio/zhou65/rules.mk
View File

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