diff options
| author | Joel Challis <git@zvecr.com> | 2022-08-15 00:25:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 00:25:40 +0100 |
| commit | 93fb69fbdaafb20dbee7e4e5bea1d785b0cb4bee (patch) | |
| tree | 1f3a37baeaa8c8137609c07f39a89e146ae66184 /keyboards/acheron/apollo | |
| parent | 3d3e463598b39b31045007be49a82dff2c071ee7 (diff) | |
Migrate more F4x1 board files (#18046)
Diffstat (limited to 'keyboards/acheron/apollo')
| -rw-r--r-- | keyboards/acheron/apollo/87h/delta/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87h/delta/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87h/delta/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87htsc/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87htsc/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87htsc/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/88htsc/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/88htsc/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/88htsc/rules.mk | 1 |
9 files changed, 3 insertions, 45 deletions
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 1365b81774..85909af208 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -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 diff --git a/keyboards/acheron/apollo/87h/delta/mcuconf.h b/keyboards/acheron/apollo/87h/delta/mcuconf.h index fb972b86ad..29a62a94c2 100644 --- a/keyboards/acheron/apollo/87h/delta/mcuconf.h +++ b/keyboards/acheron/apollo/87h/delta/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/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk index 1711dd486d..c519425408 100644 --- a/keyboards/acheron/apollo/87h/delta/rules.mk +++ b/keyboards/acheron/apollo/87h/delta/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 0cb3d38128..30021a51b9 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -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 diff --git a/keyboards/acheron/apollo/87htsc/mcuconf.h b/keyboards/acheron/apollo/87htsc/mcuconf.h index fb972b86ad..29a62a94c2 100644 --- a/keyboards/acheron/apollo/87htsc/mcuconf.h +++ b/keyboards/acheron/apollo/87htsc/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/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk index 2d2908dc6c..696b529919 100644 --- a/keyboards/acheron/apollo/87htsc/rules.mk +++ b/keyboards/acheron/apollo/87htsc/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 7df9fc3e6b..5df3628db2 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -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 diff --git a/keyboards/acheron/apollo/88htsc/mcuconf.h b/keyboards/acheron/apollo/88htsc/mcuconf.h index fb972b86ad..29a62a94c2 100644 --- a/keyboards/acheron/apollo/88htsc/mcuconf.h +++ b/keyboards/acheron/apollo/88htsc/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/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk index 1711dd486d..c519425408 100644 --- a/keyboards/acheron/apollo/88htsc/rules.mk +++ b/keyboards/acheron/apollo/88htsc/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu |