diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-14 23:26:34 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-14 23:26:34 +0000 |
| commit | 630de240b4998210d48631d142b89ce4fbaab519 (patch) | |
| tree | 8ee909c188942db990e00f0d455d97de21313d04 /keyboards/acheron/athena | |
| parent | 463fb72d29e6638f9a28f751e6a1f2a7f9e0bcf8 (diff) | |
| parent | 93fb69fbdaafb20dbee7e4e5bea1d785b0cb4bee (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/acheron/athena')
| -rw-r--r-- | keyboards/acheron/athena/alpha/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/athena/alpha/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/athena/alpha/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/acheron/athena/beta/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/athena/beta/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/athena/beta/rules.mk | 1 |
6 files changed, 3 insertions, 30 deletions
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index fca0450cef..99dbd76c6f 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -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 diff --git a/keyboards/acheron/athena/alpha/mcuconf.h b/keyboards/acheron/athena/alpha/mcuconf.h index 35d7e95f57..63f1e30e64 100644 --- a/keyboards/acheron/athena/alpha/mcuconf.h +++ b/keyboards/acheron/athena/alpha/mcuconf.h @@ -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 diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk index 246db1d2e5..7711254bbe 100644 --- a/keyboards/acheron/athena/alpha/rules.mk +++ b/keyboards/acheron/athena/alpha/rules.mk @@ -1,4 +1,6 @@ +# MCU name MCU = STM32F411 +BOARD = GENERIC_STM32_F411XE # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index e9f653e3c7..4b2ae3f06b 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -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 diff --git a/keyboards/acheron/athena/beta/mcuconf.h b/keyboards/acheron/athena/beta/mcuconf.h index 2f3b3e812a..63f1e30e64 100644 --- a/keyboards/acheron/athena/beta/mcuconf.h +++ b/keyboards/acheron/athena/beta/mcuconf.h @@ -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 diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk index 388b1e6a96..81bbce68c1 100644 --- a/keyboards/acheron/athena/beta/rules.mk +++ b/keyboards/acheron/athena/beta/rules.mk @@ -1,4 +1,5 @@ MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu |