diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-15 17:55:58 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-15 17:55:58 +0000 |
| commit | 904df296b015419a53177af244acac074be079c6 (patch) | |
| tree | 131a19ef9dda393c3b64181321d5a0daf29e04f9 /keyboards/acheron | |
| parent | 5021cf58ade469560fa0fd018f6b35b2b6f6907f (diff) | |
| parent | e44b6242b70e3fc94b71ab3a463a0cf6b4dba280 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/acheron')
| -rw-r--r-- | keyboards/acheron/apollo/87h/gamma/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87h/gamma/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/apollo/87h/gamma/rules.mk | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 451071f869..89f9a85d24 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/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 - // RGB Matrix defines #define DRIVER_ADDR_1 0b0110000 diff --git a/keyboards/acheron/apollo/87h/gamma/mcuconf.h b/keyboards/acheron/apollo/87h/gamma/mcuconf.h index 5983bdde90..0113e71378 100644 --- a/keyboards/acheron/apollo/87h/gamma/mcuconf.h +++ b/keyboards/acheron/apollo/87h/gamma/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/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk index fde739dac7..4ba14045bb 100644 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ b/keyboards/acheron/apollo/87h/gamma/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = GENERIC_STM32_F411XE # Bootloader selection BOOTLOADER = stm32-dfu |