summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/axolstudio/yeti/hotswap/hotswap.c10
-rw-r--r--keyboards/mechwild/obe/config.h2
-rw-r--r--keyboards/mechwild/obe/f401/eeprom/config.h20
-rw-r--r--keyboards/mechwild/obe/f401/eeprom/halconf.h (renamed from keyboards/mechwild/obe/f401/halconf.h)0
-rw-r--r--keyboards/mechwild/obe/f401/eeprom/mcuconf.h (renamed from keyboards/mechwild/obe/f401/mcuconf.h)0
-rw-r--r--keyboards/mechwild/obe/f401/eeprom/rules.mk7
-rw-r--r--keyboards/mechwild/obe/f411/eeprom/config.h20
-rw-r--r--keyboards/mechwild/obe/f411/eeprom/halconf.h (renamed from keyboards/mechwild/obe/f411/halconf.h)0
-rw-r--r--keyboards/mechwild/obe/f411/eeprom/mcuconf.h (renamed from keyboards/mechwild/waka60/f411/mcuconf.h)1
-rw-r--r--keyboards/mechwild/obe/f411/eeprom/rules.mk7
-rw-r--r--keyboards/mechwild/obe/obe.h4
-rw-r--r--keyboards/mechwild/obe/rules.mk2
-rw-r--r--keyboards/mechwild/waka60/config.h2
-rw-r--r--keyboards/mechwild/waka60/f401/eeprom/config.h20
-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/obe/f411/mcuconf.h)1
-rw-r--r--keyboards/mechwild/waka60/f401/eeprom/rules.mk7
-rw-r--r--keyboards/mechwild/waka60/f401/mcuconf.h27
-rw-r--r--keyboards/mechwild/waka60/f411/eeprom/config.h20
-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.h22
-rw-r--r--keyboards/mechwild/waka60/f411/eeprom/rules.mk7
-rw-r--r--keyboards/mechwild/waka60/rules.mk2
23 files changed, 139 insertions, 45 deletions
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index d1debb4e35..1de5f7fab2 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -96,11 +96,11 @@ led_config_t g_led_config = {
{ NO_LED, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56 },
{ NO_LED, 57, NO_LED, 58, NO_LED, 59, 60, NO_LED, 61, NO_LED, 62, NO_LED, NO_LED, NO_LED, 63 }
}, {
- {0, 0},{16, 0},{16*2, 0},{16*3, 0},{16*4, 0},{16*5, 0},{16*6, 0},{16*7, 0},{16*8, 0},{16*9, 0},{16*10, 0},{16*11, 0},{16*12, 0},{16*13, 0},{16*14, 0},
- {0, 16},{16,16},{16*2,16},{16*3,16},{16*4,16},{16*5,16},{16*6,16},{16*7,16},{16*8,16},{16*9,16},{16*10,16},{16*11,16},{16*12,16},{16*13,16},{16*14,16},
- {0,32},{16,32},{16*2,32},{16*3,32},{16*4,32},{16*5,32},{16*6,32},{16*7,32},{16*8,32},{16*9,32},{16*10,32},{16*11,32},{16*12,32},{16*14},
- {16,48},{16*2,48},{16*3,48},{16*4,48},{16*5,48},{16*6,48},{16*7,48},{16*8,48},{16*9,48},{16*10,48},{16*11,48},{16*12,48},{16*14,48},
- {16,64},{16*3,64},{16*5,64},{16*6,64},{16*8,64},{16*10,64},{16*14,64}
+ {0, 0},{16, 0},{32, 0},{48, 0},{64, 0},{80, 0},{96, 0},{112, 0},{128, 0},{144, 0},{160, 0},{176, 0},{192, 0},{208, 0},{224, 0},
+ {0, 16},{16,16},{32,16},{48,16},{64,16},{80,16},{96,16},{112,16},{128,16},{144,16},{160,16},{176,16},{192,16},{208,16},{224,16},
+ {0,32},{16,32},{32,32},{48,32},{64,32},{80,32},{96,32},{112,32},{128,32},{144,32},{160,32},{176,32},{192,32},{224},
+ {16,48},{32,48},{48,48},{64,48},{80,48},{96,48},{112,48},{128,48},{144,48},{160,48},{176,48},{192,48},{224,48},
+ {16,64},{48,64},{80,64},{96,64},{128,64},{160,64},{224,64}
}, {
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
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