diff options
author | Kyle McCreery <mccreery.kyle@gmail.com> | 2022-05-20 12:10:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-20 09:10:05 -0700 |
commit | c60c19e8d5ebb1066193e8cb73b0c9f235bc5b36 (patch) | |
tree | 1cce72249ce0d614e20238a613b4dd605c9fe9af /keyboards/mechwild/waka60 | |
parent | 713ce7b276d96fe6a05e40dacec60cc2c2a33024 (diff) |
[Keyboard] Add eeprom IC-less rev for MechWild OBE and Waka60 (#17126)
Diffstat (limited to 'keyboards/mechwild/waka60')
-rw-r--r-- | keyboards/mechwild/waka60/config.h | 2 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f401/eeprom/config.h | 20 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f401/eeprom/halconf.h (renamed from keyboards/mechwild/waka60/f411/halconf.h) | 0 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f401/eeprom/mcuconf.h (renamed from keyboards/mechwild/waka60/f411/mcuconf.h) | 1 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f401/eeprom/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f411/eeprom/config.h | 20 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f411/eeprom/halconf.h (renamed from keyboards/mechwild/waka60/f401/halconf.h) | 3 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f411/eeprom/mcuconf.h (renamed from keyboards/mechwild/waka60/f401/mcuconf.h) | 5 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/f411/eeprom/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/rules.mk | 2 |
10 files changed, 54 insertions, 13 deletions
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/waka60/f411/mcuconf.h b/keyboards/mechwild/waka60/f401/eeprom/mcuconf.h index a00131aca5..da43021663 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 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/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/f401/mcuconf.h b/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h index 95339690cf..da43021663 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 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 |