summaryrefslogtreecommitdiff
path: root/4x5
diff options
context:
space:
mode:
authortslil clingman <>2020-09-01 16:40:27 -0400
committertslil clingman <>2020-09-01 16:45:21 -0400
commit57d70c986cc9b6c4238befabecded0397944b5a6 (patch)
treeac05ca71f80ea8f7b080210e2017954a75bbef04 /4x5
parentc11f259ee377698b52426a73bb4aebd492c7e35a (diff)
Built a mini version, changes accordingly
Diffstat (limited to '4x5')
-rw-r--r--4x5/4x5.h50
-rw-r--r--4x5/keymaps/colemak_mod_dh/keymap.c99
2 files changed, 68 insertions, 81 deletions
diff --git a/4x5/4x5.h b/4x5/4x5.h
index 99e6e7e..376c4fe 100644
--- a/4x5/4x5.h
+++ b/4x5/4x5.h
@@ -18,22 +18,21 @@
L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
L31, L32, R31, R30, \
- L33, L34, R33, R32, \
- L43, L44, R43, R42, \
- L41, L42, R41, R40 \
+ L33, L34, L43, R42, R33, R32, \
+ L41, L42, R41, R40 \
) \
{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { KC_NO, L31, L32, L33, L34 }, \
- { KC_NO, L41, L42, L43, L44 }, \
+ { L00, L01, L02, L03, L04 }, \
+ { L10, L11, L12, L13, L14 }, \
+ { L20, L21, L22, L23, L24 }, \
+ { KC_NO, L31, L32, L33, L34 }, \
+ { KC_NO, L41, L42, L43, KC_NO }, \
\
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { R33, R32, R31, R30, KC_NO }, \
- { R43, R42, R41, R40, KC_NO } \
+ { R04, R03, R02, R01, R00 }, \
+ { R14, R13, R12, R11, R10 }, \
+ { R24, R23, R22, R21, R20 }, \
+ { R33, R32, R31, R30, KC_NO }, \
+ { KC_NO, R42, R41, R40, KC_NO } \
}
#else
@@ -44,22 +43,21 @@
L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
L31, L32, R31, R30, \
- L33, L34, R33, R32, \
- L43, L44, R43, R42, \
- L41, L42, R41, R40 \
+ L33, L34, L43, R42, R33, R32, \
+ L41, L42, R41, R40 \
) \
{ \
- { R04, R03, R02, R01, R00 }, \
- { R14, R13, R12, R11, R10 }, \
- { R24, R23, R22, R21, R20 }, \
- { R33, R32, R31, R30, KC_NO }, \
- { R43, R42, R41, R40, KC_NO } \
+ { R04, R03, R02, R01, R00 }, \
+ { R14, R13, R12, R11, R10 }, \
+ { R24, R23, R22, R21, R20 }, \
+ { R33, R32, R31, R30, KC_NO }, \
+ { KC_NO, R42, R41, R40, KC_NO }, \
\
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { KC_NO, L31, L32, L33, L34 }, \
- { KC_NO, L41, L42, L43, L44 } \
+ { L00, L01, L02, L03, L04 }, \
+ { L10, L11, L12, L13, L14 }, \
+ { L20, L21, L22, L23, L24 }, \
+ { KC_NO, L31, L32, L33, L34 }, \
+ { KC_NO, L41, L42, L43, KC_NO } \
\
}
#endif
diff --git a/4x5/keymaps/colemak_mod_dh/keymap.c b/4x5/keymaps/colemak_mod_dh/keymap.c
index 31f1790..93a9cbb 100644
--- a/4x5/keymaps/colemak_mod_dh/keymap.c
+++ b/4x5/keymaps/colemak_mod_dh/keymap.c
@@ -9,9 +9,9 @@
#define ____ KC_TRNS
-#define SFT_ESC SFT_T(KC_ESC)
+#define RAI_ESC LT(_RAISE,KC_ESC)
+#define LOW_ENT LT(_LOWER,KC_ENT)
#define CTL_BSPC CTL_T(KC_BSPC)
-#define SFT_ENT SFT_T(KC_ENT)
#define ALT_SPC ALT_T(KC_SPC)
#define LGUI_TAB LGUI_T(KC_TAB)
@@ -36,26 +36,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
* |------+------+------+-------------, ,-------------+------+------+------,
* | | RESET| | mbtn |mbtn2 |
- * '------+------'-------------' '-------------'------+------'
- * | | | | | |
- * | | | | | |
- * | | | | | |
- * '------+------' '------+------'
- * '------+------' '------+------'
- * | | | | | |
- * '------+------' '------+------'
- * | | | | | |
- * '------+------' '------+------'
+ * '------+------+--------------------' '--------------------+------+------'
+ * | | | | | | | |
+ * | | | | | | | |
+ * | | | | | | | |
+ * '------+------+------| |------+------+------'
+ * | | | | | |
+ * '------+------' '------+------'
*/
[_RAISE] = LAYOUT( \
- ____, KC_PGUP, KC_UP, KC_PGDN, ____, ____, KC_VOLU, KC_MU, KC_VOLD, ____, \
+ ____, KC_PGUP, KC_UP, KC_PGDN, ____, ____, KC_VOLU, KC_MU, KC_VOLD, ____, \
S(KC_INSERT), KC_LEFT, KC_DOWN, KC_RIGHT, KC_F11, KC_F12, KC_ML, KC_MD, KC_MR, KC_MUTE, \
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
____, RESET, KC_MB1, KC_MB2, \
- ____, ____, ____, ____, \
- ____, ____, ____, ____, \
- ____, ____, ____, ____ \
+ ____, ____, ____, ____, ____, ____, \
+ ____, ____, ____, ____ \
),
/* Base
* ,----------------------------------, ,----------------------------------,
@@ -65,58 +61,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------| |------|------+------+------+------|
* | z | x | c | d | v | | m | h | , | . | ' |
* |------+------+------+-------------, ,-------------+------+------+------,
- * | _ | / | | - | \ |
- * '------+------'-------------' '-------------'------+------'
- * | ESC | BKSP | | SPC | RET |
- * | + | + | | + | + |
- * | SHIFT| CTRL | | ALT | SHIFT|
- * '------+------' '------+------'
- * '------+------' '------+------'
- * |LG/Tab| Raise| | Lower|LG/Tab|
- * '------+------' '------+------'
- * | HOME | ~ | | DEL | END |
- * '------+------' '------+------'
+ * | _ | \ | | - | / |
+ * '------+------'--------------------' '--------------------'------+------'
+ * | ESC | BKSP | TAB | | TAB | SPC | RET |
+ * | + | + | + | | + | + | + |
+ * |RAISE | CTRL | LGUI | | LGUI | ALT | LOWER|
+ * '------+------+------| |------+------+------'
+ * | Shift| ` | | ~ | Shift|
+ * '------+------' '------+------'
*/
[_BASE] = LAYOUT( \
- KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \
- KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \
- KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_QUOT, \
- S(KC_MINS), KC_SLSH, KC_MINS, KC_BSLS, \
- SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT, \
- LGUI_TAB,RAISE, LOWER, LGUI_TAB, \
- KC_HOME, KC_GRV, KC_DEL, KC_END
+ KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \
+ KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \
+ KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_QUOT, \
+ S(KC_MINS), KC_BSLS, KC_MINS, KC_SLSH, \
+ RAI_ESC, CTL_BSPC, LGUI_TAB, LGUI_TAB, ALT_SPC, LOW_ENT, \
+ KC_LSFT, KC_GRV, S(KC_GRV), KC_RSFT \
),
/* Lower
* ,----------------------------------, ,----------------------------------,
- * | ! | @ | # | [ | ] | | | 7 | 8 | 9 | - |
+ * | ! | @ | # | { | } | | | 7 | 8 | 9 | + |
* |------+------+------+------+------| |------+------+------+------+------|
- * | & | ^ | $ | ( | ) | | > | 4 | 5 | 6 | * |
+ * | = | ^ | $ | ( | ) | | > | 4 | 5 | 6 | * |
* |------+------+------+------+------| |-------------+------+------+------|
- * | = | % | | | { | } | | < | 1 | 2 | 3 | + |
+ * | & | % | | | [ | ] | | < | 1 | 2 | 3 | - |
* |------+------+------+-------------, ,-------------+------+------+------,
- * | | | | 0 | |
- * '------+------'-------------' '-------------'------+------'
- * | | | | | |
- * | | | | | |
- * | | | | | |
- * '------+------' '------+------'
- * '------+------' '------+------'
- * | | | | | |
- * '------+------' '------+------'
- * | | | | | |
- * '------+------' '------+------'
+ * | | | | 0 | . |
+ * '------+------+--------------------' '--------------------+------+------'
+ * | | | | | | | |
+ * | | | | | | | |
+ * | | | | | | | |
+ * '------+------+------| |------+------+------'
+ * | | | | | |
+ * '------+------' '------+------'
*/
[_LOWER] = LAYOUT( \
- KC_EXLM, KC_AT, KC_HASH, KC_LBRC, KC_RBRC, ____, KC_7, KC_8, KC_9, KC_MINS, \
- KC_AMPR, KC_CIRC, KC_DLR, KC_LPRN, KC_RPRN, S(KC_COMM), KC_4, KC_5, KC_6, KC_ASTR, \
- KC_EQL, KC_PERC, KC_PIPE, S(KC_LBRC), S(KC_RBRC), S(KC_DOT), KC_1, KC_2, KC_3, KC_PLUS, \
- ____, ____, KC_0, ____, \
- ____, ____, ____, ____, \
- ____, ____, ____, ____, \
- ____, ____, ____, ____ \
+ KC_EXLM, KC_AT, KC_HASH, S(KC_LBRC), S(KC_RBRC), ____, KC_7, KC_8, KC_9, KC_PLUS, \
+ KC_EQL, KC_CIRC, KC_DLR, KC_LPRN, KC_RPRN, S(KC_COMM), KC_4, KC_5, KC_6, KC_ASTR, \
+ KC_AMPR, KC_PERC, KC_PIPE, KC_LBRC, KC_RBRC, S(KC_DOT), KC_1, KC_2, KC_3, KC_MINS, \
+ ____, ____, KC_0, KC_DOT, \
+ ____, ____, ____, ____, ____, ____, \
+ ____, ____, ____, ____ \
+
)
};
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-30 22:26:07 +0000