aboutsummaryrefslogtreecommitdiff
path: root/keyboards/rgbkb
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2025-02-28 09:23:04 +1100
committerNick Brassel <[email protected]>2025-02-28 09:23:04 +1100
commita63fd7f01cdabd9ce85bb09ae2b573fd3b8e60aa (patch)
tree35d817580e5244d62a150a2d012f72906a610977 /keyboards/rgbkb
parent6d0e5728aa61b442885d48caf49d29e5c60e8197 (diff)
parentcdb865cf60b17593f5c811c24a21d7b3030d8653 (diff)
downloadqmk_firmware-a63fd7f01cdabd9ce85bb09ae2b573fd3b8e60aa.tar.gz
qmk_firmware-a63fd7f01cdabd9ce85bb09ae2b573fd3b8e60aa.zip
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/rgbkb')
-rw-r--r--keyboards/rgbkb/mun/rules.mk1
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/rules.mk2
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/rules.mk1
-rw-r--r--keyboards/rgbkb/pan/rev1/rules.mk2
-rw-r--r--keyboards/rgbkb/pan/rules.mk3
-rw-r--r--keyboards/rgbkb/sol/rules.mk1
-rw-r--r--keyboards/rgbkb/sol3/rev1/keyboard.json2
-rw-r--r--keyboards/rgbkb/sol3/rules.mk1
-rw-r--r--keyboards/rgbkb/zen/rules.mk1
-rw-r--r--keyboards/rgbkb/zygomorph/rules.mk1
10 files changed, 5 insertions, 10 deletions
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
deleted file mode 100644
index 317c4d5a87..0000000000
--- a/keyboards/rgbkb/mun/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/mun/rev1
diff --git a/keyboards/rgbkb/pan/rev1/32a/rules.mk b/keyboards/rgbkb/pan/rev1/32a/rules.mk
index c2ee0bc86f..f54ef3e987 100644
--- a/keyboards/rgbkb/pan/rev1/32a/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/32a/rules.mk
@@ -1,2 +1,4 @@
# Processor frequency
F_CPU = 16000000
+
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
new file mode 100644
index 0000000000..9a69649289
--- /dev/null
+++ b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk
deleted file mode 100644
index 4d3c0f6679..0000000000
--- a/keyboards/rgbkb/pan/rev1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# The default configuration is a atmega32a
-DEFAULT_FOLDER = rgbkb/pan/rev1/32a
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
deleted file mode 100644
index b6f1d46a65..0000000000
--- a/keyboards/rgbkb/pan/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-WS2812_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = rgbkb/pan/rev1
diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk
deleted file mode 100644
index f8325017f9..0000000000
--- a/keyboards/rgbkb/sol/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/sol/rev2
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index a81ea7bc21..775e3f8629 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -153,6 +153,8 @@
"pin": "A9"
},
"transport": {
+ "watchdog": true,
+ "watchdog_timeout": 20000,
"sync": {
"indicators": true,
"layer_state": true,
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
deleted file mode 100644
index 74804682a2..0000000000
--- a/keyboards/rgbkb/sol3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/sol3/rev1
diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk
deleted file mode 100644
index ee94832d4d..0000000000
--- a/keyboards/rgbkb/zen/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/zen/rev2
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
deleted file mode 100644
index 8544e8767d..0000000000
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rgbkb/zygomorph/rev1