From 58e11c69f057ef90eb249054675e4ae43e2c8f7b Mon Sep 17 00:00:00 2001
From: Daniel Bauer <4690162+dnlbauer@users.noreply.github.com>
Date: Sun, 14 May 2023 12:51:05 +0200
Subject: [PATCH] use a zephyr 3.2 branch with split encoder support (#5)

* revert to main

* fix actions

* test

* reset to sys_reset
---
 .github/workflows/build.yml |  2 +-
 config/sofle.keymap         |  4 ++--
 config/west.yml             | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afff3be..cd163e2 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@1e98ea0afbbcc9bc8bcb1057a5290e0d4b1d594e
+    uses: tklzg/zmk/.github/workflows/build-user-config.yml@encoder
diff --git a/config/sofle.keymap b/config/sofle.keymap
index 7807951..05df950 100644
--- a/config/sofle.keymap
+++ b/config/sofle.keymap
@@ -50,7 +50,7 @@
             label = "tdrstl";
             #binding-cells = <0>;
             tapping-term-ms = <TAPTERM>;
-            bindings = <&kp F5>, <&reset>;
+            bindings = <&kp F5>, <&sys_reset>;
         };
         
         tdblclear: tdblclear {
@@ -66,7 +66,7 @@
             label = "tdrstr";
             #binding-cells = <0>;
             tapping-term-ms = <TAPTERM>;
-            bindings = <&kp F6>, <&reset>;
+            bindings = <&kp F6>, <&sys_reset>;
         };
         
         tdcaps: tdcaps {
diff --git a/config/west.yml b/config/west.yml
index b38ce04..4683bc4 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -6,18 +6,18 @@ manifest:
       url-base: https://github.com/infused-kim
     - name: dnlbauer
       url-base: https://github.com/dnlbauer
+    - name: tklzg
+      url-base: https://github.com/tklzg
   projects:
     - name: zmk
-      remote: dnlbauer
-      revision: waterfowl-encoders
       import: app/west.yml
-   #- name: zmk
+   #  remote: dnlbauer
+   #  revision: waterfowl-encoders
+      remote: tklzg
+      revision: encoder
    #  remote: infused-kim
    #  revision: sofle
-   #  import: app/west.yml
-   #- name: zmk
    #  remote: zmkfirmware
    #  revision: main
-   #  import: app/west.yml
   self:
     path: config