From 8c2cad1185afb594a502872441f11319433dc5e4 Mon Sep 17 00:00:00 2001
From: Kim Streich <kim@infusedinsight.com>
Date: Sat, 6 Jan 2024 21:03:49 -0600
Subject: [PATCH] Build: Switch to fork of urob fork with zephyr 3.5 and mouse
 support

---
 .github/workflows/build.yml |  2 +-
 config/corne.keymap         |  2 +-
 config/west.yml             |  2 +-
 keymap_img/keymap.svg       | 48 ++++++++++++++++++++++++++++++-------
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d74fb89f..8735e7b5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
+    uses: petejohanson/zmk/.github/workflows/build-user-config.yml@core/zephyr-3.5-update
diff --git a/config/corne.keymap b/config/corne.keymap
index 61d0b0ee..0c48f7f3 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -7,7 +7,7 @@
 
 /* Enable keymap features that require forks */
 #define HAS_UROB
-// #define HAS_MOUSE_KEYS
+#define HAS_MOUSE_KEYS
 // #define HAS_PS2
 // #define HAS_CAPSLOCK
 
diff --git a/config/west.yml b/config/west.yml
index 523f8495..bbb1ddd4 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -9,7 +9,7 @@ manifest:
   projects:
     - name: zmk
       remote: infused-kim
-      revision: urob/no-mouse
+      revision: urob/mouse
       import: app/west.yml
   self:
     path: config
diff --git a/keymap_img/keymap.svg b/keymap_img/keymap.svg
index e749f976..aa14c422 100644
--- a/keymap_img/keymap.svg
+++ b/keymap_img/keymap.svg
@@ -272,7 +272,9 @@ path {
 </g>
 <g transform="translate(588, 235)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Num</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-1.2em">Num</tspan><tspan x="0" dy="1.2em">Word</tspan>
+</text>
 <text x="0" y="24" class="key hold">Num</text>
 </g>
 <g class="combo combopos-0">
@@ -331,16 +333,30 @@ path {
 <path d="M196,121 l0,-19" class="combo"/>
 <path d="M196,121 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-7" class="combo"/>
 <rect rx="6" ry="6" x="182" y="108" width="28" height="26" class="combo"/>
-<text x="196" y="121" class="combo tap"><tspan style="font-size: 88%">Nav_Word</tspan></text>
-<text x="196" y="132" class="combo hold">toggle</text>
+<text x="196" y="121" class="combo tap">NAV</text>
 </g>
 <g class="combo combopos-12">
 <path d="M196,189 h-50 a6.0,6.0 0 0 1 -6.0,-6.0 v-18" class="combo"/>
 <path d="M196,189 l0,-30" class="combo"/>
 <path d="M196,189 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-18" class="combo"/>
 <rect rx="6" ry="6" x="182" y="176" width="28" height="26" class="combo"/>
-<text x="196" y="189" class="combo tap"><tspan style="font-size: 88%">Num_Word</tspan></text>
-<text x="196" y="200" class="combo hold">toggle</text>
+<text x="196" y="189" class="combo tap">NUM</text>
+</g>
+<g class="combo combopos-13">
+<path d="M140,242 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-133" class="combo"/>
+<path d="M140,242 l0,-134" class="combo"/>
+<path d="M140,242 h-50 a6.0,6.0 0 0 1 -6.0,-6.0 v-116" class="combo"/>
+<rect rx="6" ry="6" x="126" y="229" width="28" height="26" class="combo"/>
+<text x="140" y="242" class="combo tap"><tspan style="font-size: 78%">MouseKeys</tspan></text>
+<text x="140" y="253" class="combo hold">toggle</text>
+</g>
+<g class="combo combopos-14">
+<path d="M700,242 h-50 a6.0,6.0 0 0 1 -6.0,-6.0 v-133" class="combo"/>
+<path d="M700,242 l0,-134" class="combo"/>
+<path d="M700,242 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-116" class="combo"/>
+<rect rx="6" ry="6" x="686" y="229" width="28" height="26" class="combo"/>
+<text x="700" y="242" class="combo tap"><tspan style="font-size: 78%">MouseKeys</tspan></text>
+<text x="700" y="253" class="combo hold">toggle</text>
 </g>
 </g>
 </g>
@@ -516,8 +532,23 @@ path {
 <path d="M196,189 l0,-30" class="combo"/>
 <path d="M196,189 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-18" class="combo"/>
 <rect rx="6" ry="6" x="182" y="176" width="28" height="26" class="combo"/>
-<text x="196" y="189" class="combo tap"><tspan style="font-size: 88%">Num_Word</tspan></text>
-<text x="196" y="200" class="combo hold">toggle</text>
+<text x="196" y="189" class="combo tap">NUM</text>
+</g>
+<g class="combo combopos-3">
+<path d="M140,242 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-133" class="combo"/>
+<path d="M140,242 l0,-134" class="combo"/>
+<path d="M140,242 h-50 a6.0,6.0 0 0 1 -6.0,-6.0 v-116" class="combo"/>
+<rect rx="6" ry="6" x="126" y="229" width="28" height="26" class="combo"/>
+<text x="140" y="242" class="combo tap"><tspan style="font-size: 78%">MouseKeys</tspan></text>
+<text x="140" y="253" class="combo hold">toggle</text>
+</g>
+<g class="combo combopos-4">
+<path d="M700,242 h-50 a6.0,6.0 0 0 1 -6.0,-6.0 v-133" class="combo"/>
+<path d="M700,242 l0,-134" class="combo"/>
+<path d="M700,242 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-116" class="combo"/>
+<rect rx="6" ry="6" x="686" y="229" width="28" height="26" class="combo"/>
+<text x="700" y="242" class="combo tap"><tspan style="font-size: 78%">MouseKeys</tspan></text>
+<text x="700" y="253" class="combo hold">toggle</text>
 </g>
 </g>
 </g>
@@ -735,8 +766,7 @@ path {
 <path d="M196,121 l0,-19" class="combo"/>
 <path d="M196,121 h50 a6.0,6.0 0 0 0 6.0,-6.0 v-7" class="combo"/>
 <rect rx="6" ry="6" x="182" y="108" width="28" height="26" class="combo"/>
-<text x="196" y="121" class="combo tap"><tspan style="font-size: 88%">Nav_Word</tspan></text>
-<text x="196" y="132" class="combo hold">toggle</text>
+<text x="196" y="121" class="combo tap">NAV</text>
 </g>
 </g>
 </g>