diff options
Diffstat (limited to 'keyboards/mechwild')
22 files changed, 134 insertions, 40 deletions
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index 1b7ed824aa..59702791b0 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 7 #define MATRIX_COLS 10 -#define EEPROM_I2C_24LC64 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechwild/obe/f401/eeprom/config.h b/keyboards/mechwild/obe/f401/eeprom/config.h new file mode 100644 index 0000000000..83eed90b99 --- /dev/null +++ b/keyboards/mechwild/obe/f401/eeprom/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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/obe/f401/halconf.h b/keyboards/mechwild/obe/f401/eeprom/halconf.h index b57977316a..b57977316a 100644 --- a/keyboards/mechwild/obe/f401/halconf.h +++ b/keyboards/mechwild/obe/f401/eeprom/halconf.h diff --git a/keyboards/mechwild/obe/f401/mcuconf.h b/keyboards/mechwild/obe/f401/eeprom/mcuconf.h index da43021663..da43021663 100644 --- a/keyboards/mechwild/obe/f401/mcuconf.h +++ b/keyboards/mechwild/obe/f401/eeprom/mcuconf.h diff --git a/keyboards/mechwild/obe/f401/eeprom/rules.mk b/keyboards/mechwild/obe/f401/eeprom/rules.mk new file mode 100644 index 0000000000..c2c0bbd5d6 --- /dev/null +++ b/keyboards/mechwild/obe/f401/eeprom/rules.mk @@ -0,0 +1,7 @@ +# MCU name +MCU = STM32F401 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/obe/f411/eeprom/config.h b/keyboards/mechwild/obe/f411/eeprom/config.h new file mode 100644 index 0000000000..83eed90b99 --- /dev/null +++ b/keyboards/mechwild/obe/f411/eeprom/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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/obe/f411/halconf.h b/keyboards/mechwild/obe/f411/eeprom/halconf.h index b57977316a..b57977316a 100644 --- a/keyboards/mechwild/obe/f411/halconf.h +++ b/keyboards/mechwild/obe/f411/eeprom/halconf.h diff --git a/keyboards/mechwild/waka60/f411/mcuconf.h b/keyboards/mechwild/obe/f411/eeprom/mcuconf.h index a00131aca5..da43021663 100644 --- a/keyboards/mechwild/waka60/f411/mcuconf.h +++ b/keyboards/mechwild/obe/f411/eeprom/mcuconf.h @@ -20,4 +20,3 @@ #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE - diff --git a/keyboards/mechwild/obe/f411/eeprom/rules.mk b/keyboards/mechwild/obe/f411/eeprom/rules.mk new file mode 100644 index 0000000000..b823aa31cc --- /dev/null +++ b/keyboards/mechwild/obe/f411/eeprom/rules.mk @@ -0,0 +1,7 @@ +# MCU name +MCU = STM32F411 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h index 8c57aa283b..b2b22b37e3 100644 --- a/keyboards/mechwild/obe/obe.h +++ b/keyboards/mechwild/obe/obe.h @@ -16,6 +16,10 @@ #pragma once +//#ifdef KEYBOARD_mechwild_obe_eeprom +//# include "eeprom.h" +//#endif + #include "quantum.h" /* This is a shortcut to help you visually see your layout. diff --git a/keyboards/mechwild/obe/rules.mk b/keyboards/mechwild/obe/rules.mk index d5fac1ee4e..bdcc7d903b 100644 --- a/keyboards/mechwild/obe/rules.mk +++ b/keyboards/mechwild/obe/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Encoder Enabled -EEPROM_DRIVER = i2c - DEFAULT_FOLDER = mechwild/obe/f401 diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h index e3fc719b8f..057ca383be 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 10 #define MATRIX_COLS 7 -#define EEPROM_I2C_24LC64 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechwild/waka60/f401/eeprom/config.h b/keyboards/mechwild/waka60/f401/eeprom/config.h new file mode 100644 index 0000000000..83eed90b99 --- /dev/null +++ b/keyboards/mechwild/waka60/f401/eeprom/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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/waka60/f411/halconf.h b/keyboards/mechwild/waka60/f401/eeprom/halconf.h index b57977316a..b57977316a 100644 --- a/keyboards/mechwild/waka60/f411/halconf.h +++ b/keyboards/mechwild/waka60/f401/eeprom/halconf.h diff --git a/keyboards/mechwild/obe/f411/mcuconf.h b/keyboards/mechwild/waka60/f401/eeprom/mcuconf.h index a00131aca5..da43021663 100644 --- a/keyboards/mechwild/obe/f411/mcuconf.h +++ b/keyboards/mechwild/waka60/f401/eeprom/mcuconf.h @@ -20,4 +20,3 @@ #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE - diff --git a/keyboards/mechwild/waka60/f401/eeprom/rules.mk b/keyboards/mechwild/waka60/f401/eeprom/rules.mk new file mode 100644 index 0000000000..c2c0bbd5d6 --- /dev/null +++ b/keyboards/mechwild/waka60/f401/eeprom/rules.mk @@ -0,0 +1,7 @@ +# MCU name +MCU = STM32F401 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/waka60/f401/mcuconf.h b/keyboards/mechwild/waka60/f401/mcuconf.h deleted file mode 100644 index 95339690cf..0000000000 --- a/keyboards/mechwild/waka60/f401/mcuconf.h +++ /dev/null @@ -1,27 +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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include_next <mcuconf.h> - -#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
\ No newline at end of file diff --git a/keyboards/mechwild/waka60/f411/eeprom/config.h b/keyboards/mechwild/waka60/f411/eeprom/config.h new file mode 100644 index 0000000000..83eed90b99 --- /dev/null +++ b/keyboards/mechwild/waka60/f411/eeprom/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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/waka60/f401/halconf.h b/keyboards/mechwild/waka60/f411/eeprom/halconf.h index 25309fc70f..b57977316a 100644 --- a/keyboards/mechwild/waka60/f401/halconf.h +++ b/keyboards/mechwild/waka60/f411/eeprom/halconf.h @@ -17,9 +17,6 @@ #pragma once #define HAL_USE_I2C TRUE -#define HAL_USE_PWM TRUE -#define HAL_USE_PAL TRUE -#define HAL_USE_GPT TRUE #include_next <halconf.h> diff --git a/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h b/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h new file mode 100644 index 0000000000..da43021663 --- /dev/null +++ b/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h @@ -0,0 +1,22 @@ +/* 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 <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include_next <mcuconf.h> + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mechwild/waka60/f411/eeprom/rules.mk b/keyboards/mechwild/waka60/f411/eeprom/rules.mk new file mode 100644 index 0000000000..b823aa31cc --- /dev/null +++ b/keyboards/mechwild/waka60/f411/eeprom/rules.mk @@ -0,0 +1,7 @@ +# MCU name +MCU = STM32F411 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/waka60/rules.mk b/keyboards/mechwild/waka60/rules.mk index 5b058057fc..06e0fbc7c5 100644 --- a/keyboards/mechwild/waka60/rules.mk +++ b/keyboards/mechwild/waka60/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Encoder Enabled -EEPROM_DRIVER = i2c - DEFAULT_FOLDER = mechwild/waka60/f401 |