[Keymap] add unicode to jotix's ortho_4x12_layout (#5775)

* add unicode to jotix's ortho_4x12_layout

* suggested change #define UNICODE_SELECTED_MODES UC_LNX

diff --git a/layouts/community/ortho_4x12/jotix/config.h b/layouts/community/ortho_4x12/jotix/config.h
new file mode 100644 (file)
index 0000000..cdc202d
--- /dev/null
+++ b/layouts/community/ortho_4x12/jotix/config.h
@@ -0,0 +1 @@
+#define UNICODE_SELECTED_MODES UC_LNX

diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index 12aa5ea88af5e14539c85121d6405238896e714d..cd5413da72383682d3597f76f048721fcc08f537 100644 (file)
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -1,6 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
 #include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
@@ -10,81 +7,175 @@ extern keymap_config_t keymap_config;
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
 
-#define _QWERTY   0
-#define _LOWER    1
-#define _RAISE    2
-#define _ADJUST   3
+#define _QWERTY  0
+#define _FN      1
+#define _UNICODE 2
+#define _ADJUST  3
+
+#define FN MO(_FN)
+#define UNICODE MO(_UNICODE)
+
+enum unicode_names {
+    AACUTE,
+    AACUTE_M,
+    EACUTE,
+    EACUTE_M,
+    IACUTE,
+    IACUTE_M,
+    OACUTE,
+    OACUTE_M,
+    UACUTE,
+    UACUTE_M,
+    UDIER,
+    UDIER_M,
+    NTILDE,
+    NTILDE_M,
+    POUN,
+    COPY,
+    ORDF,
+    ORDM,
+    QUAD,
+    CUBE,
+    DEGR,
+    QUAR,
+    HALF,
+    NOT,
+    LDQU,
+    RDQU,
+    QUES,
+    EXCL,
+    ARRL,
+    ARRU,
+    ARRR,
+    ARRD,
+    EURO,
+    SMIL,
+    NEUT,
+    SMIH,
+    ANGR,
+    WORR,
+    DIZY,
+    TONG,
+    DISS,
+    SCRE,
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+    [AACUTE]    = 0xe1, // á
+    [AACUTE_M]  = 0xc1, // Á
+    [EACUTE]    = 0xe9, // é
+    [EACUTE_M]  = 0xc9, // É
+    [IACUTE]    = 0xed, // í
+    [IACUTE_M]  = 0xcd, // Í
+    [OACUTE]    = 0xf3, // ó
+    [OACUTE_M]  = 0xd3, // Ó
+    [UACUTE]    = 0xfa, // ú
+    [UACUTE_M]  = 0xda, // Ú
+    [UDIER]     = 0xfc, // ü
+    [UDIER_M]   = 0xdc, // Ü
+    [NTILDE]    = 0xf1, // ñ
+    [NTILDE_M]  = 0xd1, // Ñ
+    [POUN]      = 0xa3, // £
+    [COPY]      = 0xa9, // ©
+    [ORDF]      = 0xaa, // ª
+    [ORDM]      = 0xba, // º
+    [QUAD]      = 0xb2, // ²
+    [CUBE]      = 0xb3, // ³
+    [DEGR]      = 0xb0, // °
+    [QUAR]      = 0xbc, // ¼
+    [HALF]      = 0xbd, // ½
+    [NOT]       = 0xac, // ¬
+    [LDQU]      = 0xab, // «
+    [RDQU]      = 0xbb, // »
+    [QUES]      = 0xbf, // ¿
+    [EXCL]      = 0xa1, // ¡
+    [ARRL]      = 0x2190, // ←
+    [ARRU]      = 0x2191, // ↑
+    [ARRR]      = 0x2192, // →
+    [ARRD]      = 0x2193, // ↓
+    [EURO]      = 0x20ac, // €
+    [SMIL]      = 0x1f603, // 😃
+    [NEUT]      = 0x1f610, // 😐 
+    [SMIH]      = 0x1f608, // 😈
+    [ANGR]      = 0x1f620, // 😠
+    [WORR]      = 0x1f61f, // 😟
+    [DIZY]      = 0x1f635, // 😵
+    [TONG]      = 0x1f61d, // 😝
+    [DISS]      = 0x1f61e, // 😝
+    [SCRE]      = 0x1f631, // 😱
+};
+
+#define A_UNIC XP(AACUTE, AACUTE_M)
+#define E_UNIC XP(EACUTE, EACUTE_M)
+#define I_UNIC XP(IACUTE, IACUTE_M)
+#define O_UNIC XP(OACUTE, OACUTE_M)
+#define U_UNIC XP(UACUTE, UACUTE_M)
+#define Y_UNIC XP(UDIER,  UDIER_M )
+#define N_UNIC XP(NTILDE, NTILDE_M)
 
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
+#define TAB_UNI LT(_UNICODE, KC_TAB) 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Qwerty
+/* qwerty
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
  * |   esc  |    Q   |    W   |    E   |    R   |    T   |    Y   |    U   |    I   |    O   |    P   |  bksp  |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |   tab  |    A   |    S   |    D   |    F   |    G   |    H   |    J   |    K   |    L   |    ;   |    '   |
+ * |tab/unic|    A   |    S   |    D   |    F   |    G   |    H   |    J   |    K   |    L   |    ;   |    '   |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
  * | lshift |    Z   |    X   |    C   |    V   |    B   |    N   |    M   |    ,   |    .   |    /   |  enter |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |  lctrl |  lalt  |  ralt  |  lgui  |  lower |  space |  space |  raise |  left  |  down  |   up   |  right | 
+ * |  lctrl |  lalt  |  caps  |   del  |  lgui  |  space |  space |   fn   |  left  |  down  |   up   |  right | 
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
  */
 [_QWERTY] = LAYOUT_ortho_4x12 ( 
     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_QUOT,
+    TAB_UNI, 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_SLSH, KC_ENT,
-    KC_LCTL, KC_LALT, KC_RALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_LCTL, KC_LALT, KC_CAPS, KC_DEL,  KC_LGUI, KC_SPC,  KC_SPC,  FN,      KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
-/* Lower
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |    `   |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |        |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |    -   |    =   |    [   |    ]   |    \   |        |        |        |        |        |        |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |    _   |    +   |    {   |    }   |    |   |        |        |        |        |        |        |
+/* fn
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- */
-[_LOWER] = 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_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______,
-     _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |    ~   |    !   |    @   |    #   |    $   |    %   |    ^   |    &   |    *   |    (   |    )   |   del  |
+ * |        |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |        |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
  * |        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |    -   |    =   |    [   |    ]   |    \   |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |    _   |    +   |    {   |    }   |    |   |
+ * |        |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |    `   |        |        |        |        |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
  * |        |        |        |        |        |        |        |        |  home  |  pgdn  |  pgun  |   end  |
  * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
  */
-[_RAISE] = LAYOUT_ortho_4x12 (
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+[_FN] = LAYOUT_ortho_4x12 (
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_GRV,  _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
 ),
 
-/* Adjust */
+/* 
+ * unicode
+ */
+[_UNICODE] = LAYOUT_ortho_4x12 ( 
+    _______, X(EXCL), X(WORR), E_UNIC,  X(EURO), X(TONG), Y_UNIC,  U_UNIC,  I_UNIC,  O_UNIC,  X(POUN), _______,
+    _______, A_UNIC,  X(SMIL), X(DISS), X(SCRE), X(DEGR), X(SMIH), X(NOT),  X(QUAR), X(HALF), X(ORDF), X(ORDM),
+    _______, X(DIZY), X(ANGR), X(COPY), X(QUAD), X(CUBE), N_UNIC,  X(NEUT), X(LDQU), X(RDQU), X(QUES), _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, X(ARRL), X(ARRD), X(ARRU), X(ARRR)
+),
+
+/* 
+ * Adjust 
+ */
 [_ADJUST] = LAYOUT_ortho_4x12 (
     _______, RESET,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, KC_CAPS, _______, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),    
 };
 
 uint32_t layer_state_set_user(uint32_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+  return update_tri_layer_state(state, _FN, _UNICODE, _ADJUST);
 }
 
 void matrix_init_user(void) {

diff --git a/layouts/community/ortho_4x12/jotix/rules.mk b/layouts/community/ortho_4x12/jotix/rules.mk
new file mode 100644 (file)
index 0000000..502b2de
--- /dev/null
+++ b/layouts/community/ortho_4x12/jotix/rules.mk
@@ -0,0 +1 @@
+UNICODEMAP_ENABLE = yes

diff --git a/layouts/community/ortho_4x12/jotix2/keymap.c b/layouts/community/ortho_4x12/jotix2/keymap.c
deleted file mode 100644 (file)
index 6364764..0000000
--- a/layouts/community/ortho_4x12/jotix2/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-#define _GAME   3
-#define _ADJUST 4
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define GAME   TG(_GAME)
-
-/* Funct
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |    `   |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |        |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |    -   |    =   |    [   |    ]   |    \   |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |    '   |        |        |        |        |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |        |        |        |        |        |        |        |        |  home  |  vol-  |  vol+  |   end  |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- */
-#define _FUNCT 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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,\
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_QUOT, _______, _______, _______, _______,\
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_VOLD, KC_VOLU, KC_END\
-)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |   esc  |    Q   |    W   |    E   |    R   |    T   |    Y   |    U   |    I   |    O   |    P   |  bksp  |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |   tab  |    A   |    S   |    D   |    F   |    G   |    H   |    J   |    K   |    L   |    ;   |   del  |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * | lshift |    Z   |    X   |    C   |    V   |    B   |    N   |    M   |    ,   |    .   |    /   |  enter |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- * |  lctrl |  lgui  |  lalt  |  ralt  | funct  |  space |  space |  funct |  left  |  down  |   up   |  right | 
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
- */
-[_QWERTY] = LAYOUT_ortho_4x12 ( 
-    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_DEL,
-    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, KC_RALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_LOWER] = _FUNCT,
-
-[_RAISE] = _FUNCT,
-
-/* Game */
-[_GAME] = LAYOUT_ortho_4x12 (
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),    
-
-/* Adjust */
-[_ADJUST] = LAYOUT_ortho_4x12 (
-    _______, RESET,   _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
-    _______, _______, _______, _______, _______, GAME,    _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),    
-};
-
-uint32_t layer_state_set_user(uint32_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-void matrix_init_user(void) {
-}

diff --git a/layouts/community/ortho_4x12/jotix2/readme.md b/layouts/community/ortho_4x12/jotix2/readme.md
deleted file mode 100644 (file)
index b023227..0000000
--- a/layouts/community/ortho_4x12/jotix2/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Jotix2 ortho 4x12 keymap
-
-![keymap](https://i.imgur.com/WMfIpH3.jpg)
-
-Tested on:
-
-* Planck/rev4
-* Jotanck