Merge remote-tracking branch 'upstream/master'

1 files changed, 24 insertions, 21 deletions

diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c
index 6f9a577f7..a9be5d55c 100644
--- a/keyboards/ergodox_ez/keymaps/skug/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c
@@ -27,6 +27,9 @@
 #define MDIA 2 // media keys
 #define ARRW 3 // arrow + soon mouse
 
+#define SE_LT   SE_LESS
+#define SE_GT   LSFT(SE_LESS)
+
 enum custom_keycodes {
   PLACEHOLDER = SAFE_RANGE, // can always be here
   EPRM,
@@ -38,8 +41,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ½    |   !  |  "   |  #   |  #   |  %   | Ins  |           |  L1  |   &  |  /   |  (   |  )   |  =   |  ?     |
- * |   §    |   1  |  2 @ |  3 £ |  4 $ |  5   |      |           |      |   6  |  7 { |  8 [ |  9 ] |  0 } |  + \   |
+ * |  Esc   |   !  |  "   |  #   |  #   |  %   | Ins  |           |  L1  |   &  |  /   |  (   |  )   |  =   |  ?     |
+ * |        |   1  |  2 @ |  3 £ |  4 $ |  5   |      |           |      |   6  |  7 { |  8 [ |  9 ] |  0 } |  + \   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |  Tab   |   Q  |   W  |   E  |   R  |   T  |  L2  |           |  L2  |   Y  |   U  |   I  |   O  |   P  |   Å    |
  * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
@@ -66,22 +69,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Otherwise, it needs KC_*
 [BASE] = LAYOUT_ergodox_80(  // layer 0 : default
     // left hand
-    NO_HALF,          KC_1,           KC_2,          KC_3,    KC_4,    KC_5,   KC_INS,
+    KC_ESC,           KC_1,           KC_2,          KC_3,    KC_4,    KC_5,   KC_INS,
     KC_TAB,           KC_Q,           KC_W,          KC_E,    KC_R,    KC_T,   TG(SYMB),
     MO(ARRW),         KC_A,           KC_S,          KC_D,    KC_F,    KC_G,
     KC_LSPO,          CTL_T(KC_Z),    KC_X,          KC_C,    KC_V,    KC_B,   KC_WBAK,
-    CTL_T(NO_APOS),   NO_ACUT,        KC_LALT,       KC_BSPC, KC_SPC,
-                                                                             NO_LESS,   KC_END,
+    CTL_T(SE_APOS),   SE_ACUT,        KC_LALT,       KC_BSPC, KC_SPC,
+                                                                             SE_LESS,   KC_END,
                                                               KC_LEFT,      KC_RIGHT,  KC_PGDN,
                                                         CTL_T(KC_ENT), ALT_T(KC_ESC),  KC_LGUI,
 
     // right hand
-         TO(ARRW),       KC_6,   KC_7,   KC_8,    KC_9,    KC_0,              NO_PLUS,
-         TG(SYMB),       KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              NO_AA,
-                         KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, NO_OSLH), LT(SYMB, NO_AE),
-         KC_WFWD,        KC_N,   KC_M,   KC_COMM, KC_DOT,  NO_MINS,           KC_RSPC,
-                                 KC_SPC, KC_BSPC, KC_ALGR, NO_ASTR,           CTL_T(NO_TILD),
-        KC_HOME,  NO_CIRC,
+         TO(ARRW),       KC_6,   KC_7,   KC_8,    KC_9,    KC_0,              SE_PLUS,
+         TG(SYMB),       KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              SE_AA,
+                         KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, SE_OSLH), LT(SYMB, SE_AE),
+         KC_WFWD,        KC_N,   KC_M,   KC_COMM, KC_DOT,  SE_MINS,           KC_RSPC,
+                                 KC_SPC, KC_BSPC, KC_ALGR, SE_ASTR,           CTL_T(SE_TILD),
+        KC_HOME,  SE_CIRC,
         KC_PGUP,  KC_UP,         KC_DOWN,
         KC_LGUI,  ALT_T(KC_ESC), CTL_T(KC_ENT)
 ),
@@ -96,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   -  |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   |      |      |      |   <  |   >  |                                       |      |    . |   0  |   =  |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
@@ -110,19 +113,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = LAYOUT_ergodox_80(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  _______,
-       _______,KC_EXLM,NO_AT,  NO_LCBR,NO_RCBR,NO_PIPE,_______,
-       _______,KC_HASH,NO_DLR, NO_LPRN,NO_RPRN,NO_GRV,
-       _______,KC_PERC,NO_CIRC,NO_LBRC,NO_RBRC,NO_TILD,_______,
-          EPRM,_______,_______,_______,_______,
+       _______,KC_EXLM,SE_AT,  SE_LCBR,SE_RCBR,SE_PIPE,_______,
+       _______,KC_HASH,SE_DLR, SE_LPRN,SE_RPRN,SE_GRV,
+       _______,KC_PERC,SE_CIRC,SE_LBRC,SE_RBRC,SE_TILD,_______,
+          EPRM, _______, _______, SE_LT  , SE_GT,
                                        _______,_______,
                                _______,_______,_______,
                                _______,_______,_______,
        // right hand
        _______, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       _______, KC_UP,   KC_7,   KC_8,    KC_9,    NO_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    NO_PLUS, _______,
-       _______, NO_AMPR, KC_1,   KC_2,    KC_3,    NO_MINS, _______,
-                         _______,KC_DOT,  KC_0,    NO_EQL,  _______,
+       _______, KC_UP,   KC_7,   KC_8,    KC_9,    SE_ASTR, KC_F12,
+                KC_DOWN, KC_4,   KC_5,    KC_6,    SE_PLUS, _______,
+       _______, SE_AMPR, KC_1,   KC_2,    KC_3,    SE_MINS, _______,
+                         _______,KC_DOT,  KC_0,    SE_EQL,  _______,
        _______, _______,
        _______, _______, _______,
        _______, _______, _______
@@ -171,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
  // Keymap: Ducky Style arrows
 [ARRW] = LAYOUT_ergodox_80(
-        _______, _______, _______, _______, _______, _______, _______,
+        SE_HALF, _______, _______, _______, _______, _______, _______,
         _______, _______, KC_UP  , _______, _______, _______, _______,
         _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,