diff options
| author | QMK Bot <hello@qmk.fm> | 2022-07-01 14:36:43 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-07-01 14:36:43 +0000 |
| commit | dfb23456b1e4a9771747056bec6c12553c3715b9 (patch) | |
| tree | f7d87e9291d242552111704099f584fd52ef1ded /keyboards/acheron/shark | |
| parent | 03630db506736adf74c84fac1a5bb36e31755bb3 (diff) | |
| parent | d97843281260ec0065c9db250cf986f533016ad3 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/acheron/shark')
| -rw-r--r-- | keyboards/acheron/shark/beta/config.h | 2 | ||||
| -rw-r--r-- | keyboards/acheron/shark/beta/mcuconf.h | 13 | ||||
| -rw-r--r-- | keyboards/acheron/shark/beta/rules.mk | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 54fa270336..b50762b8af 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -47,8 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BREATHING_PERIOD 5 #define BACKLIGHT_ON_STATE 1 -#define STM32_HSECLK 8000000 - #define RGB_DI_PIN B15 #define RGBLED_NUM 24 #define RGBLIGHT_ANIMATIONS diff --git a/keyboards/acheron/shark/beta/mcuconf.h b/keyboards/acheron/shark/beta/mcuconf.h index 35d7e95f57..63f1e30e64 100644 --- a/keyboards/acheron/shark/beta/mcuconf.h +++ b/keyboards/acheron/shark/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 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/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index 928ad2d49a..0347228300 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -1,4 +1,5 @@ MCU = STM32F411 +BOARD = GENERIC_STM32_F411XE # Bootloader selection BOOTLOADER = stm32-dfu |