From c60c19e8d5ebb1066193e8cb73b0c9f235bc5b36 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Fri, 20 May 2022 12:10:05 -0400 Subject: [PATCH] [Keyboard] Add eeprom IC-less rev for MechWild OBE and Waka60 (#17126) --- keyboards/mechwild/obe/config.h | 2 -- keyboards/mechwild/obe/f401/eeprom/config.h | 20 +++++++++++++++++++ .../mechwild/obe/f401/{ => eeprom}/halconf.h | 0 .../mechwild/obe/f401/{ => eeprom}/mcuconf.h | 0 keyboards/mechwild/obe/f401/eeprom/rules.mk | 7 +++++++ keyboards/mechwild/obe/f411/eeprom/config.h | 20 +++++++++++++++++++ .../mechwild/obe/f411/{ => eeprom}/halconf.h | 0 .../mechwild/obe/f411/{ => eeprom}/mcuconf.h | 1 - keyboards/mechwild/obe/f411/eeprom/rules.mk | 7 +++++++ keyboards/mechwild/obe/obe.h | 4 ++++ keyboards/mechwild/obe/rules.mk | 2 -- keyboards/mechwild/waka60/config.h | 2 -- .../mechwild/waka60/f401/eeprom/config.h | 20 +++++++++++++++++++ .../waka60/{f411 => f401/eeprom}/halconf.h | 0 .../waka60/{f411 => f401/eeprom}/mcuconf.h | 1 - .../mechwild/waka60/f401/eeprom/rules.mk | 7 +++++++ .../mechwild/waka60/f411/eeprom/config.h | 20 +++++++++++++++++++ .../waka60/{f401 => f411/eeprom}/halconf.h | 3 --- .../waka60/{f401 => f411/eeprom}/mcuconf.h | 5 ----- .../mechwild/waka60/f411/eeprom/rules.mk | 7 +++++++ keyboards/mechwild/waka60/rules.mk | 2 -- 21 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 keyboards/mechwild/obe/f401/eeprom/config.h rename keyboards/mechwild/obe/f401/{ => eeprom}/halconf.h (100%) rename keyboards/mechwild/obe/f401/{ => eeprom}/mcuconf.h (100%) create mode 100644 keyboards/mechwild/obe/f401/eeprom/rules.mk create mode 100644 keyboards/mechwild/obe/f411/eeprom/config.h rename keyboards/mechwild/obe/f411/{ => eeprom}/halconf.h (100%) rename keyboards/mechwild/obe/f411/{ => eeprom}/mcuconf.h (99%) create mode 100644 keyboards/mechwild/obe/f411/eeprom/rules.mk create mode 100644 keyboards/mechwild/waka60/f401/eeprom/config.h rename keyboards/mechwild/waka60/{f411 => f401/eeprom}/halconf.h (100%) rename keyboards/mechwild/waka60/{f411 => f401/eeprom}/mcuconf.h (99%) create mode 100644 keyboards/mechwild/waka60/f401/eeprom/rules.mk create mode 100644 keyboards/mechwild/waka60/f411/eeprom/config.h rename keyboards/mechwild/waka60/{f401 => f411/eeprom}/halconf.h (90%) rename keyboards/mechwild/waka60/{f401 => f411/eeprom}/mcuconf.h (83%) create mode 100644 keyboards/mechwild/waka60/f411/eeprom/rules.mk diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index 1b7ed824aad..59702791b04 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -30,8 +30,6 @@ along with this program. If not, see . #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 00000000000..83eed90b993 --- /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 . +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/obe/f401/halconf.h b/keyboards/mechwild/obe/f401/eeprom/halconf.h similarity index 100% rename from keyboards/mechwild/obe/f401/halconf.h rename to keyboards/mechwild/obe/f401/eeprom/halconf.h diff --git a/keyboards/mechwild/obe/f401/mcuconf.h b/keyboards/mechwild/obe/f401/eeprom/mcuconf.h similarity index 100% rename from keyboards/mechwild/obe/f401/mcuconf.h rename to 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 00000000000..c2c0bbd5d61 --- /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 00000000000..83eed90b993 --- /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 . +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/obe/f411/halconf.h b/keyboards/mechwild/obe/f411/eeprom/halconf.h similarity index 100% rename from keyboards/mechwild/obe/f411/halconf.h rename to keyboards/mechwild/obe/f411/eeprom/halconf.h diff --git a/keyboards/mechwild/obe/f411/mcuconf.h b/keyboards/mechwild/obe/f411/eeprom/mcuconf.h similarity index 99% rename from keyboards/mechwild/obe/f411/mcuconf.h rename to keyboards/mechwild/obe/f411/eeprom/mcuconf.h index a00131aca55..da43021663c 100644 --- a/keyboards/mechwild/obe/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 00000000000..b823aa31cce --- /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 8c57aa283b8..b2b22b37e34 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 d5fac1ee4eb..bdcc7d903bf 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 e3fc719b8f1..057ca383be1 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -30,8 +30,6 @@ along with this program. If not, see . #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 00000000000..83eed90b993 --- /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 . +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/waka60/f411/halconf.h b/keyboards/mechwild/waka60/f401/eeprom/halconf.h similarity index 100% rename from keyboards/mechwild/waka60/f411/halconf.h rename to keyboards/mechwild/waka60/f401/eeprom/halconf.h diff --git a/keyboards/mechwild/waka60/f411/mcuconf.h b/keyboards/mechwild/waka60/f401/eeprom/mcuconf.h similarity index 99% rename from keyboards/mechwild/waka60/f411/mcuconf.h rename to keyboards/mechwild/waka60/f401/eeprom/mcuconf.h index a00131aca55..da43021663c 100644 --- a/keyboards/mechwild/waka60/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 00000000000..c2c0bbd5d61 --- /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/f411/eeprom/config.h b/keyboards/mechwild/waka60/f411/eeprom/config.h new file mode 100644 index 00000000000..83eed90b993 --- /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 . +*/ + +#pragma once + +#define EEPROM_I2C_24LC64 diff --git a/keyboards/mechwild/waka60/f401/halconf.h b/keyboards/mechwild/waka60/f411/eeprom/halconf.h similarity index 90% rename from keyboards/mechwild/waka60/f401/halconf.h rename to keyboards/mechwild/waka60/f411/eeprom/halconf.h index 25309fc70fc..b57977316a6 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 diff --git a/keyboards/mechwild/waka60/f401/mcuconf.h b/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h similarity index 83% rename from keyboards/mechwild/waka60/f401/mcuconf.h rename to keyboards/mechwild/waka60/f411/eeprom/mcuconf.h index 95339690cf9..da43021663c 100644 --- a/keyboards/mechwild/waka60/f401/mcuconf.h +++ b/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h @@ -20,8 +20,3 @@ #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/rules.mk b/keyboards/mechwild/waka60/f411/eeprom/rules.mk new file mode 100644 index 00000000000..b823aa31cce --- /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 5b058057fca..06e0fbc7c59 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