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

33 files changed, 5 insertions, 34 deletions

diff --git a/keyboards/9key/rules.mk b/keyboards/9key/rules.mk
index b71f32348c..4ac3080214 100644
--- a/keyboards/9key/rules.mk
+++ b/keyboards/9key/rules.mk
@@ -18,7 +18,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes         # Unicode
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-TAP_DANCE_ENABLE = no
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/aleth42/rev0/rules.mk b/keyboards/aleth42/rev0/rules.mk
index 94e5bb2788..52fc79e2b1 100644
--- a/keyboards/aleth42/rev0/rules.mk
+++ b/keyboards/aleth42/rev0/rules.mk
@@ -19,4 +19,3 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/aleth42/rev1/rules.mk b/keyboards/aleth42/rev1/rules.mk
index d67ab1a680..134b0490c0 100644
--- a/keyboards/aleth42/rev1/rules.mk
+++ b/keyboards/aleth42/rev1/rules.mk
@@ -19,4 +19,3 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/bastardkb/skeletyl/rules.mk b/keyboards/bastardkb/skeletyl/rules.mk
index abe5fe65b8..31aec2232e 100644
--- a/keyboards/bastardkb/skeletyl/rules.mk
+++ b/keyboards/bastardkb/skeletyl/rules.mk
@@ -22,7 +22,6 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together wi
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
-TAP_DANCE_ENABLE = no
 LTO_ENABLE = yes
 
 AUDIO_SUPPORTED = no
diff --git a/keyboards/bastardkb/tbkmini/rules.mk b/keyboards/bastardkb/tbkmini/rules.mk
index 690c3cb09a..009cb4bbc1 100644
--- a/keyboards/bastardkb/tbkmini/rules.mk
+++ b/keyboards/bastardkb/tbkmini/rules.mk
@@ -23,7 +23,6 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together wi
 RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
-TAP_DANCE_ENABLE = no
 LTO_ENABLE = yes
 
 AUDIO_SUPPORTED = no
diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk
index e03827cde2..e4d6bd0d8b 100644
--- a/keyboards/handwired/aek64/rules.mk
+++ b/keyboards/handwired/aek64/rules.mk
@@ -16,6 +16,5 @@ 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.
-TAP_DANCE_ENABLE = no  # Enable use multiple tap
 NKRO_ENABLE      = yes
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk
index df40192473..8c89bbefe5 100644
--- a/keyboards/handwired/chiron/rules.mk
+++ b/keyboards/handwired/chiron/rules.mk
@@ -20,7 +20,6 @@ MOUSEKEY_ENABLE = yes
 NKRO_ENABLE = no
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
-TAP_DANCE_ENABLE = no
 UCIS_ENABLE = no
 UNICODEMAP_ENABLE = no
 UNICODE_ENABLE = no
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/rules.mk b/keyboards/handwired/concertina/64key/keymaps/default/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/handwired/concertina/64key/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/concertina/64key/rules.mk b/keyboards/handwired/concertina/64key/rules.mk
index 1659be4139..4dde08b00b 100644
--- a/keyboards/handwired/concertina/64key/rules.mk
+++ b/keyboards/handwired/concertina/64key/rules.mk
@@ -20,5 +20,3 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/k_numpad17/rules.mk b/keyboards/handwired/k_numpad17/rules.mk
index 89b4183833..03c9c27823 100644
--- a/keyboards/handwired/k_numpad17/rules.mk
+++ b/keyboards/handwired/k_numpad17/rules.mk
@@ -17,6 +17,5 @@ RGBLIGHT_ENABLE = no   # Enable keyboard underlight functionality
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality 
 AUDIO_ENABLE = no
 UNICODE_ENABLE = no 		# Unicode
-TAP_DANCE_ENABLE = no
 
 LAYOUTS = numpad_5x4
diff --git a/keyboards/handwired/myskeeb/keymaps/default/rules.mk b/keyboards/handwired/myskeeb/keymaps/default/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/handwired/myskeeb/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
index 893d364263..10ade1f090 100644
--- a/keyboards/handwired/myskeeb/rules.mk
+++ b/keyboards/handwired/myskeeb/rules.mk
@@ -23,4 +23,3 @@ SPLIT_KEYBOARD = yes        # Enables split keyboard support
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 NO_USB_STARTUP_CHECK = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/space_oddity/keymaps/default/rules.mk b/keyboards/handwired/space_oddity/keymaps/default/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/handwired/space_oddity/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/space_oddity/rules.mk b/keyboards/handwired/space_oddity/rules.mk
index 70b2151a3f..f55552ad89 100644
--- a/keyboards/handwired/space_oddity/rules.mk
+++ b/keyboards/handwired/space_oddity/rules.mk
@@ -17,5 +17,4 @@ NKRO_ENABLE = yes          # USB Nkey Rollover - if this doesn't work, see here:
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
\ No newline at end of file
+DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/handwired/terminus_mini/rules.mk b/keyboards/handwired/terminus_mini/rules.mk
index 73e43c5ce8..20ffaa787c 100644
--- a/keyboards/handwired/terminus_mini/rules.mk
+++ b/keyboards/handwired/terminus_mini/rules.mk
@@ -20,4 +20,3 @@ UNICODE_ENABLE = no         # Unicode
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no		# Enable tap dance
diff --git a/keyboards/laptreus/rules.mk b/keyboards/laptreus/rules.mk
index ba916ec136..017af30220 100644
--- a/keyboards/laptreus/rules.mk
+++ b/keyboards/laptreus/rules.mk
@@ -20,7 +20,6 @@ NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: ht
 #BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 UNICODE_ENABLE = no         # Unicode
 KEY_LOCK_ENABLE = no
-TAP_DANCE_ENABLE = no
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/le_chiffre/rules.mk b/keyboards/le_chiffre/rules.mk
index e683fb1ff0..6a3b3895fa 100644
--- a/keyboards/le_chiffre/rules.mk
+++ b/keyboards/le_chiffre/rules.mk
@@ -10,7 +10,6 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-TAP_DANCE_ENABLE = no
 ENCODER_ENABLE = yes
 OLED_ENABLE = no
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk
index ddd84b08e8..f976e7a33d 100644
--- a/keyboards/lfkeyboards/lfk78/rules.mk
+++ b/keyboards/lfkeyboards/lfk78/rules.mk
@@ -17,7 +17,6 @@ UNICODE_ENABLE = no             # Unicode
 RGBLIGHT_ENABLE = yes           # Enable WS2812 RGB underlight.
 RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lfkeyboards, not qmk base
 SLEEP_LED_ENABLE = yes          # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no
 
 ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install this must be disabled
 WATCHDOG_ENABLE = no            # Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk
index 26c0cd81cb..a0a0688921 100644
--- a/keyboards/lfkeyboards/lfk87/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/rules.mk
@@ -32,7 +32,6 @@ UNICODE_ENABLE = no             # Unicode
 RGBLIGHT_ENABLE = yes           # Enable RGB underlight
 RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes          # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no
 
 ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
 WATCHDOG_ENABLE = no		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk
index b82bd3d1b9..1eb4299724 100644
--- a/keyboards/lfkeyboards/lfkpad/rules.mk
+++ b/keyboards/lfkeyboards/lfkpad/rules.mk
@@ -21,7 +21,6 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lfkeyboards, not qmk base
 AUDIO_ENABLE = no            # Audio output
 UNICODE_ENABLE = no          # Unicode
-TAP_DANCE_ENABLE = no
 
 ISSI_ENABLE = yes            # If the I2C pullup resistors aren't installed this must be disabled
 WATCHDOG_ENABLE = no         # Resets keyboard if matrix_scan() isn't run every 250ms
diff --git a/keyboards/mt40/rules.mk b/keyboards/mt40/rules.mk
index 61dc118cf9..68e8d09ab1 100644
--- a/keyboards/mt40/rules.mk
+++ b/keyboards/mt40/rules.mk
@@ -16,7 +16,6 @@ AUDIO_ENABLE = no      # Audio output
 UNICODE_ENABLE = no    # Unicode
 RGBLIGHT_ENABLE = yes  # Enable WS2812 RGB underlight. 
 WS2812_DRIVER = i2c
-TAP_DANCE_ENABLE = no
 
 LAYOUTS = planck_mit
 LAYOUTS_HAS_RGB = no
diff --git a/keyboards/nafuda/rules.mk b/keyboards/nafuda/rules.mk
index b12f2e7df1..e2c48f3760 100644
--- a/keyboards/nafuda/rules.mk
+++ b/keyboards/nafuda/rules.mk
@@ -17,8 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = no         # Unicode
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-TAP_DANCE_ENABLE = no
 OLED_ENABLE = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/naked64/rules.mk b/keyboards/naked64/rules.mk
index baa7df308f..ae6a1b69b4 100644
--- a/keyboards/naked64/rules.mk
+++ b/keyboards/naked64/rules.mk
@@ -17,7 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = no         # Unicode
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-TAP_DANCE_ENABLE = no
 OLED_ENABLE = no
 USE_I2C = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/ncc1701kb/rules.mk b/keyboards/ncc1701kb/rules.mk
index 19106badd5..46d10a1f92 100644
--- a/keyboards/ncc1701kb/rules.mk
+++ b/keyboards/ncc1701kb/rules.mk
@@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
-TAP_DANCE_ENABLE = no
-ENCODER_ENABLE = yes
\ No newline at end of file
+ENCODER_ENABLE = yes
diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk
index f9d5498961..8a1b3979f8 100644
--- a/keyboards/numatreus/rules.mk
+++ b/keyboards/numatreus/rules.mk
@@ -15,7 +15,6 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 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
 UNICODE_ENABLE = yes         # Unicode
-#TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = no
 LED_ANIMATIONS = no
 
diff --git a/keyboards/setta21/rules.mk b/keyboards/setta21/rules.mk
index 8e723b0ff7..9f598e457d 100644
--- a/keyboards/setta21/rules.mk
+++ b/keyboards/setta21/rules.mk
@@ -17,7 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = no         # Unicode
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-TAP_DANCE_ENABLE = no
 OLED_ENABLE = no
 USE_I2C = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/tanuki/rules.mk b/keyboards/tanuki/rules.mk
index 70d1a73816..92e3a57c82 100644
--- a/keyboards/tanuki/rules.mk
+++ b/keyboards/tanuki/rules.mk
@@ -17,4 +17,3 @@ RGBLIGHT_ENABLE =yes   # Enable keyboard underlight functionality
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 UNICODE_ENABLE = no 		# Unicode
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
index 758ae3594d..ee03434e2b 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
+++ b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
@@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
-TAP_DANCE_ENABLE = no
 ENCODER_ENABLE = yes
diff --git a/keyboards/themadnoodle/noodlepad/rules.mk b/keyboards/themadnoodle/noodlepad/rules.mk
index 758ae3594d..ee03434e2b 100644
--- a/keyboards/themadnoodle/noodlepad/rules.mk
+++ b/keyboards/themadnoodle/noodlepad/rules.mk
@@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
-TAP_DANCE_ENABLE = no
 ENCODER_ENABLE = yes
diff --git a/keyboards/treadstone48/rules.mk b/keyboards/treadstone48/rules.mk
index fa67c4f8c9..e60d3dd50f 100644
--- a/keyboards/treadstone48/rules.mk
+++ b/keyboards/treadstone48/rules.mk
@@ -20,7 +20,6 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 
 MOUSEKEY_ENABLE = yes       # Mouse keys
-TAP_DANCE_ENABLE = no
 
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
diff --git a/keyboards/ut472/rules.mk b/keyboards/ut472/rules.mk
index 66a0946e0e..48b730df25 100644
--- a/keyboards/ut472/rules.mk
+++ b/keyboards/ut472/rules.mk
@@ -20,4 +20,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 UNICODE_ENABLE = no         # Unicode
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = no      # Enable tap dance feature
diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk
index 3ca89a0b9d..f10c10e85f 100644
--- a/keyboards/winkeyless/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
@@ -14,7 +14,6 @@ COMMAND_ENABLE = no
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 WS2812_DRIVER = i2c
-TAP_DANCE_ENABLE = no
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/zfrontier/big_switch/rules.mk b/keyboards/zfrontier/big_switch/rules.mk
index 762dab69e8..34c22e920f 100644
--- a/keyboards/zfrontier/big_switch/rules.mk
+++ b/keyboards/zfrontier/big_switch/rules.mk
@@ -19,4 +19,3 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-TAP_DANCE_ENABLE = no