jotix layouts (#8644)

* jotix layouts

* jotix ortho 4x4 layout

* Update layouts/community/ortho_4x4/jotix/keymap.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* jotix

Co-authored-by: Drashna Jaelre <drashna@live.com>

3 files changed, 77 insertions, 55 deletions

diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index fbbb7f251..600772288 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -8,7 +8,7 @@ enum layers {
 
 #define LOWER   MO(_LOWER)
 #define RAISE   MO(_RAISE)
-#define TGLOWER TG(_LOWER)
+#define SHRAISE LM(_RAISE, MOD_LSFT)
 
 static bool is_ctl_pressed;
 static bool is_esc_pressed;
@@ -20,35 +20,35 @@ 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_QUOT,
+    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_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
+    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_LCTL,KC_LGUI,KC_LALT,KC_RALT,LOWER,  KC_SPC, KC_SPC, RAISE,  KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT
+    KC_LCTL,KC_LGUI,KC_LALT,KC_RALT,LOWER,  KC_SPC, KC_SPC, RAISE,  SHRAISE,KC_LEFT,KC_DOWN,KC_RGHT
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ), 
 
 [_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_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_MINS,KC_EQL, KC_LBRC,KC_RBRC,KC_BSLS,KC_GRV, _______,_______,_______,_______,_______,
+    _______,KC_F11, KC_F12, KC_INS, KC_HOME,KC_PGUP,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,KC_TILD,KC_CAPS,_______,_______,_______,_______,
+    _______,_______,_______,KC_DEL, KC_END, KC_PGDN,_______,_______,_______,KC_BTN1,KC_MS_U,KC_BTN2,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_R
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ),
 
 [_RAISE] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-    _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_DEL,
+    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_F11, KC_F12, _______,_______,_______,_______,KC_VOLD,KC_MUTE,KC_VOLU,_______,_______,
+    KC_CAPS,_______,_______,_______,_______,_______,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,KC_MINS,KC_EQL, _______,_______,KC_VOLU,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,TGLOWER,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP,KC_END
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_BSPC,KC_VOLD,KC_MUTE
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ),
 
@@ -56,11 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 uint32_t layer_state_set_user(uint32_t state) {
   #ifdef JOTANCK_LEDS
-  if (biton32(state) == _LOWER) {
-    writePinHigh(JOTANCK_LED1);
-  } else {
-    writePinLow(JOTANCK_LED1);
-  }
+  writePin(JOTANCK_LED2, (get_highest_layer(state) == _RAISE));
   #endif
   return state;
 }
@@ -74,11 +70,7 @@ bool led_update_user(led_t led_state) {
 
   #ifdef JOTANCK_LEDS
   // CapsLock led
-  if (led_state.caps_lock) {
-    writePinHigh(JOTANCK_LED2);
-  } else {
-    writePinLow(JOTANCK_LED2);
-  }
+  writePin(JOTANCK_LED1, led_state.caps_lock);
   #endif
   return true;
 }
diff --git a/layouts/community/ortho_4x4/jotix/keymap.c b/layouts/community/ortho_4x4/jotix/keymap.c
index 91d0ed74d..9035860da 100644
--- a/layouts/community/ortho_4x4/jotix/keymap.c
+++ b/layouts/community/ortho_4x4/jotix/keymap.c
@@ -1,41 +1,74 @@
 #include QMK_KEYBOARD_H
 
-extern keymap_config_t keymap_config;
+enum layers {
+  _NUMPAD,
+  _GAMEPAD,
+  _FN
+};
 
-// 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.
+static bool is_p0_pressed;
+static bool is_p7_pressed;
+static bool is_pmns_pressed;
 
-#define _NUMPAD 0
-#define _LOWER  1
-#define LOWER  LT(_LOWER, KC_PENT)
+#define TGGAME TG(_GAMEPAD)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Numpad
- * +-------+-------+-------+-------+
- * |   7   |   8   |   9   |   -   |
- * +-------+-------+-------+-------+
- * |   4   |   5   |   6   |   +   |
- * +-------+-------+-------+-------+
- * |   1   |   2   |   3   |   /   |
- * +-------+-------+-------+-------+
- * |       |   0   |   .   |   *   |
- * +-------+-------+-------+-------+
- */
 [_NUMPAD] = LAYOUT_ortho_4x4 ( 
-    KC_P7,  KC_P8,  KC_P9,  KC_PMNS,
-    KC_P4,  KC_P5,  KC_P6,  KC_PPLS,
-    KC_P1,  KC_P2,  KC_P3,  KC_PSLS,
-    LOWER,  KC_P0,  KC_PDOT,KC_PAST 
+  KC_P7,  KC_P8,  KC_P9,  KC_PMNS,
+  KC_P4,  KC_P5,  KC_P6,  KC_PPLS,
+  KC_P1,  KC_P2,  KC_P3,  MO(_FN),
+  KC_P0,  KC_PDOT,KC_PSLS,KC_PAST 
 ),
 
-/* Lower */
-[_LOWER] = LAYOUT_ortho_4x4 ( 
-    KC_NLCK,_______,_______,RESET  ,
-    _______,_______,_______,_______,
-    _______,_______,_______,_______,
-    _______,_______,_______,_______ 
+[_GAMEPAD] = LAYOUT_ortho_4x4 (
+  KC_5,   KC_6,   KC_7,   KC_8,
+  KC_1,   KC_2,   KC_3,   KC_4,
+  KC_Q,   KC_W,   KC_E,   _______,
+  KC_A,   KC_S,   KC_D,   KC_SPC 
 ),
+
+[_FN] = LAYOUT_ortho_4x4 (
+  KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,
+  KC_EXLM,KC_AT,  KC_HASH,KC_DLR,
+  KC_Z,   KC_X,   KC_C,   _______,
+  KC_NLCK,_______,_______,TGGAME
+)
 };
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef JOTPAD16_LEDS
+    writePin(JOTPAD16_LED1, (get_highest_layer(state) == _FN));
+    writePin(JOTPAD16_LED2, (get_highest_layer(state) == _GAMEPAD));
+#endif
+  return state;
+}
+
+bool led_update_user(led_t led_state) {
+  // NumLock allways on
+  if (!led_state.num_lock) {
+    tap_code(KC_NUMLOCK);
+  }
+  return true;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case KC_P0:
+      is_p0_pressed = record->event.pressed;
+      break;
+    case KC_P7:
+      is_p7_pressed = record->event.pressed;
+      break;
+    case KC_PMNS:
+      is_pmns_pressed = record->event.pressed;
+      break;
+  };
+  return true;
+}
+
+void matrix_scan_user(void) {
+  if (is_p0_pressed && is_p7_pressed && is_pmns_pressed) {
+    reset_keyboard();
+  }
+}
diff --git a/layouts/community/ortho_4x4/jotix/readme.md b/layouts/community/ortho_4x4/jotix/readme.md
index 0624f6215..b4b56b58d 100644
--- a/layouts/community/ortho_4x4/jotix/readme.md
+++ b/layouts/community/ortho_4x4/jotix/readme.md
@@ -1,6 +1,3 @@
 # Jotix ortho 4x4 keymap
 
-![keymap](https://i.imgur.com/e67yN7x.jpg)
-
-Enter is 'Lower' on hold.
-
+Tested on jotpad16
\ No newline at end of file