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

3 years ago · fb65f07832
parent c72ed7c024 b8951a0458
commit fb65f07832
6 changed files with 11 additions and 2 deletions
--- 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
--- a/keyboards/cradio/cradio.h
+++ b/keyboards/cradio/cradio.h
@ -48,3 +48,5 @@
        { R16, R17, ___, ___, ___ }  \
    }

+#define LAYOUT LAYOUT_split_3x5_2
+
--- 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
--- 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
--- 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
--- 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