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/4pplet | |
parent | 03630db506736adf74c84fac1a5bb36e31755bb3 (diff) | |
parent | d97843281260ec0065c9db250cf986f533016ad3 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/4pplet')
-rw-r--r-- | keyboards/4pplet/yakiimo/rev_a/config.h | 2 | ||||
-rw-r--r-- | keyboards/4pplet/yakiimo/rev_a/mcuconf.h | 37 | ||||
-rw-r--r-- | keyboards/4pplet/yakiimo/rev_a/rules.mk | 1 |
3 files changed, 1 insertions, 39 deletions
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index 762ff55c41..bf16696014 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -40,5 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 - -#define STM32_HSECLK 8000000 diff --git a/keyboards/4pplet/yakiimo/rev_a/mcuconf.h b/keyboards/4pplet/yakiimo/rev_a/mcuconf.h deleted file mode 100644 index 566a38124d..0000000000 --- a/keyboards/4pplet/yakiimo/rev_a/mcuconf.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` - */ - -#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 diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/rules.mk index 69e3ba1629..2f1c4fc78b 100644 --- a/keyboards/4pplet/yakiimo/rev_a/rules.mk +++ b/keyboards/4pplet/yakiimo/rev_a/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = GENERIC_STM32_F411XE # Bootloader selection BOOTLOADER = stm32-dfu |