From b2262c99f10025cc8861e5e6d4264f4ed0fbbc82 Mon Sep 17 00:00:00 2001
From: Matt Skalecki <ikcelaks@gmail.com>
Date: Thu, 21 Mar 2024 10:45:00 -0400
Subject: [PATCH] use makefile that automatically calculates the path to
 sequence_transform

---
 .../moonlander/keymaps/ikcelaks/config.h      |  5 +--
 .../moonlander/keymaps/ikcelaks/rules.mk      | 12 +++++--
 .../keymaps/ikcelaks/sequence_transform       |  2 +-
 .../ikcelaks/sequence_transform_config.json   | 18 ++++++++---
 .../ikcelaks/sequence_transform_dict.txt      | 32 +++++++++++++------
 .../ikcelaks/sequence_transform_dict_test.txt | 17 +++++++---
 6 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/keyboards/moonlander/keymaps/ikcelaks/config.h b/keyboards/moonlander/keymaps/ikcelaks/config.h
index 41662e3d..37d2713f 100644
--- a/keyboards/moonlander/keymaps/ikcelaks/config.h
+++ b/keyboards/moonlander/keymaps/ikcelaks/config.h
@@ -18,13 +18,14 @@
 
 #pragma once
 
-// #define ORYX_CONFIGURATOR
-
 // User Added
 #define COMBO_COUNT 10
 #define TAPPING_TOGGLE 2
 #define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
 #define SEQUENCE_TRANSFORM_IDLE_TIMEOUT 3000
 #define SEQUENCE_TRANSFORM_EXTRA_BUFFER 10
+#define SEQUENCE_TRANSFORM_FALLBACK_BUFFER 0
 #define SEQUENCE_TRANSFORM_RECORD_RULE_USAGE 0
+#define SEQUENCE_TRANSFORM_RULE_SEARCH 0
+#define SEQUENCE_TRANSFORM_DEBUG 0
 #define USER_PRINT
diff --git a/keyboards/moonlander/keymaps/ikcelaks/rules.mk b/keyboards/moonlander/keymaps/ikcelaks/rules.mk
index 33ff87a7..6a8170b0 100644
--- a/keyboards/moonlander/keymaps/ikcelaks/rules.mk
+++ b/keyboards/moonlander/keymaps/ikcelaks/rules.mk
@@ -10,7 +10,13 @@ CAPS_WORD_ENABLE = yes
 
 TOP_SYMBOLS=10
 
-include /home/qmk/qmk_userspace/keyboards/moonlander/keymaps/ikcelaks/sequence_transform/rules.mk
+# sequence_transform setup
+mkfile_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 
-# Automatically rebuild my sequence_transform rules from the latest config
-$(shell python3 /home/qmk/qmk_userspace/keyboards/moonlander/keymaps/ikcelaks/sequence_transform/generator/sequence_transform_data.py -q)
+all: st_build
+
+st_build:
+	python3 $(mkfile_dir)/sequence_transform/generator/sequence_transform_data.py
+
+include $(mkfile_dir)/sequence_transform/rules.mk
+# end sequence_transform setup
diff --git a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform
index e332cf42..33cb17ce 160000
--- a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform
+++ b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform
@@ -1 +1 @@
-Subproject commit e332cf421c8e48512445b9eb1dadbe553ea513d1
+Subproject commit 33cb17ce28cbe4fe94d6f054033a0d19c308a53f
diff --git a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_config.json b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_config.json
index 13a04587..0c9e3ca0 100644
--- a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_config.json
+++ b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_config.json
@@ -1,11 +1,19 @@
 {
     "rules_file_name": "sequence_transform_dict.txt",
-    "sequence_token_symbols": "👆👍★✪",
-    "wordbreak_symbol": "⎵",
+    "sequence_token_symbols": {
+        "👆": "*",
+        "👍": "@",
+        "★":  "$",
+        "✪":  "#"
+    },
+    "wordbreak_symbol": {
+        "⎵": "^"
+    },
+    "digit_symbol": {
+        "Ⅾ": "D"
+    },
     "output_func_symbols": "↻⇑",
     "comment_str": "#",
     "separator_str": "⇒",
-    "sequence_tokens_ascii": "*@$#",
-    "wordbreak_ascii": "^",
-    "quiet": false
+    "implicit_transform_leading_wordbreak": true
 }
diff --git a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt
index 559b5254..75f77cf1 100644
--- a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt
+++ b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt
@@ -19,13 +19,13 @@ qa      ⇒ qua
 qi      ⇒ qui
 qe      ⇒ que
 qo      ⇒ quo
-qa👆    ⇒ qua
-qi👆    ⇒ qui
-qe👆    ⇒ que
-qo👆    ⇒ quo
-⎵eqa👍        ⇒ equal
-⎵eqa👍y        ⇒ equally
-⎵eqa👍t        ⇒ equality
+qa👆    ⇒ qa
+qi👆    ⇒ qi
+qe👆    ⇒ qe
+qo👆    ⇒ qo
+
+⎵qua👆         ⇒ quali
+⎵qa👆t         ⇒ quality
 
 d★     ⇒ develop
 d★t    ⇒ development
@@ -56,11 +56,12 @@ sim👆👆       ⇒ simultaneous
 
 
 ⎵c👍        ⇒ come
-⎵c👍v        ⇒ co
+⎵c👍t       ⇒ can't
+⎵c👍v       ⇒ cover
 ⎵c👍o       ⇒ course
 ⎵c👍a       ⇒ change
 ⎵c👍ai      ⇒ changing
-⎵c👍s       ⇒ cause
+⎵c👍e       ⇒ cause
 ⎵c👍n       ⇒ consider
 ⎵c👍m       ⇒ complete
 ⎵c👍l       ⇒ call
@@ -234,7 +235,7 @@ rs👍       ⇒ rst
 ⎵w👍v       ⇒ we've
 
 ⎵w👆i       ⇒ will
-⎵w👆l       ⇒ well
+⎵w👆e       ⇒ well
 ⎵w👆r       ⇒ write
 ⎵w👆rn      ⇒ written
 ⎵w👆ri      ⇒ writing
@@ -257,6 +258,7 @@ rs👍       ⇒ rst
 ⎵a👆l      ⇒ also
 
 ⎵a👍r        ⇒ after
+⎵a👍rt       ⇒ aren't
 ⎵a👍👆       ⇒ another
 ⎵a👍d        ⇒ around
 ⎵a👍n        ⇒ again
@@ -280,6 +282,9 @@ rs👍       ⇒ rst
 ⎵s👍p        ⇒ special
 ⎵s👍a        ⇒ state
 ⎵s👍e        ⇒ seem
+⎵s👍es       ⇒ she's
+⎵s👍ed       ⇒ she'd
+⎵s👍el       ⇒ she'll
 ⎵s👍i        ⇒ still
 ⎵s👍n        ⇒ since
 
@@ -305,6 +310,8 @@ s👆l        ⇒ school
 ⎵d👍t       ⇒ don't
 ⎵d👍i       ⇒ did
 ⎵d👍it      ⇒ didn't
+⎵d👍s       ⇒ does
+⎵d👍st      ⇒ doesn't
 ⎵d👍f       ⇒ differ
 ⎵d👍ft      ⇒ different
 ⎵d👍u       ⇒ difficult
@@ -326,6 +333,10 @@ s👆l        ⇒ school
 
 ⎵h👍         ⇒ have
 ⎵h👍g        ⇒ having
+⎵h👍e        ⇒ he
+⎵h👍es       ⇒ he's
+⎵h👍el       ⇒ he'll
+⎵h👍ed       ⇒ he'd
 ⎵h👍r        ⇒ here
 ⎵h👍s        ⇒ house
 ⎵h👍t        ⇒ haven't
@@ -363,6 +374,7 @@ ma👆g     ⇒ making
 mr👆      ⇒ mark
 t👆      ⇒ tment
 ta👆     ⇒ take
+ta👆g     ⇒ taking
 k👆      ⇒ ks
 
 l👆      ⇒ lk
diff --git a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict_test.txt b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict_test.txt
index 519fd573..2eeae53f 100644
--- a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict_test.txt
+++ b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict_test.txt
@@ -17,8 +17,15 @@
 # e👆a ⇒ ev
 # e👆a⎵ ⇒ even⎵
 
-⎵s👍         ⇒ some
-⎵s👍t         ⇒ sometimes
-x👆         ⇒ yellow
-x👆b        ⇒ blue
-x👆br        ⇒ red
+
+qa      ⇒ qua
+qi      ⇒ qui
+qe      ⇒ que
+qo      ⇒ quo
+qa👆    ⇒ qa
+qi👆    ⇒ qi
+qe👆    ⇒ qe
+qo👆    ⇒ qo
+
+⎵qua👍         ⇒ ⎵quali
+⎵qa👍t         ⇒ ⎵quality