Merge remote-tracking branch 'origin/master' into develop

2024-06-17 04:48:03 +00:00 · 2024-06-17 04:48:03 +00:00 · 63848603be
parent 0966901f95 4864d5afca
commit 63848603be
24 changed files with 30 additions and 6 deletions
--- a/keyboards/mechwild/obe/f401/base/keyboard.json
+++ b/keyboards/mechwild/obe/f401/base/keyboard.json
@ -0,0 +1 @@
+{}
--- a/keyboards/mechwild/obe/f401/eeprom/keyboard.json
+++ b/keyboards/mechwild/obe/f401/eeprom/keyboard.json
@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
--- a/keyboards/mechwild/obe/f401/eeprom/rules.mk
+++ b/keyboards/mechwild/obe/f401/eeprom/rules.mk
@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
--- a/keyboards/mechwild/obe/f401/keyboard.json
+++ b/keyboards/mechwild/obe/f401/keyboard.json
--- a/keyboards/mechwild/obe/f401/rules.mk
+++ b/keyboards/mechwild/obe/f401/rules.mk
@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/obe/f401/base
--- a/keyboards/mechwild/obe/f411/base/keyboard.json
+++ b/keyboards/mechwild/obe/f411/base/keyboard.json
@ -0,0 +1 @@
+{}
--- a/keyboards/mechwild/obe/f411/eeprom/keyboard.json
+++ b/keyboards/mechwild/obe/f411/eeprom/keyboard.json
@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
--- a/keyboards/mechwild/obe/f411/eeprom/rules.mk
+++ b/keyboards/mechwild/obe/f411/eeprom/rules.mk
@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
--- a/keyboards/mechwild/obe/f411/keyboard.json
+++ b/keyboards/mechwild/obe/f411/keyboard.json
--- a/keyboards/mechwild/obe/f411/rules.mk
+++ b/keyboards/mechwild/obe/f411/rules.mk
@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/obe/f411/base
--- a/keyboards/mechwild/obe/rules.mk
+++ b/keyboards/mechwild/obe/rules.mk
@ -1 +1 @@
-DEFAULT_FOLDER = mechwild/obe/f401
+DEFAULT_FOLDER = mechwild/obe/f401/base
--- a/keyboards/mechwild/waka60/f401/base/keyboard.json
+++ b/keyboards/mechwild/waka60/f401/base/keyboard.json
@ -0,0 +1 @@
+{}
--- a/keyboards/mechwild/waka60/f401/eeprom/config.h
+++ b/keyboards/mechwild/waka60/f401/eeprom/config.h
--- a/keyboards/mechwild/waka60/f401/eeprom/keyboard.json
+++ b/keyboards/mechwild/waka60/f401/eeprom/keyboard.json
@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
--- a/keyboards/mechwild/waka60/f401/eeprom/rules.mk
+++ b/keyboards/mechwild/waka60/f401/eeprom/rules.mk
@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
--- a/keyboards/mechwild/waka60/f401/keyboard.json
+++ b/keyboards/mechwild/waka60/f401/keyboard.json
--- a/keyboards/mechwild/waka60/f401/rules.mk
+++ b/keyboards/mechwild/waka60/f401/rules.mk
@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/waka60/f401/base
--- a/keyboards/mechwild/waka60/f411/base/keyboard.json
+++ b/keyboards/mechwild/waka60/f411/base/keyboard.json
@ -0,0 +1 @@
+{}
--- a/keyboards/mechwild/waka60/f411/eeprom/config.h
+++ b/keyboards/mechwild/waka60/f411/eeprom/config.h
--- a/keyboards/mechwild/waka60/f411/eeprom/keyboard.json
+++ b/keyboards/mechwild/waka60/f411/eeprom/keyboard.json
@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
--- a/keyboards/mechwild/waka60/f411/eeprom/rules.mk
+++ b/keyboards/mechwild/waka60/f411/eeprom/rules.mk
@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
--- a/keyboards/mechwild/waka60/f411/keyboard.json
+++ b/keyboards/mechwild/waka60/f411/keyboard.json
--- a/keyboards/mechwild/waka60/f411/rules.mk
+++ b/keyboards/mechwild/waka60/f411/rules.mk
@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/waka60/f411/base
--- a/keyboards/mechwild/waka60/rules.mk
+++ b/keyboards/mechwild/waka60/rules.mk
@ -1 +1 @@
-DEFAULT_FOLDER = mechwild/waka60/f401
+DEFAULT_FOLDER = mechwild/waka60/f401/base