Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 8 insertions, 0 deletions

diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/custom_keycodes.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/custom_keycodes.c
new file mode 100644
index 000000000..368062172
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/custom_keycodes.c
@@ -0,0 +1,8 @@
+// Define custom user keycodes:
+enum custom_keycodes {
+    PLACEHOLDER = SAFE_RANGE,  // Can always be here.
+    RGB_GREEN,                 // To set default RGB layer as green once.
+    MY_CUSTOM_MACRO,           // Custom macro example.
+    MY_OTHER_MACRO,            // Custom macro example.
+    DYNAMIC_MACRO_RANGE        // Should always be the last.
+};