summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjotix <47826561+jotix@users.noreply.github.com>2019-09-07 08:05:15 +0000
committerfauxpark <fauxpark@gmail.com>2019-09-07 18:05:14 +1000
commit736bdc7e97ec8f91a3bf36a6ae72d9b6729ab721 (patch)
tree8d13e3f1a7fcc8cbe4ea9ec1ea134b285b65365b
parentfc5fb2fc1598bd07cafb97b35100237506592d9d (diff)
downloadqmk_firmware-736bdc7e97ec8f91a3bf36a6ae72d9b6729ab721.tar.gz
qmk_firmware-736bdc7e97ec8f91a3bf36a6ae72d9b6729ab721.zip
Jotix (#6687)
* jotix ortho_4x12 * add shifted symbols * jotix ortho_4x12 layot
-rw-r--r--layouts/community/ortho_4x12/jotix/keymap.c56
-rw-r--r--layouts/community/ortho_4x12/jotix/readme.md2
-rw-r--r--layouts/community/ortho_4x12/jotix/rules.mk1
-rw-r--r--layouts/community/ortho_4x12/jotix/unicode.c200
4 files changed, 18 insertions, 241 deletions
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index b61cf3e068..1ba235e3a9 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -1,20 +1,16 @@
#include QMK_KEYBOARD_H
-#include "unicode.c"
enum layers {
_QWERTY,
- _FN,
_LOWER,
_RAISE,
- _UNICODE
+ _GAME
};
-#define FN MO(_FN)
#define LOWER MO(_LOWER)
#define RAISE MO(_RAISE)
-#define UNICODE MO(_UNICODE)
#define TGLOWER TG(_LOWER)
-#define TGRAISE TG(_RAISE)
+#define TGGAME TG(_GAME)
static bool is_ctl_pressed;
static bool is_esc_pressed;
@@ -26,33 +22,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
KC_ESC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSPC,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- KC_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_ENT,
+ KC_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM, KC_DOT, KC_UP ,KC_SLSH,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM, KC_DOT,KC_SLSH, KC_ENT,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- KC_LCTL,KC_LGUI,KC_LALT, FN , LOWER , KC_SPC, KC_SPC, RAISE ,UNICODE,KC_LEFT,KC_DOWN,KC_RGHT
+ KC_LCTL,KC_LGUI,KC_LALT,KC_RALT, LOWER , KC_SPC, KC_SPC, RAISE ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
),
-[_FN] = LAYOUT_ortho_4x12 (
-// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
- _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 ,_______,_______,_______,_______,_______,_______,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 ,_______,_______,_______,_______,_______,_______,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______, KC_F9 , KC_F10, KC_F11, KC_F12,_______,_______,_______,_______,_______,KC_PGUP,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,_______,_______,_______,TGLOWER,_______,_______,TGRAISE,_______,KC_HOME,KC_PGDN, KC_END
-// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
-),
-
[_LOWER] = LAYOUT_ortho_4x12 (
// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
- _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______,
+ KC_GRV, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_HOME,KC_PGUP,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
+ _______,KC_VOLD,KC_MUTE,KC_VOLU,_______, TGGAME,_______,_______,_______,_______,_______,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,KC_MPRV,KC_MPLY,KC_MNXT, KC_END,KC_PGDN,KC_MINS, KC_EQL,_______,_______,_______,_______,
+ _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,_______,_______,_______,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
@@ -60,25 +44,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_RAISE] = LAYOUT_ortho_4x12 (
// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
- KC_GRV, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_DEL,
+ KC_TILD,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_DEL,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,_______,_______,_______,_______,_______,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
+ KC_CAPS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,KC_MINS, KC_EQL,KC_LBRC,KC_RBRC,KC_BSLS,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,_______,_______,_______,_______,_______,KC_MINS, KC_EQL,_______,_______,KC_VOLU,_______,
+ _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_VOLD,KC_MUTE
+ _______,_______,_______,_______,TGLOWER,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END
// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
),
-[_UNICODE] = LAYOUT_ortho_4x12 (
+[_GAME] = LAYOUT_ortho_4x12 (
// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
- UN_ESC, UN_Q , UN_W , UN_E , UN_R , UN_T , UN_Y , UN_U , UN_I , UN_O , UN_P ,UN_BSPC,
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- UN_TAB, UN_A , UN_S , UN_D , UN_F , UN_G , UN_H , UN_J , UN_K , UN_L ,UN_SCLN, UN_ENT,
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______, UN_Z , UN_X , UN_C , UN_V , UN_B , UN_N , UN_M ,UN_COMM, UN_DOT, UN_UP ,UN_SLSH,
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_UP ,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- UC_M_LN,UC_M_WI,UC_M_OS,_______,_______,_______,_______,_______,_______,UN_DOWN, UN_UP ,UN_RGHT
+ _______,_______,_______,_______,_______,_______,_______,_______,KC_SLSH,KC_LEFT,KC_DOWN,KC_RGHT
// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
),
@@ -95,7 +79,7 @@ uint32_t layer_state_set_user(uint32_t state) {
writePinLow(JOTANCK_LED1);
writePinHigh(JOTANCK_LED2);
break;
- case _FN:
+ case _GAME:
writePinHigh(JOTANCK_LED1);
writePinHigh(JOTANCK_LED2);
break;
@@ -116,10 +100,6 @@ void led_set_user(uint8_t usb_led) {
}
*/
-void keyboard_post_init_user(void) {
- set_unicode_input_mode(UC_LNX);
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case KC_LCTL:
diff --git a/layouts/community/ortho_4x12/jotix/readme.md b/layouts/community/ortho_4x12/jotix/readme.md
index dda5b81def..1b44ca6596 100644
--- a/layouts/community/ortho_4x12/jotix/readme.md
+++ b/layouts/community/ortho_4x12/jotix/readme.md
@@ -1,7 +1,5 @@
# Jotix ortho 4x12 keymap
-![keymap](https://i.imgur.com/hfCyDRD.png)
-
Tested on:
* Planck/rev4
diff --git a/layouts/community/ortho_4x12/jotix/rules.mk b/layouts/community/ortho_4x12/jotix/rules.mk
deleted file mode 100644
index 0517619ed1..0000000000
--- a/layouts/community/ortho_4x12/jotix/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODEMAP_ENABLE = yes \ No newline at end of file
diff --git a/layouts/community/ortho_4x12/jotix/unicode.c b/layouts/community/ortho_4x12/jotix/unicode.c
deleted file mode 100644
index 1935d3a721..0000000000
--- a/layouts/community/ortho_4x12/jotix/unicode.c
+++ /dev/null
@@ -1,200 +0,0 @@
-enum unicode_names {
- A_ACUTE,
- A_ACUTEC,
- E_ACUTE,
- E_ACUTEC,
- I_ACUTE,
- I_ACUTEC,
- O_ACUTE,
- O_ACUTEC,
- U_ACUTE,
- U_ACUTEC,
- U_DIERESIS,
- U_DIERESISC,
- N_TILDE,
- N_TILDEC,
- OPEN_EXCML,
- OPEN_QUEST,
- EURO,
- POUND,
- LEFT_ARROW,
- DOWN_ARROW,
- UP_ARROW,
- RIGHT_ARROW,
- LEFT_DARROW,
- DOWN_DARROW,
- UP_DARROW,
- RIGHT_DAROW,
- LEFT_DQUOT,
- RGHT_DQUOT,
- DEGREE,
- DEGREE_CELCIUS,
- SUPER_1,
- SUPER_2,
- SUPER_3,
- ONE_HALF,
- PER_MILLE,
- PER_THOUS,
- PILCROW,
- COPYRIGHT,
- REGISTERED,
- MICRO,
- MIDDLE_DOT,
- BOX_CORNER_1,
- BOX_CORNER_2,
- BOX_CORNER_3,
- BOX_CORNER_4,
- BOX_HORIZONTAL,
- BOX_VERTICAL,
- BOX_CROSS,
- BOX_UNION_1,
- BOX_UNION_2,
- BOX_UNION_3,
- BOX_UNION_4,
- DBOX_CORNER_1,
- DBOX_CORNER_2,
- DBOX_CORNER_3,
- DBOX_CORNER_4,
- DBOX_HORIZONT,
- DBOX_VERTICAL,
- DBOX_CROSS,
- DBOX_UNION_1,
- DBOX_UNION_2,
- DBOX_UNION_3,
- DBOX_UNION_4,
- LESS_EQUAL,
- MORE_EQUAL,
- DIVISION,
- SQUARE_ROOT,
- CUBE_ROOT,
- SPADE_SUIT,
- TREBOL_SUIT,
- HEART_SUIT,
- DIAMOND_SUIT,
- NARRAY_SUM,
- INFINIT_SYMBOL,
- DIAMOND_BULLET,
- CIRCLE_BULLET,
- SMILE_FACE,
- SAD_FACE
-};
-
-const uint32_t PROGMEM unicode_map[] = {
- [A_ACUTE] = 0x00E1,
- [A_ACUTEC] = 0x00C1,
- [E_ACUTE] = 0x00E9,
- [E_ACUTEC] = 0x00C9,
- [I_ACUTE] = 0x00ED,
- [I_ACUTEC] = 0x00CD,
- [O_ACUTE] = 0x00F3,
- [O_ACUTEC] = 0x00D3,
- [U_ACUTE] = 0x00FA,
- [U_ACUTEC] = 0x00DA,
- [U_DIERESIS] = 0x00FC,
- [U_DIERESISC] = 0x00DC,
- [N_TILDE] = 0x00F1,
- [N_TILDEC] = 0x00D1,
- [OPEN_EXCML] = 0x00A1,
- [OPEN_QUEST] = 0x00BF,
- [EURO] = 0x20AC,
- [POUND] = 0x00A3,
- [LEFT_ARROW] = 0x2190,
- [DOWN_ARROW] = 0x2193,
- [UP_ARROW] = 0x2191,
- [RIGHT_ARROW] = 0x2192,
- [LEFT_DARROW] = 0x21E6,
- [DOWN_DARROW] = 0x21D3,
- [UP_DARROW] = 0x21D1,
- [RIGHT_DAROW] = 0x21D2,
- [LEFT_DQUOT] = 0x00AB,
- [RGHT_DQUOT] = 0x00BB,
- [DEGREE] = 0x00B0,
- [DEGREE_CELCIUS]= 0x2103,
- [SUPER_1] = 0x00B9,
- [SUPER_2] = 0x00B2,
- [SUPER_3] = 0x00B3,
- [ONE_HALF] = 0x00BD,
- [PER_MILLE] = 0x0609,
- [PER_THOUS] = 0x060A,
- [PILCROW] = 0x00B6,
- [COPYRIGHT] = 0x00A9,
- [REGISTERED] = 0x00AE,
- [MICRO] = 0x00B5,
- [MIDDLE_DOT] = 0x00B7,
- [BOX_CORNER_1] = 0x250C,
- [BOX_CORNER_2] = 0x2510,
- [BOX_CORNER_3] = 0x2514,
- [BOX_CORNER_4] = 0x2518,
- [BOX_HORIZONTAL]= 0x2500,
- [BOX_VERTICAL] = 0x2502,
- [BOX_CROSS] = 0x253C,
- [BOX_UNION_1] = 0x2524,
- [BOX_UNION_2] = 0x252C,
- [BOX_UNION_3] = 0x2534,
- [BOX_UNION_4] = 0x251C,
- [DBOX_CORNER_1] = 0x2554,
- [DBOX_CORNER_2] = 0x2557,
- [DBOX_CORNER_3] = 0x255A,
- [DBOX_CORNER_4] = 0x255D,
- [DBOX_HORIZONT] = 0x2550,
- [DBOX_VERTICAL] = 0x2551,
- [DBOX_CROSS] = 0x256C,
- [DBOX_UNION_1] = 0x2563,
- [DBOX_UNION_2] = 0x2566,
- [DBOX_UNION_3] = 0x2569,
- [DBOX_UNION_4] = 0x2560,
- [LESS_EQUAL] = 0x2264,
- [MORE_EQUAL] = 0x2265,
- [DIVISION] = 0x00F7,
- [SQUARE_ROOT] = 0x221A,
- [CUBE_ROOT] = 0x221B,
- [SPADE_SUIT] = 0x2660,
- [TREBOL_SUIT] = 0x2663,
- [HEART_SUIT] = 0x2664,
- [DIAMOND_SUIT] = 0x2665,
- [NARRAY_SUM] = 0x2211,
- [INFINIT_SYMBOL]= 0x221E,
- [DIAMOND_BULLET]= 0x2B25,
- [CIRCLE_BULLET] = 0x2981,
- [SMILE_FACE] = 0x263A,
- [SAD_FACE] = 0x2639
-};
-
-#define UN_ESC XP(DEGREE, DEGREE_CELCIUS)
-#define UN_Q XP(OPEN_EXCML, SUPER_1)
-#define UN_W XP(SUPER_2, SUPER_3)
-#define UN_E XP(E_ACUTE, E_ACUTEC)
-#define UN_R XP(EURO, ONE_HALF)
-#define UN_T XP(PER_MILLE, PER_THOUS)
-#define UN_Y XP(U_DIERESIS, U_DIERESISC)
-#define UN_U XP(U_ACUTE, U_ACUTEC)
-#define UN_I XP(I_ACUTE, I_ACUTEC)
-#define UN_O XP(O_ACUTE, O_ACUTEC)
-#define UN_P XP(POUND, PILCROW)
-#define UN_BSPC XP(BOX_CROSS, DBOX_CROSS)
-#define UN_TAB XP(DIAMOND_BULLET, CIRCLE_BULLET)
-#define UN_A XP(A_ACUTE, A_ACUTEC)
-#define UN_S XP(BOX_CORNER_1, DBOX_CORNER_1)
-#define UN_D XP(BOX_CORNER_2, DBOX_CORNER_2)
-#define UN_F XP(BOX_CORNER_3, DBOX_CORNER_3)
-#define UN_G XP(BOX_CORNER_4, DBOX_CORNER_4)
-#define UN_H XP(BOX_UNION_1, DBOX_UNION_1)
-#define UN_J XP(BOX_UNION_2, DBOX_UNION_2)
-#define UN_K XP(BOX_UNION_3, DBOX_UNION_3)
-#define UN_L XP(BOX_UNION_4, DBOX_UNION_4)
-#define UN_SCLN XP(BOX_HORIZONTAL, DBOX_HORIZONT)
-#define UN_ENT XP(BOX_VERTICAL, DBOX_VERTICAL)
-#define UN_Z XP(NARRAY_SUM, INFINIT_SYMBOL)
-#define UN_X XP(SMILE_FACE, SAD_FACE)
-#define UN_C XP(COPYRIGHT, REGISTERED)
-#define UN_V XP(SPADE_SUIT, TREBOL_SUIT)
-#define UN_B XP(HEART_SUIT, DIAMOND_SUIT)
-#define UN_N XP(N_TILDE, N_TILDEC)
-#define UN_M XP(MICRO, MIDDLE_DOT)
-#define UN_COMM XP(LESS_EQUAL, LEFT_DQUOT)
-#define UN_DOT XP(MORE_EQUAL, RGHT_DQUOT)
-#define UN_SLSH XP(OPEN_QUEST, DIVISION)
-#define UN_LEFT XP(LEFT_ARROW, LEFT_DARROW)
-#define UN_DOWN XP(DOWN_ARROW, DOWN_DARROW)
-#define UN_UP XP(UP_ARROW, UP_DARROW)
-#define UN_RGHT XP(RIGHT_ARROW, RIGHT_DAROW) \ No newline at end of file