some improvements to KC_MINS position and its use on PTH layer

renzmann · Feb 8, 2022 · cf5c6c5 · cf5c6c5
1 parent e708cdd
commit cf5c6c5
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/keyboards/planck/keymaps/renzmann/keymap.c b/keyboards/planck/keymaps/renzmann/keymap.c
@@ -3,26 +3,28 @@
 /* Keep everything within 7 characters' width */
 #define ALT_DWN MT(MOD_LALT, KC_DOWN)
 #define CTL_LFT MT(MOD_LCTL, KC_LEFT)
+#define CTL_MNS MT(MOD_LCTL, KC_MINS)
 #define CTL_TAB MT(MOD_LCTL, KC_TAB)
 #define C_INS   C(KC_INS)
 #define FN_BSPC LT(FN, KC_BSPC)
 #define GUI_UP  MT(MOD_LGUI, KC_UP)
-#define NAV_RGT LT(NAV, KC_RGHT)
+#define NAV_RGT LT(NAV, KC_RIGHT)
 #define NUM_SPC LT(NUM, KC_SPC)
 #define OSM_ALT OSM(MOD_LALT)
 #define OSM_GUI OSM(MOD_LGUI)
-#define PTH_ESC LT(PTH, KC_ESC)
-#define SFT_ENT LT(LSFT, KC_ENT)
+#define PTH_ESC LT(PTH, KC_ESCAPE)
+#define SFT_ENT LT(LSFT, KC_ENTER)
 #define S_DOWN  S(KC_DOWN)
-#define S_ESC   S(KC_ESC)
-#define S_INS   S(KC_INS)
+#define S_ENT   S(KC_ENTER)
+#define S_ESC   S(KC_ESCAPE)
+#define S_INS   S(KC_INSERT)
 #define S_LEFT  S(KC_LEFT)
 #define S_RGHT  S(KC_RIGHT)
 #define S_TAB   S(KC_TAB)
 #define S_UP    S(KC_UP)
 #define __DWN__ KC_TRNS
 
-enum renzmann_layers { DEFAULT, LSFT, RSFT, NUM, PTH, FN, NAV, DEL, ADJ };
+enum renzmann_layers { DEFAULT, PTH, LSFT, RSFT, NUM, FN, NAV, DEL, ADJ };
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -35,28 +37,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MO(DEL), OSM_GUI, OSM_ALT, CTL_TAB, SFT_ENT, PTH_ESC, FN_BSPC, NUM_SPC, CTL_LFT, ALT_DWN, GUI_UP,  NAV_RGT
     ),
 
+    [PTH] = LAYOUT_ortho_4x12(
+     /* LITTLE   RING     MIDDLE   INDEX    THUMB    STRETCH  STRETCH  THUMB    INDEX    MIDDLE   RING     LITTLE */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TILD, KC_SLSH, KC_DOT,
+        _______, _______, _______, _______, _______, __DWN__, KC_COLN, KC_MINS, _______, _______, _______, _______
+    ),
+
     [LSFT] = LAYOUT_ortho_4x12(
      /* LITTLE   RING     MIDDLE   INDEX    THUMB    STRETCH  STRETCH  THUMB    INDEX    MIDDLE   RING     LITTLE */
         S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_LCBR, KC_RCBR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
         S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), _______, _______, S(KC_H), S(KC_J), S(KC_K), S(KC_L), KC_COLN,
         S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), C_INS,   S_INS,   S(KC_N), S(KC_M), KC_SLSH, KC_QUES, KC_DQT,
-        _______, _______, _______, _______, __DWN__, _______, KC_DEL,  KC_UNDS, _______, _______, _______, _______
+        _______, _______, _______, _______, __DWN__, _______, KC_DEL,  KC_UNDS, CTL_MNS, _______, _______, _______
     ),
 
     [NUM] = LAYOUT_ortho_4x12(
      /* LITTLE   RING     MIDDLE   INDEX    THUMB    STRETCH  STRETCH  THUMB    INDEX    MIDDLE   RING     LITTLE */
         KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQL,  KC_PLUS,
         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
         KC_BSLS, KC_PIPE, KC_TILD, KC_GRV,  KC_LCBR, _______, _______, KC_RCBR, KC_MINS, KC_LT,   KC_GT,   KC_DQT,
-        _______, _______, _______, S_TAB,   KC_SPC,  _______, _______, __DWN__, _______, _______, _______, _______
-    ),
-
-    [PTH] = LAYOUT_ortho_4x12(
-     /* LITTLE   RING     MIDDLE   INDEX    THUMB    STRETCH  STRETCH  THUMB    INDEX    MIDDLE   RING     LITTLE */
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_MINS, KC_EQL,  KC_PLUS,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_TILD, KC_SLSH, KC_DOT,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_UNDS, _______, _______,
-        _______, _______, _______, _______, _______, __DWN__, _______, KC_SPC,  _______, _______, _______, _______
+        _______, _______, _______, S_TAB,   S_ENT,   _______, _______, __DWN__, _______, _______, _______, _______
     ),
 
     [FN] = LAYOUT_ortho_4x12(
@@ -77,9 +79,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [DEL] = LAYOUT_ortho_4x12(
      /* LITTLE   RING     MIDDLE   INDEX    THUMB    STRETCH  STRETCH  THUMB    INDEX    MIDDLE   RING     LITTLE */
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_EQL,  KC_PLUS,
         _______, _______, KC_DEL,  _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, _______,
-        _______, _______, _______, KC_BSPC, _______, _______, _______, _______, KC_DEL,  KC_DEL,  _______, _______,
+        _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_DEL,  KC_DEL,  _______, _______,
         __DWN__, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(ADJ)
     ),