From 0d30565bb7506d6d5c25d8fb28684859434493eb Mon Sep 17 00:00:00 2001 From: Zykrah Date: Thu, 7 Jul 2022 15:44:21 +1000 Subject: Fix/waka60 audio (#17561) --- keyboards/mechwild/waka60/f411/config.h | 20 ++++++++++++++++++ keyboards/mechwild/waka60/f411/eeprom/config.h | 20 ------------------ keyboards/mechwild/waka60/f411/eeprom/halconf.h | 22 -------------------- keyboards/mechwild/waka60/f411/eeprom/mcuconf.h | 22 -------------------- keyboards/mechwild/waka60/f411/halconf.h | 25 +++++++++++++++++++++++ keyboards/mechwild/waka60/f411/mcuconf.h | 27 +++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 64 deletions(-) create mode 100644 keyboards/mechwild/waka60/f411/config.h delete mode 100644 keyboards/mechwild/waka60/f411/eeprom/config.h delete mode 100644 keyboards/mechwild/waka60/f411/eeprom/halconf.h delete mode 100644 keyboards/mechwild/waka60/f411/eeprom/mcuconf.h create mode 100644 keyboards/mechwild/waka60/f411/halconf.h create mode 100644 keyboards/mechwild/waka60/f411/mcuconf.h (limited to 'keyboards/mechwild/waka60/f411') diff --git a/keyboards/mechwild/waka60/f411/config.h b/keyboards/mechwild/waka60/f411/config.h new file mode 100644 index 0000000000..83eed90b99 --- /dev/null +++ b/keyboards/mechwild/waka60/f411/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2022 Kyle McCreery + +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 . +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/waka60/f411/eeprom/config.h b/keyboards/mechwild/waka60/f411/eeprom/config.h deleted file mode 100644 index 83eed90b99..0000000000 --- a/keyboards/mechwild/waka60/f411/eeprom/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2022 Kyle McCreery - -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 . -*/ - -#pragma once - -#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/waka60/f411/eeprom/halconf.h b/keyboards/mechwild/waka60/f411/eeprom/halconf.h deleted file mode 100644 index b57977316a..0000000000 --- a/keyboards/mechwild/waka60/f411/eeprom/halconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 . - */ - -#pragma once - -#define HAL_USE_I2C TRUE - -#include_next - diff --git a/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h b/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h deleted file mode 100644 index da43021663..0000000000 --- a/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 . - */ - -#pragma once - -#include_next - -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mechwild/waka60/f411/halconf.h b/keyboards/mechwild/waka60/f411/halconf.h new file mode 100644 index 0000000000..25309fc70f --- /dev/null +++ b/keyboards/mechwild/waka60/f411/halconf.h @@ -0,0 +1,25 @@ +/* Copyright 2021 Kyle McCreery + * + * 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 . + */ + +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_PWM TRUE +#define HAL_USE_PAL TRUE +#define HAL_USE_GPT TRUE + +#include_next + diff --git a/keyboards/mechwild/waka60/f411/mcuconf.h b/keyboards/mechwild/waka60/f411/mcuconf.h new file mode 100644 index 0000000000..f903d8880f --- /dev/null +++ b/keyboards/mechwild/waka60/f411/mcuconf.h @@ -0,0 +1,27 @@ +/* Copyright 2021 Kyle McCreery + * + * 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 . + */ + +#pragma once + +#include_next + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE +#undef STM32_GPT_USE_TIM4 +#define STM32_GPT_USE_TIM4 TRUE -- cgit v1.2.3