qmk_firmware

commit: 63848603be0c65771b0d9f99166fafeffc7e5bab
parent 0966901f95dc662165c3ad3ebe4d47ff854f1b03
Author: QMK Bot <hello@qmk.fm>
Date:   Mon, 17 Jun 2024 04:48:03 +0000

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

Diffstat:
A
keyboards/mechwild/obe/f401/base/keyboard.json
1
+
A
keyboards/mechwild/obe/f401/eeprom/keyboard.json
5
+++++
D
keyboards/mechwild/obe/f401/eeprom/rules.mk
1
-
R
keyboards/mechwild/obe/f401/keyboard.json -> keyboards/mechwild/obe/f401/info.json
0

A
keyboards/mechwild/obe/f401/rules.mk
1
+
A
keyboards/mechwild/obe/f411/base/keyboard.json
1
+
A
keyboards/mechwild/obe/f411/eeprom/keyboard.json
5
+++++
D
keyboards/mechwild/obe/f411/eeprom/rules.mk
1
-
R
keyboards/mechwild/obe/f411/keyboard.json -> keyboards/mechwild/obe/f411/info.json
0

A
keyboards/mechwild/obe/f411/rules.mk
1
+
M
keyboards/mechwild/obe/rules.mk
2
+-
A
keyboards/mechwild/waka60/f401/base/keyboard.json
1
+
R
keyboards/mechwild/waka60/f401/config.h -> keyboards/mechwild/waka60/f401/eeprom/config.h
0

A
keyboards/mechwild/waka60/f401/eeprom/keyboard.json
5
+++++
D
keyboards/mechwild/waka60/f401/eeprom/rules.mk
1
-
R
keyboards/mechwild/waka60/f401/keyboard.json -> keyboards/mechwild/waka60/f401/info.json
0

A
keyboards/mechwild/waka60/f401/rules.mk
1
+
A
keyboards/mechwild/waka60/f411/base/keyboard.json
1
+
R
keyboards/mechwild/waka60/f411/config.h -> keyboards/mechwild/waka60/f411/eeprom/config.h
0

A
keyboards/mechwild/waka60/f411/eeprom/keyboard.json
5
+++++
D
keyboards/mechwild/waka60/f411/eeprom/rules.mk
1
-
R
keyboards/mechwild/waka60/f411/keyboard.json -> keyboards/mechwild/waka60/f411/info.json
0

A
keyboards/mechwild/waka60/f411/rules.mk
1
+
M
keyboards/mechwild/waka60/rules.mk
2
+-

24 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/keyboards/mechwild/obe/f401/base/keyboard.json b/keyboards/mechwild/obe/f401/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/obe/f401/eeprom/keyboard.json b/keyboards/mechwild/obe/f401/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/obe/f401/eeprom/rules.mk b/keyboards/mechwild/obe/f401/eeprom/rules.mk
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/obe/f401/keyboard.json b/keyboards/mechwild/obe/f401/info.json
diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/obe/f401/base
diff --git a/keyboards/mechwild/obe/f411/base/keyboard.json b/keyboards/mechwild/obe/f411/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/obe/f411/eeprom/keyboard.json b/keyboards/mechwild/obe/f411/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/obe/f411/eeprom/rules.mk b/keyboards/mechwild/obe/f411/eeprom/rules.mk
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/obe/f411/keyboard.json b/keyboards/mechwild/obe/f411/info.json
diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/obe/f411/base
diff --git 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
diff --git a/keyboards/mechwild/waka60/f401/base/keyboard.json b/keyboards/mechwild/waka60/f401/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/waka60/f401/config.h b/keyboards/mechwild/waka60/f401/eeprom/config.h
diff --git a/keyboards/mechwild/waka60/f401/eeprom/keyboard.json b/keyboards/mechwild/waka60/f401/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/waka60/f401/eeprom/rules.mk b/keyboards/mechwild/waka60/f401/eeprom/rules.mk
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/waka60/f401/keyboard.json b/keyboards/mechwild/waka60/f401/info.json
diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/waka60/f401/base
diff --git a/keyboards/mechwild/waka60/f411/base/keyboard.json b/keyboards/mechwild/waka60/f411/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/waka60/f411/config.h b/keyboards/mechwild/waka60/f411/eeprom/config.h
diff --git a/keyboards/mechwild/waka60/f411/eeprom/keyboard.json b/keyboards/mechwild/waka60/f411/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/waka60/f411/eeprom/rules.mk b/keyboards/mechwild/waka60/f411/eeprom/rules.mk
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/waka60/f411/keyboard.json b/keyboards/mechwild/waka60/f411/info.json
diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/waka60/f411/base
diff --git 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