summaryrefslogtreecommitdiffstats
path: root/keyboards/mechwild/obe
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-20 16:12:15 +0000
committerQMK Bot <hello@qmk.fm>2022-05-20 16:12:15 +0000
commit5ac861efa58eb40a7adaa0b1f443f41a9d662741 (patch)
treeb0380aef1e7b8a30e057ecda6661ae159bcb29a2 /keyboards/mechwild/obe
parent90f3e139e65c59a41ce2cb9fd1b9bf49bbb8d437 (diff)
parent799a7f98ce82fe3057d2b11b2c2515ab28e80b51 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/mechwild/obe')
-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/obe/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
11 files changed, 58 insertions, 5 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/obe/f411/mcuconf.h b/keyboards/mechwild/obe/f411/eeprom/mcuconf.h
index a00131aca5..da43021663 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 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