aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjotix <47826561+jotix@users.noreply.github.com>2019-06-29 15:22:34 -0300
committerDrashna Jaelre <drashna@live.com>2019-06-29 11:22:34 -0700
commit8638b7881908cb25a92267a6d1358c29b2bb7fbf (patch)
tree9a9de42f6a83a7af2ede8c2b746a18c145ef19ed
parente4b91cffea3a36799abf8017a8b0c303c53a3d23 (diff)
downloadqmk_firmware-8638b7881908cb25a92267a6d1358c29b2bb7fbf.tar.gz
qmk_firmware-8638b7881908cb25a92267a6d1358c29b2bb7fbf.zip
[Keymap] jotix ortho_4x12 layout match new keycaps (#6209)
* jotix ortho_4x12 layout match new keycaps * Update layouts/community/ortho_4x12/jotix/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update layouts/community/ortho_4x12/jotix/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update layouts/community/ortho_4x12/jotix/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * get off layout_kc * update readme * get off the numpad
-rw-r--r--layouts/community/ortho_4x12/jotix/config.h1
-rw-r--r--layouts/community/ortho_4x12/jotix/keymap.c91
-rw-r--r--layouts/community/ortho_4x12/jotix/readme.md2
3 files changed, 37 insertions, 57 deletions
diff --git a/layouts/community/ortho_4x12/jotix/config.h b/layouts/community/ortho_4x12/jotix/config.h
deleted file mode 100644
index 9ec4fd1a9..000000000
--- a/layouts/community/ortho_4x12/jotix/config.h
+++ /dev/null
@@ -1 +0,0 @@
1#define TAPPING_TOGGLE 2
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index e5f539181..c6655afa5 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -1,15 +1,14 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2 2
3extern keymap_config_t keymap_config;
4
5enum layers { 3enum layers {
6 _QWERTY, 4 _QWERTY,
7 _LOWER, 5 _LOWER,
8 _RAISE, 6 _RAISE,
9}; 7};
10 8
11#define LOWER TT(_LOWER) 9#define LOWER MO(_LOWER)
12#define RAISE TT(_RAISE) 10#define RAISE MO(_RAISE)
11#define TGLOWER TG(_LOWER)
13 12
14static bool is_ctl_pressed; 13static bool is_ctl_pressed;
15static bool is_esc_pressed; 14static bool is_esc_pressed;
@@ -17,65 +16,47 @@ static bool is_bspc_pressed;
17 16
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 18
20/* qwerty 19[_QWERTY] = LAYOUT_ortho_4x12 (
21 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 20// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
22 * | esc | Q | W | E | R | T | Y | U | I | O | P | bspc | 21 KC_ESC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSPC,
23 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 22// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
24 * | tab | A | S | D | F | G | H | J | K | L | ; | ' | 23 KC_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_ENT,
25 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 24// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
26 * | lshift | Z | X | C | V | B | N | M | , | . | / | enter | 25 KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM, KC_DOT, KC_UP, KC_SLSH,
27 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 26// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
28 * | lctrl | lgui | lalt | ralt | lower | space | space | raise | right | down | up | right | 27 KC_LCTL,KC_LGUI,KC_LALT,TGLOWER, LOWER , KC_SPC, KC_SPC, RAISE ,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
29 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 28// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
30 */ 29),
31[_QWERTY] = LAYOUT_ortho_4x12 (
32 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
33 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
34 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
35 KC_LCTL, KC_LGUI, KC_LALT, KC_RALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
36),
37 30
38/* lower
39 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
40 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | |
41 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
42 * | | vol- | mute | vol+ | | | | | | | | |
43 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
44 * | | prev | play | next | | | | | | | | |
45 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
46 * | | | | | | | | | | | | |
47 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
48 */
49[_LOWER] = LAYOUT_ortho_4x12 ( 31[_LOWER] = LAYOUT_ortho_4x12 (
50 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, 32// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
51 _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, 33 KC_GRV, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______,
52 _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, 34// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
53 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 35 _______, KC_F1 , KC_F2 , KC_F3, KC_F4 ,_______,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
36// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
37 _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 ,_______,KC_MINS, KC_EQL,_______,_______,_______,_______,
38// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
39 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
40// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
54), 41),
55 42
56/* raise
57 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
58 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | del |
59 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
60 * | caps | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
61 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
62 * | | F7 | F8 | F9 | F10 | F11 | F12 | _ | + | { | } | | |
63 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
64 * | | | | | | | | | home | pgdn | pgup | end |
65 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
66 */
67[_RAISE] = LAYOUT_ortho_4x12 ( 43[_RAISE] = LAYOUT_ortho_4x12 (
68 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, 44// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
69 KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 45 KC_TILD,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_DEL,
70 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 46// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
71 _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END 47 KC_CAPS, KC_F9 , KC_F10, KC_F11, KC_F12,_______,KC_LCBR,KC_RCBR,KC_PIPE,KC_DQUO,_______,_______,
48// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
49 _______,_______,_______,_______,_______,_______,KC_UNDS,KC_PLUS,KC_HOME,KC_PGUP,KC_VOLU,_______,
50// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
51 _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_VOLD,KC_MUTE
52// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
72), 53),
73 54
74}; 55};
75 56
76uint32_t layer_state_set_user(uint32_t state) { 57uint32_t layer_state_set_user(uint32_t state) {
77 #ifdef JOTANCK_LEDS 58 #ifdef JOTANCK_LEDS
78 switch (biton32(state)) { 59 switch (biton32(state)) {
79 case _LOWER: 60 case _LOWER:
80 writePinHigh(JOTANCK_LED1); 61 writePinHigh(JOTANCK_LED1);
81 writePinLow(JOTANCK_LED2); 62 writePinLow(JOTANCK_LED2);
diff --git a/layouts/community/ortho_4x12/jotix/readme.md b/layouts/community/ortho_4x12/jotix/readme.md
index ed4aa7414..ec1fb7ba9 100644
--- a/layouts/community/ortho_4x12/jotix/readme.md
+++ b/layouts/community/ortho_4x12/jotix/readme.md
@@ -1,6 +1,6 @@
1# Jotix ortho 4x12 keymap 1# Jotix ortho 4x12 keymap
2 2
3![keymap](https://i.imgur.com/ocZCRkN.png) 3![keymap](https://i.imgur.com/CpZCcuy.png)
4 4
5Tested on: 5Tested on:
6 6