From 02f46711a4ebaf609037e9a6a7f7129120f1f784 Mon Sep 17 00:00:00 2001
From: Sergi Meseguer <zigotica@gmail.com>
Date: Thu, 6 Jul 2023 21:27:34 +0200
Subject: [Keymap] Add zigotica stenai keymap for XD75 keyboard (#21412)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 users/zigotica/rows.h     | 23 ++++++++++++++++++++---
 users/zigotica/rules.mk   |  2 +-
 users/zigotica/zigotica.h |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'users')

diff --git a/users/zigotica/rows.h b/users/zigotica/rows.h
index 18f08ccb0b..575b32186e 100644
--- a/users/zigotica/rows.h
+++ b/users/zigotica/rows.h
@@ -15,8 +15,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "zigotica.h"
 
 // clang-format off
-#define _BLANK_ROW      _______, _______, _______, _______, _______
 #define _BLANK_THUMB    _______, _______
+#define _BLANK_3        _______, _______, _______
+#define _BLANK_4        _______, _______, _______, _______
+#define _BLANK_ROW      _______, _______, _______, _______, _______
 
 /*
  * STENAI Layer
@@ -60,12 +62,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _COLEMAK_R3     KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
 
 #define _QWERTY_L1      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define _QWERTY_L2      KC_A,    KC_S,    KC_D,    KC_F,    KC_G
+#define _QWERTY_L2      LALT_T(KC_A),     LCTL_T(KC_S),    LSFT_T(KC_D),  LGUI_T(KC_F),     KC_G
 #define _QWERTY_L3      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+#define _QWERTY_LT      LT(_NUM, KC_TAB), LT(_NAV, KC_SPC)
 
 #define _QWERTY_R1      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
-#define _QWERTY_R2      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT
+#define _QWERTY_R2      KC_H,    RGUI_T(KC_J),    RSFT_T(KC_K),  RCTL_T(KC_L), RALT_T(KC_SCLN)
 #define _QWERTY_R3      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
+#define _QWERTY_RT      LT(_SYM, KC_SPC), LT(_FN, KC_ENT)
 
 /*
  * NUM Layer
@@ -191,4 +195,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ____FN_R2       _______,  KC_F1,  KC_F2,  KC_F3,  KC_F11
 #define ____FN_R3       _______,  KC_F4,  KC_F5,  KC_F6,  KC_F12
 #define ____FN_RT       _BLANK_THUMB
+
+
+// Ortho short rows
+#define ____NUM15      KC_1,    KC_2,    KC_3,   KC_4,   KC_5
+#define ____NUM60      KC_6,    KC_7,    KC_8,   KC_9,   KC_0
+#define ____FN_15      KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5
+#define ____FN_60      KC_F6,   KC_F7,   KC_F8,  KC_F9,  KC_F10
+#define ____LMODS      KC_LCTL, KC_LALT, KC_LGUI
+#define ____TARRS      _______, KC_UP,   _______
+#define ____BARRS      KC_LEFT, KC_DOWN, KC_RIGHT
+#define ____LORTH      ____LMODS, KC_MINS
+#define ____RORTH      KC_BSPC, KC_SCLN, KC_BSLS, KC_SLSH
+
 // clang-format on
diff --git a/users/zigotica/rules.mk b/users/zigotica/rules.mk
index 019e6f6dda..93b0b5704d 100644
--- a/users/zigotica/rules.mk
+++ b/users/zigotica/rules.mk
@@ -5,7 +5,7 @@ ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(COMBO_ENABLE)), yes)
-    SRC += combos.c
+	INTROSPECTION_KEYMAP_C = combos.c
 endif
 
 ifeq ($(strip $(OLED_ENABLE)), yes)
diff --git a/users/zigotica/zigotica.h b/users/zigotica/zigotica.h
index e85a04edbe..e7ac83e0dc 100644
--- a/users/zigotica/zigotica.h
+++ b/users/zigotica/zigotica.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "rows.h"
 
-#ifdef SPLIT_KEYBOARD
+#if defined(SPLIT_KEYBOARD) || defined(ORTHOLINEAR_KEYBOARD)
 enum userspace_layers {
     BASE = 0,
     _NUM,
-- 
cgit v1.2.3