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

6 files changed, 4 insertions, 5 deletions

diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index 76281561e..cc90dba00 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -49,8 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enable double tab */
 #define TAPPING_TERM 175
 
-#define COMBO_COUNT 1
-
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/config.h b/keyboards/handwired/aek64/keymaps/4sstylz/config.h
new file mode 100644
index 000000000..914861332
--- /dev/null
+++ b/keyboards/handwired/aek64/keymaps/4sstylz/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define COMBO_COUNT 1
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/rules.mk b/keyboards/handwired/aek64/keymaps/4sstylz/rules.mk
new file mode 100644
index 000000000..ab1e43818
--- /dev/null
+++ b/keyboards/handwired/aek64/keymaps/4sstylz/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk
index e4d6bd0d8..6aaa28686 100644
--- a/keyboards/handwired/aek64/rules.mk
+++ b/keyboards/handwired/aek64/rules.mk
@@ -15,6 +15,5 @@ COMMAND_ENABLE   = yes # Commands for debug and configuration
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 NKRO_ENABLE      = no  # USB Nkey Rollover - not yet supported in LUFA
 UNICODE_ENABLE   = yes # Enable support for arrow keys icon on the second layer.
-COMBO_ENABLE     = yes # Enable combo for special function when using multiple keys at once.
 NKRO_ENABLE      = yes
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/maxr1998/phoebe/rules.mk b/keyboards/maxr1998/phoebe/rules.mk
index 1a39a4aea..f7ef7ab72 100644
--- a/keyboards/maxr1998/phoebe/rules.mk
+++ b/keyboards/maxr1998/phoebe/rules.mk
@@ -13,7 +13,6 @@ MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = no       # Audio control and System control
 CONSOLE_ENABLE = yes       # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-COMBO_ENABLE = no          # Key combo feature
 NKRO_ENABLE = yes          # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/uranuma/rules.mk b/keyboards/uranuma/rules.mk
index 5c865ddd1..28aa4c81d 100644
--- a/keyboards/uranuma/rules.mk
+++ b/keyboards/uranuma/rules.mk
@@ -21,5 +21,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
 AUDIO_ENABLE = no           # Audio output
 
-#COMBO_ENABLE = yes
 #SRC +=  .nicola.c \