From 66f1000a52e8fecc806da1d0896f6f7d2080e0fc Mon Sep 17 00:00:00 2001
From: Robert Akhmerov <zored.box@gmail.com>
Date: Thu, 27 Feb 2020 13:14:56 +0300
Subject: [PATCH] [master] Upgrade QMK

---
 compiler/template/zored_keymap.c         |  6 ------
 config.yaml                              |  1 +
 example/ergodox_ez/keymap.c              |  2 +-
 example/ergodox_ez/rules.mk              |  2 +-
 example/planck/keymap.c                  |  8 +-------
 example/planck/rules.mk                  |  4 +++-
 patches/0000-tap-dance.patch             | 12 ++++++++++++
 patches/0000-top-dir-and-tap-dance.patch | 14 --------------
 vendor/qmk_firmware                      |  2 +-
 9 files changed, 20 insertions(+), 31 deletions(-)
 create mode 100644 patches/0000-tap-dance.patch
 delete mode 100644 patches/0000-top-dir-and-tap-dance.patch

diff --git a/compiler/template/zored_keymap.c b/compiler/template/zored_keymap.c
index b0aba80..515f4af 100644
--- a/compiler/template/zored_keymap.c
+++ b/compiler/template/zored_keymap.c
@@ -286,8 +286,6 @@ enum custom_keycodes {
   DYNAMIC_MACRO_RANGE,
 };
 
-#include "dynamic_macro.h"
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 {{{layers.keys}}}
 };
@@ -341,10 +339,6 @@ void matrix_scan_user(void) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (!process_record_dynamic_macro(keycode, record)) {
-    return false;
-  }
-
   bool complete = false;
 
   switch (keycode) {
diff --git a/config.yaml b/config.yaml
index 4ddd4f6..ab357e8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -194,6 +194,7 @@ keyboards:
         COMBO_ENABLE: 'yes'
         COMMAND_ENABLE: 'no'
         EXTRAKEY_ENABLE: 'yes'
+        DYNAMIC_MACRO_ENABLE: 'yes'
         NKRO_ENABLE: 'yes'
         KEY_LOCK_ENABLE: 'yes'
         LEADER_ENABLE: 'yes'
diff --git a/example/ergodox_ez/keymap.c b/example/ergodox_ez/keymap.c
index b4a6dec..caff6e3 100644
--- a/example/ergodox_ez/keymap.c
+++ b/example/ergodox_ez/keymap.c
@@ -1983,7 +1983,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* left-4 */ KC_LGUI,KC_LALT,KC_LCTRL,_______,_______,
 /* left-thumb-0 */ _______,_______,
 /* left-thumb-1 */ _______,
-/* left-thumb-2 */ _______,_______,_______,
+/* left-thumb-2 */ _______,_______,KC_LOCK,
 /* right-0 */ _______,_______,_______,_______,_______,_______,_______,
 /* right-1 */ _______,_______,_______,_______,_______,_______,_______,
 /* right-2 */ _______,_______,_______,_______,KC_SCOLON,KC_QUOT,
diff --git a/example/ergodox_ez/rules.mk b/example/ergodox_ez/rules.mk
index c1d0e70..0c09cf9 100644
--- a/example/ergodox_ez/rules.mk
+++ b/example/ergodox_ez/rules.mk
@@ -11,7 +11,7 @@ EXTRAKEY_ENABLE = yes
 
 NKRO_ENABLE = yes
 
-KEY_LOCK_ENABLE = no
+KEY_LOCK_ENABLE = yes
 
 LEADER_ENABLE = yes
 
diff --git a/example/planck/keymap.c b/example/planck/keymap.c
index 845c530..bd68ddc 100644
--- a/example/planck/keymap.c
+++ b/example/planck/keymap.c
@@ -1951,8 +1951,6 @@ enum custom_keycodes {
   DYNAMIC_MACRO_RANGE,
 };
 
-#include "dynamic_macro.h"
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [LAYER_DEFAULT] = LAYOUT_planck_grid(
@@ -2005,7 +2003,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* 0 */ _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_UP,_______,_______,
 /* 1 */ KC_TAB,_______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,
 /* 2 */ KC_LSHIFT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-/* 3 */ KC_LCTRL,KC_LALT,KC_LGUI,_______,_______,_______,_______,_______,KC_RGUI,KC_RALT,KC_RCTRL,_______
+/* 3 */ KC_LCTRL,KC_LALT,KC_LGUI,KC_LOCK,_______,_______,_______,_______,KC_RGUI,KC_RALT,KC_RCTRL,_______
 )
   
 };
@@ -2052,10 +2050,6 @@ void matrix_scan_user(void) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (!process_record_dynamic_macro(keycode, record)) {
-    return false;
-  }
-
   bool complete = false;
 
   switch (keycode) {
diff --git a/example/planck/rules.mk b/example/planck/rules.mk
index 01b8605..61b4a8d 100644
--- a/example/planck/rules.mk
+++ b/example/planck/rules.mk
@@ -9,9 +9,11 @@ COMMAND_ENABLE = no
 
 EXTRAKEY_ENABLE = yes
 
+DYNAMIC_MACRO_ENABLE = yes
+
 NKRO_ENABLE = yes
 
-KEY_LOCK_ENABLE = no
+KEY_LOCK_ENABLE = yes
 
 LEADER_ENABLE = yes
 
diff --git a/patches/0000-tap-dance.patch b/patches/0000-tap-dance.patch
new file mode 100644
index 0000000..8950597
--- /dev/null
+++ b/patches/0000-tap-dance.patch
@@ -0,0 +1,12 @@
+diff --git a/quantum/quantum.c b/quantum/quantum.c
+index 1b5ce3292..d7f24baec 100644
+--- a/quantum/quantum.c
++++ b/quantum/quantum.c
+@@ -194,6 +194,7 @@ bool process_record_quantum(keyrecord_t *record) {
+ 
+ #ifdef TAP_DANCE_ENABLE
+     preprocess_tap_dance(keycode, record);
++    keycode = get_record_keycode(record);
+ #endif
+ 
+     if (!(
diff --git a/patches/0000-top-dir-and-tap-dance.patch b/patches/0000-top-dir-and-tap-dance.patch
deleted file mode 100644
index 5c39432..0000000
--- a/patches/0000-top-dir-and-tap-dance.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-After this fix you can toggle layers in tap dance without dalay.
-
-diff --git a/quantum/quantum.c b/quantum/quantum.c
-index 6530738b7..2b19c74c7 100644
---- a/quantum/quantum.c
-+++ b/quantum/quantum.c
-@@ -245,6 +245,7 @@ bool process_record_quantum(keyrecord_t *record) {
- 
-   #ifdef TAP_DANCE_ENABLE
-     preprocess_tap_dance(keycode, record);
-+    keycode = get_record_keycode(record);
-   #endif
- 
-   if (!(
diff --git a/vendor/qmk_firmware b/vendor/qmk_firmware
index d2ce12d..ae46e6a 160000
--- a/vendor/qmk_firmware
+++ b/vendor/qmk_firmware
@@ -1 +1 @@
-Subproject commit d2ce12d15d2917327b6864809a5b6b5c44d001bd
+Subproject commit ae46e6ace94656ffa3ce12f74022ea62c8786817