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

4 files changed, 3 insertions, 2 deletions

diff --git a/keyboards/handwired/2x5keypad/keymaps/default/keymap.json b/keyboards/handwired/2x5keypad/keymaps/default/keymap.json
new file mode 100644
index 0000000000..d8c9f792a6
--- /dev/null
+++ b/keyboards/handwired/2x5keypad/keymaps/default/keymap.json
@@ -0,0 +1 @@
+{"version":1,"notes":"","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"handwired/2x5keypad","keymap":"default","layout":"LAYOUT","layers":[["KC_1","KC_2","KC_3","KC_4","KC_5","KC_Q","KC_W","KC_E","KC_R","KC_T"]],"author":""}
diff --git a/keyboards/handwired/2x5keypad/keymaps/default/keymap.c b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c
index 23614a9b78..23614a9b78 100644
--- a/keyboards/handwired/2x5keypad/keymaps/default/keymap.c
+++ b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c
diff --git a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/rules.mk b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/rules.mk
new file mode 100644
index 0000000000..705db8e333
--- /dev/null
+++ b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/rules.mk
@@ -0,0 +1,2 @@
+UNICODE_ENABLE = yes
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/2x5keypad/rules.mk b/keyboards/handwired/2x5keypad/rules.mk
index e62a0f24a8..997c9c0e98 100644
--- a/keyboards/handwired/2x5keypad/rules.mk
+++ b/keyboards/handwired/2x5keypad/rules.mk
@@ -23,5 +23,3 @@ NKRO_ENABLE = yes	# USB Nkey Rollover -
 
 RGBLIGHT_ENABLE = no
 SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = yes