From 460af0795518b34b3710b2252de07bd045beee05 Mon Sep 17 00:00:00 2001
From: bullwinkle3000 <91431084+bullwinkle3000@users.noreply.github.com>
Date: Thu, 10 Oct 2024 14:08:48 -0400
Subject: [PATCH] Finalizing

---
 .idea/workspace.xml                        | 29 +++++++++++-----------
 config/boards/shields/wyld_dm/wyld_dm.dtsi |  8 +++---
 config/wyld_dm.conf                        |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1615d5a..3c46175 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,11 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d457d5e-e2b1-4395-864b-ea86737e1c8a" name="Changes" comment="My driver fork with 1s sensor init delay">
+    <list default="true" id="9d457d5e-e2b1-4395-864b-ea86737e1c8a" name="Changes" comment="Stealing back a pin">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm.dtsi" beforeDir="false" afterPath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm.dtsi" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm_left.overlay" beforeDir="false" afterPath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm_left.overlay" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm_right.overlay" beforeDir="false" afterPath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm_right.overlay" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/info.json" beforeDir="false" afterPath="$PROJECT_DIR$/config/info.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/wyld_dm.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/wyld_dm.conf" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -139,14 +140,6 @@
       <workItem from="1728406145951" duration="697000" />
       <workItem from="1728482843239" duration="1376000" />
     </task>
-    <task id="LOCAL-00149" summary="column tweaks">
-      <option name="closed" value="true" />
-      <created>1724191881870</created>
-      <option name="number" value="00149" />
-      <option name="presentableId" value="LOCAL-00149" />
-      <option name="project" value="LOCAL" />
-      <updated>1724191881870</updated>
-    </task>
     <task id="LOCAL-00150" summary="new branch to migrate">
       <option name="closed" value="true" />
       <created>1724193225464</created>
@@ -531,7 +524,15 @@
       <option name="project" value="LOCAL" />
       <updated>1728491679779</updated>
     </task>
-    <option name="localTasksCounter" value="198" />
+    <task id="LOCAL-00198" summary="Stealing back a pin">
+      <option name="closed" value="true" />
+      <created>1728565132193</created>
+      <option name="number" value="00198" />
+      <option name="presentableId" value="LOCAL-00198" />
+      <option name="project" value="LOCAL" />
+      <updated>1728565132193</updated>
+    </task>
+    <option name="localTasksCounter" value="199" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -593,7 +594,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="rotate sensor 180 degrees" />
     <MESSAGE value="Disable logging" />
     <MESSAGE value="RGB keys" />
     <MESSAGE value="trying same channel" />
@@ -618,7 +618,8 @@
     <MESSAGE value="Trying different motion pin" />
     <MESSAGE value="extra sensor logging?" />
     <MESSAGE value="My driver fork with 1s sensor init delay" />
-    <option name="LAST_COMMIT_MESSAGE" value="My driver fork with 1s sensor init delay" />
+    <MESSAGE value="Stealing back a pin" />
+    <option name="LAST_COMMIT_MESSAGE" value="Stealing back a pin" />
   </component>
   <component name="WfRunsListSearchHistory">{
   &quot;history&quot;: [
diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi
index 97ef553..c096da4 100644
--- a/config/boards/shields/wyld_dm/wyld_dm.dtsi
+++ b/config/boards/shields/wyld_dm/wyld_dm.dtsi
@@ -77,8 +77,8 @@
     left_encoder: encoder_left {
 		compatible = "alps,ec11";
 		label = "LEFT_ENCODER";
-		a-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		a-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 		steps = <60>;
 		status = "disabled";
 	};
@@ -86,8 +86,8 @@
 	right_encoder: encoder_right {
 		compatible = "alps,ec11";
 		label = "RIGHT_ENCODER";
-		a-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		a-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 		steps = <60>;
 		status = "disabled";
 	};
diff --git a/config/wyld_dm.conf b/config/wyld_dm.conf
index e6a1a96..daa876b 100644
--- a/config/wyld_dm.conf
+++ b/config/wyld_dm.conf
@@ -34,7 +34,7 @@ CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=180000
 # CONFIG_BT_L2CAP_TX_BUF_COUNT=32
 
 # CONFIG_ZMK_USB_LOGGING=y
-CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=3000
+# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=3000
 
 
 CONFIG_ZMK_RGB_UNDERGLOW=y