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

no idea what is merged

49 files changed, 3141 insertions, 1278 deletions

diff --git a/Makefile b/Makefile
index 053c8532af..693edc9f06 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,11 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
 	SRC += $(QUANTUM_DIR)/audio/luts.c
 endif
 
+ifeq ($(strip $(UCIS_ENABLE)), yes)
+	OPT_DEFS += -DUCIS_ENABLE
+	UNICODE_ENABLE = yes
+endif
+
 ifeq ($(strip $(UNICODE_ENABLE)), yes)
     OPT_DEFS += -DUNICODE_ENABLE
 	SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c
@@ -273,4 +278,4 @@ BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
 OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
 
 $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(QUANTUM_PATH)/version.h)
-$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h)
\ No newline at end of file
+$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h)
diff --git a/keyboards/atreus/Makefile b/keyboards/atreus/Makefile
index 95ee1d4d7b..5894d231f9 100644
--- a/keyboards/atreus/Makefile
+++ b/keyboards/atreus/Makefile
@@ -2,11 +2,11 @@
 
 ifdef TEENSY2
     OPT_DEFS += -DATREUS_TEENSY2
-    ATRUES_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
+    ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
 else
     OPT_DEFS += -DATREUS_ASTAR
     OPT_DEFS += -DCATERINA_BOOTLOADER
-    ATRUES_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
+    ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
                             avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
 endif
 
@@ -84,5 +84,5 @@ endif
 USB ?= /dev/cu.usbmodem1411
 
 upload: build
-	$(ATRUES_UPLOAD_COMMAND)
-	
\ No newline at end of file
+	$(ATREUS_UPLOAD_COMMAND)
+	
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 447fbcf10f..b418cc9b5e 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -46,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_L1] = { /* LAYER 1 */
     {KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0   },
     {KC_TAB,  KC_INS,  KC_UP,   KC_DEL,  KC_HOME, KC_NO,   KC_PGUP, KC_MUTE, KC_VOLD, KC_VOLU, KC_EQL },
-    {KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS},
+    {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS},
     {KC_TRNS, KC_GRV,  KC_LGUI, KC_TRNS, KC_DEL,  KC_LALT, KC_SPC,  KC_TRNS, KC_LBRC, KC_RBRC, KC_ENT }
   },
   [_L2] = { /* LAYER 2 */
     {KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_NO,   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN},
-    {KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 },
-    {KC_TRNS, KC_TRNS, DVORAK,  QWERTY,  COLEMAK, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11,  KC_F12 },
-    {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, RESET  }
+    {KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,   KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_PLUS},
+    {KC_TRNS, KC_TRNS, DVORAK,  QWERTY,  COLEMAK, KC_LCTL, KC_TRNS, KC_F9,   KC_F10,  KC_F11,  KC_F12 },
+    {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC,  KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET}
   }
 };
 
diff --git a/keyboards/ergodox/keymaps/algernon/Makefile b/keyboards/ergodox/keymaps/algernon/Makefile
index 6bf3976b9d..00194857ac 100644
--- a/keyboards/ergodox/keymaps/algernon/Makefile
+++ b/keyboards/ergodox/keymaps/algernon/Makefile
@@ -8,10 +8,17 @@ CONSOLE_ENABLE = no
 TAP_DANCE_ENABLE = yes
 KEYLOGGER_ENABLE ?= yes
 
+ADORE_AUTOLOG ?= no
+
 ifeq (${FORCE_NKRO},yes)
 OPT_DEFS += -DFORCE_NKRO
 endif
 
+ifeq (${ADORE_AUTOLOG},yes)
+KEYLOGGER_ENABLE = yes
+OPT_DEFS += -DADORE_AUTOLOG
+endif
+
 ifeq (${KEYLOGGER_ENABLE},yes)
 OPT_DEFS += -DKEYLOGGER_ENABLE
 CONSOLE_ENABLE = yes
diff --git a/keyboards/ergodox/keymaps/algernon/images/adore-layer.png b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
index 3df68ea53d..44ad8a1eb7 100644
--- a/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
diff --git a/keyboards/ergodox/keymaps/algernon/images/base-layer.png b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
index 7b25a05b3a..da159fbe2e 100644
--- a/keyboards/ergodox/keymaps/algernon/images/base-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
diff --git a/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png b/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
deleted file mode 100644
index 698d11e5f2..0000000000
--- a/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
+++ /dev/null
diff --git a/keyboards/ergodox/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
index c4de53da27..244bfb51fe 100644
--- a/keyboards/ergodox/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
@@ -1,1218 +1,1206 @@
-/*

- * algernon's ErgoDox EZ layout, please see the readme.md file!

- */

-

-#include "ergodox.h"

-#include "led.h"

-#include "debug.h"

-#include "action_layer.h"

-#include "action_util.h"

-#include "mousekey.h"

-#include "timer.h"

-#include "keymap_plover.h"

-#include "eeconfig.h"

-#include "wait.h"

+/*
+ * algernon's ErgoDox EZ layout, please see the readme.md file!
+ */
+
+#include "ergodox.h"
+#include "led.h"
+#include "debug.h"
+#include "action_layer.h"
+#include "action_util.h"
+#include "mousekey.h"
+#include "timer.h"
+#include "keymap_plover.h"
+#include "eeconfig.h"
+#include "wait.h"
 #include "version.h"
-

-/* Layers */

-

-enum {

-  BASE = 0,

-  ADORE,

-  ARRW,

-  APPSEL,

-  HUN,

-  NMDIA,

-  OHLFT,

-  OHRGT,

-  PLVR,

-};

-

-/* Macros */

-

-enum {

-  NONE = 0,

-  // Buttons that do extra stuff

-  A_GUI,

-  A_PLVR,

-  A_ESC,

-  A_MPN,

-

-  // Function / number keys

-  KF_1, // 1, F1

-  KF_2, // 2, F2

-  KF_3, // ...

-  KF_4,

-  KF_5,

-  KF_6,

-  KF_7,

-  KF_8,

-  KF_9,

-  KF_10,

-  KF_11, // =, F11

-

-  // Application select keys

-  APP_SLK, // Slack

-  APP_EMCS, // Emacs

-  APP_TERM, // Terminal

-  APP_CHRM, // Chrome

-  APP_MSIC, // Music

-

-  // Diagonal mouse movement

-  A_MUL,

-  A_MUR,

-  A_MDL,

-  A_MDR,

-

-  // Hungarian layer keys

-  HU_AA, // Á

-  HU_OO, // Ó

-  HU_EE, // É

-  HU_UU, // Ú

-  HU_II, // Í

-  HU_OE, // Ö

-  HU_UE, // Ü

-  HU_OEE, // Ő

-  HU_UEE, // Ű

-

-  // One-handed layout specials

-  OH_BSSPC,

-  OH_ENTSFT,

-  OH_BASE,

-  OH_LEFT,

-  OH_RIGHT,

-};

-

-/* Fn keys */

-

-enum {

-  F_BSE = 0,

-  F_HUN,

-  F_GUI,

-  F_SFT,

-  F_ALT,

-  F_CTRL

-};

-

-/* Custom keycodes */

-

-enum {

-  CT_CLN = 0,

-  CT_MNS,

-  CT_TA,

-};

-

-/* States & timers */

-

-uint16_t gui_timer = 0;

-

-uint16_t kf_timers[12];

-

-uint16_t oh_base_timer = 0;

-uint16_t oh_bsspc_timer = 0;

-uint16_t oh_entsft_timer = 0;

-

-#define OH_BLINK_INTERVAL 500

-

-uint8_t oh_left_blink = 0;

-uint16_t oh_left_blink_timer = 0;

-uint8_t oh_right_blink = 0;

-uint16_t oh_right_blink_timer = 0;

-

-#if KEYLOGGER_ENABLE

-bool log_enable = false;

-#endif

-

-bool time_travel = false;

-

-/* The Keymap */

-

-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-

-/* Keymap 0: Base Layer

- *

- * ,-----------------------------------------------------.           ,-----------------------------------------------------.

- * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr |           | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10|       F11 |

- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

- * | Next/Prev |   '  |   ,  |   .  |   P  |   Y  |   [  |           |  ]   |   F  |   G  |   C  |   R  |  L   | \         |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * | Tab/ARROW |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |  S   | = / Arrow |

- * |-----------+------+------+------+------+------|   (  |           |  )   |------+------+------+------+------+-----------|

- * | Play/Pause|   /  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |  Z   |      Stop |

- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

- *     |       |      |      |      |   :  |                                       |   -  |      |      |      |       |

- *     `-----------------------------------'                                       `-----------------------------------'

- *                                         ,-------------.           ,-------------.

- *                                         | LAlt | GUI  |           | MDIA | 1HND |

- *                                  ,------|------|------|           |------+------+------.

- *                                  |      |      | Ctrl |           | LEAD |      |      |

- *                                  |Backsp|LShift|------|           |------| Enter| Space|

- *                                  |      |      | ESC  |           | HUN  |      |      |

- *                                  `--------------------'           `--------------------'

- */

-[BASE] = KEYMAP(

-// left hand

- KC_GRV             ,M(KF_1)     ,M(KF_2)     ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)

-,M(A_MPN)           ,KC_QUOT     ,KC_COMM     ,KC_DOT ,KC_P   ,KC_Y   ,KC_LBRC

-,TD(CT_TA)          ,KC_A        ,KC_O        ,KC_E   ,KC_U   ,KC_I

-,KC_MPLY            ,KC_SLSH     ,KC_Q        ,KC_J   ,KC_K   ,KC_X   ,KC_LPRN

-,KC_NO              ,KC_NO       ,KC_NO       ,KC_NO  ,TD(CT_CLN)

-

-                                                            ,F(F_ALT),F(F_GUI)

-                                                                     ,F(F_CTRL)

-                                                    ,KC_BSPC,F(F_SFT),M(A_ESC)

-

-                                                                // right hand

-                                                               ,KC_APP    ,M(KF_6),M(KF_7)   ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11

-                                                               ,KC_RBRC   ,KC_F   ,KC_G      ,KC_C   ,KC_R    ,KC_L     ,KC_BSLS

-                                                                          ,KC_D   ,KC_H      ,KC_T   ,KC_N    ,KC_S     ,KC_EQL

-                                                               ,KC_RPRN   ,KC_B   ,KC_M      ,KC_W   ,KC_V    ,KC_Z     ,KC_MSTP

-                                                                                  ,TD(CT_MNS),KC_NO  ,KC_NO   ,KC_NO    ,KC_NO

-

-                                                               ,OSL(NMDIA),M(OH_LEFT)

-                                                               ,KC_LEAD

-                                                               ,F(F_HUN)  ,KC_ENT ,KC_SPC

-    ),

-

-/* Keymap 1: Adore layer

- *

- * ,-----------------------------------------------------.           ,-----------------------------------------------------.

- * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr |           | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10|       F11 |

- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

- * | Next/Prev |   ,  |   .  |   L  |   W  |   M  |   [  |           |  ]   |   F  |   H  |   C  |   P  |  Y   | \         |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * | Tab/Arrow |   A  |   O  |   E  |   I  |   U  |------|           |------|   D  |   R  |   T  |   N  |  S   | = / Arrow |

- * |-----------+------+------+------+------+------|   (  |           |  )   |------+------+------+------+------+-----------|

- * | Play/Pause|   /  |   Z  |   '  |   K  |   X  |      |           |      |   B  |   G  |   V  |   J  |  Q   |      Stop |

- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

- *     |       |      |      |      |   :  |                                       |   -  |      |      |      |       |

- *     `-----------------------------------'                                       `-----------------------------------'

- *                                         ,-------------.           ,-------------.

- *                                         | LAlt | GUI  |           | MDIA | 1HND |

- *                                  ,------|------|------|           |------+------+------.

- *                                  |      |      | Ctrl |           | LEAD |      |      |

- *                                  |Backsp|LShift|------|           |------| Enter| Space|

- *                                  |      |      | ESC  |           | HUN  |      |      |

- *                                  `--------------------'           `--------------------'

- */

-[ADORE] = KEYMAP(

-// left hand

- KC_GRV             ,M(KF_1)     ,M(KF_2)     ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)

-,M(A_MPN)           ,KC_COMM     ,KC_DOT      ,KC_L   ,KC_W   ,KC_M   ,KC_LBRC

-,TD(CT_TA)          ,KC_A        ,KC_O        ,KC_E   ,KC_I   ,KC_U

-,KC_MPLY            ,KC_SLSH     ,KC_Z        ,KC_QUOT,KC_K   ,KC_X   ,KC_LPRN

-,KC_NO              ,KC_NO       ,KC_NO       ,KC_NO  ,TD(CT_CLN)

-

-                                                            ,F(F_ALT),F(F_GUI)

-                                                                     ,F(F_CTRL)

-                                                    ,KC_BSPC,F(F_SFT),M(A_ESC)

-

-                                                                // right hand

-                                                               ,KC_APP    ,M(KF_6),M(KF_7)   ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11

-                                                               ,KC_RBRC   ,KC_F   ,KC_H      ,KC_C   ,KC_P    ,KC_Y     ,KC_BSLS

-                                                                          ,KC_D   ,KC_R      ,KC_T   ,KC_N    ,KC_S     ,KC_EQL

-                                                               ,KC_RPRN   ,KC_B   ,KC_G      ,KC_V   ,KC_J    ,KC_Q     ,KC_MSTP

-                                                                                  ,TD(CT_MNS),KC_NO  ,KC_NO   ,KC_NO    ,KC_NO

-

-                                                               ,OSL(NMDIA),M(OH_LEFT)

-                                                               ,KC_LEAD

-                                                               ,F(F_HUN)  ,KC_ENT ,KC_SPC

-    ),

-

-/* Keymap 2: Arrow layer

- *

- * ,-----------------------------------------------------.           ,-----------------------------------------------------.

- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

- * |           |      |      |      |      |      |      |           |      |      | Home |  Up  |  End |      |           |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * |           |      |      |      |      |      |------|           |------|      | Left | Down | Rght |      |           |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

- *      |      |      |      |      |      |                                       |      |      |      |      |      |

- *      `----------------------------------'                                       `----------------------------------'

- *                                         ,-------------.           ,-------------.

- *                                         |      |      |           |      |      |

- *                                  ,------|------|------|           |------+------+------.

- *                                  |      |      |      |           |      |      |      |

- *                                  |      |      |------|           |------| PgUp | PgDn |

- *                                  |      |      |      |           |      |      |      |

- *                                  `--------------------'           `--------------------'

- */

-

-[ARRW] = KEYMAP(

-// left hand

- KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS

-

-                                             ,KC_TRNS ,KC_TRNS

-                                                      ,KC_TRNS

-                                    ,KC_TRNS ,KC_TRNS ,KC_TRNS

-

-                                                                // right hand

-                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-                                                               ,KC_TRNS ,KC_TRNS ,KC_HOME ,KC_UP   ,KC_END  ,KC_TRNS ,KC_TRNS

-                                                                        ,KC_TRNS ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_TRNS ,KC_TRNS

-                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-

-                                                               ,KC_TRNS ,KC_TRNS

-                                                               ,KC_TRNS

-                                                               ,KC_TRNS ,KC_PGUP ,KC_PGDN

-    ),

-

-/* Keymap 3: Application select layer

- *

- * ,-----------------------------------------------------.           ,-----------------------------------------------------.

- * |           |Music |Slack |Emacs |Term  |Chrome|      |           |      |      |      |      |      |      |           |

- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

- *      |      |      |      |      |      |                                       |      |      |      |      |      |

- *      `----------------------------------'                                       `----------------------------------'

- *                                         ,-------------.           ,-------------.

- *                                         |      |      |           |      |      |

- *                                  ,------|------|------|           |------+------+------.

- *                                  |      |      |      |           |      |      |      |

- *                                  |      |      |------|           |------|      |      |

- *                                  |      |      |      |           |      |      |      |

- *                                  `--------------------'           `--------------------'

- */

-

-[APPSEL] = KEYMAP(

-// left hand

- KC_TRNS ,M(APP_MSIC),M(APP_SLK),M(APP_EMCS),M(APP_TERM),M(APP_CHRM),KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS

-

-                                             ,KC_TRNS ,KC_TRNS

-                                                      ,KC_TRNS

-                                    ,KC_TRNS ,KC_TRNS ,KC_TRNS

-

-                                                                // right hand

-                                                               ,KC_TRNS ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_TRNS

-                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-                                                                        ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

-

-                                                               ,KC_TRNS ,KC_TRNS

-                                                               ,KC_TRNS

-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS

-    ),

-

-

-/* Keymap 4: Hungarian Layer

- *

- * ,-----------------------------------------------------.           ,-----------------------------------------------------.

- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

- * |           |      |  Ő   |      |  Ű   |      |      |           |      |      |      |      |      |      |           |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * |           |   Á  |  Ó   |  É   |  Ú   |  Í   |------|           |------|      |      |      |      |      |           |

- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

- * |           |      |  Ö   |      |  Ü   |      |      |           |      |      |      |      |      |      |           |

- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

- *      |      |      |      |      |      |                                       |      |      |      |      |      |

- *      `----------------------------------'                                       `----------------------------------'

- *                                         ,-------------.           ,-------------.

- *                                         |      |      |           |      |      |

- *                                  ,------|------|------|           |------+------+------.

- *                                  |      |      |      |           |      |      |      |

- *                                  |      |      |------|           |------|      |      |

- *                                  |      |      |      |           | BASE |      |      |

- *                                  `--------------------'           `--------------------'

- */

-

-[HUN] = KEYMAP(

-// left hand

- KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO

-,KC_NO   ,KC_NO   ,M(HU_OEE),KC_NO   ,M(HU_UEE),KC_NO   ,KC_NO

-,KC_NO   ,M(HU_AA),M(HU_OO) ,M(HU_EE),M(HU_UU) ,M(HU_II)

-,KC_NO   ,KC_NO   ,M(HU_OE) ,KC_NO   ,M(HU_UE) ,KC_NO   ,KC_NO

-,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO

-

-                                             ,KC_NO   ,KC_NO

-                                                      ,KC_NO

-                                    ,KC_NO   ,KC_TRNS ,KC_TRNS

-

-                                                                // right hand

-                                                               ,KC_TRNS ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

-                                                               ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

-                                                                        ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

-                                                               ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

-                                                                                 ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

-

-                                                               ,KC_NO   ,KC_NO

-                                                               ,KC_NO

-                                                               ,F(F_BSE),KC_TRNS  ,KC_TRNS

-    ),

-

-/* Keymap 5: Navigation & Media layer

- *

- * ,-----------------------------------------------------.           ,-----------------------------------------------------.

- * | MS Slow   |      |      |      |      |      |ScrLCK|           |ScrLCK|      |      |      |      |      |           |

- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

- * | MS Normal |      | Home |  Up  | PgUp |      |      |           |Scroll|      |MsUpL | MsUp |MsUpR |      |PrintScreen|

- * |-----------+------+------+------+------+------|      |           |  Up  |------+------+------+------+------+-----------|

- * | MS Fast   |      | Left | Down | Right|      |------|           |------|      |MsLeft| MsDn |MsRght|      |           |

- * |-----------+------+------+------+------+------|      |           |Scroll|------+------+------+------+------+-----------|

- * | Play/Pause|      | End  | Down | PgDn |      |      |           | Down |      |MsDnL | MsDn |MsDnR |      |      Stop |

- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'