summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-17 14:12:32 +0000
committerQMK Bot <hello@qmk.fm>2022-01-17 14:12:32 +0000
commitfb65f07832e007dd012acc037d5aa1d27d07fe20 (patch)
tree8375a5e2d1331c7333a938ee9d975d2c490e91f6
parentc72ed7c02473dec4da6cb263c1e0fb2ca4856b94 (diff)
parentb8951a0458f34f591299c6d35167a3189be8acb8 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/a_dux/rules.mk5
-rw-r--r--keyboards/cradio/cradio.h2
-rw-r--r--keyboards/cradio/rules.mk1
-rw-r--r--keyboards/ferris/0_1/rules.mk2
-rw-r--r--keyboards/ferris/0_2/rules.mk2
-rw-r--r--keyboards/ferris/sweep/rules.mk1
6 files changed, 11 insertions, 2 deletions
diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk
index 95847adba1..f4f3aaf382 100644
--- a/keyboards/a_dux/rules.mk
+++ b/keyboards/a_dux/rules.mk
@@ -15,6 +15,7 @@ COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+UNICODE_ENABLE = yes # Unicode
AUDIO_ENABLE = no # Audio output
-UNICODE_ENABLE = yes
-SPLIT_KEYBOARD = yes
+SPLIT_KEYBOARD = yes # Use shared split_common code
+LAYOUTS = split_3x5_2
diff --git a/keyboards/cradio/cradio.h b/keyboards/cradio/cradio.h
index 527cc16ad0..f013386bf8 100644
--- a/keyboards/cradio/cradio.h
+++ b/keyboards/cradio/cradio.h
@@ -48,3 +48,5 @@
{ R16, R17, ___, ___, ___ } \
}
+#define LAYOUT LAYOUT_split_3x5_2
+
diff --git a/keyboards/cradio/rules.mk b/keyboards/cradio/rules.mk
index aa1b1c0b36..1e4940ca7d 100644
--- a/keyboards/cradio/rules.mk
+++ b/keyboards/cradio/rules.mk
@@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
UNICODE_ENABLE = yes # Unicode
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Use shared split_common code
+LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index 86db6e4d12..4b8f1f0c9a 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -23,3 +23,5 @@ LTO_ENABLE = yes
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index 0c12328cee..2d406f5c1d 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -23,3 +23,5 @@ LTO_ENABLE = no
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk
index 9399838733..ffc17739f7 100644
--- a/keyboards/ferris/sweep/rules.mk
+++ b/keyboards/ferris/sweep/rules.mk
@@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
UNICODE_ENABLE = yes # Unicode
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Use shared split_common code
+LAYOUTS = split_3x5_2