From 9d15593d48d6277e5793b73edc8da5e895ee7ddb Mon Sep 17 00:00:00 2001
From: bullwinkle3000 <91431084+bullwinkle3000@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:38:28 -0500
Subject: [PATCH] dtsi issue

---
 .idea/workspace.xml                        | 30 ++++++--------
 config/boards/shields/wyld_dm/wyld_dm.dtsi | 48 +++++++++++++---------
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5366f25..8bb2a99 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,12 +9,8 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d457d5e-e2b1-4395-864b-ea86737e1c8a" name="Changes" comment="blackpill_i2c">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/boards/pillbug.overlay" beforeDir="false" afterPath="$PROJECT_DIR$/config/boards/pillbug.overlay" afterDir="false" />
+    <list default="true" id="9d457d5e-e2b1-4395-864b-ea86737e1c8a" name="Changes" comment="Keymap maybe and back to i2c on OLED">
       <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.keymap" beforeDir="false" afterPath="$PROJECT_DIR$/config/boards/shields/wyld_dm/wyld_dm.keymap" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/wyld_dm.keymap" beforeDir="false" afterPath="$PROJECT_DIR$/config/wyld_dm.keymap" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -86,15 +82,7 @@
       <workItem from="1705183725119" duration="2470000" />
       <workItem from="1705216076760" duration="8622000" />
       <workItem from="1705601074856" duration="597000" />
-      <workItem from="1705678784246" duration="3124000" />
-    </task>
-    <task id="LOCAL-00045" summary="mismatch in motion/irq pin">
-      <option name="closed" value="true" />
-      <created>1704667470519</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1704667470519</updated>
+      <workItem from="1705678784246" duration="3412000" />
     </task>
     <task id="LOCAL-00046" summary="remove &amp;trackball setting">
       <option name="closed" value="true" />
@@ -480,7 +468,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705265827064</updated>
     </task>
-    <option name="localTasksCounter" value="94" />
+    <task id="LOCAL-00094" summary="Keymap maybe and back to i2c on OLED">
+      <option name="closed" value="true" />
+      <created>1705681969874</created>
+      <option name="number" value="00094" />
+      <option name="presentableId" value="LOCAL-00094" />
+      <option name="project" value="LOCAL" />
+      <updated>1705681969875</updated>
+    </task>
+    <option name="localTasksCounter" value="95" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -542,7 +538,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="typo" />
     <MESSAGE value="Trying spi2 instead of 3" />
     <MESSAGE value="Rely on chosen in dtsi" />
     <MESSAGE value="dummy sck pins" />
@@ -567,6 +562,7 @@
     <MESSAGE value="Try another couple of pins" />
     <MESSAGE value="Adjusted pins for columns and underglow." />
     <MESSAGE value="Reworked Pillbug pins and testing OLED again." />
-    <option name="LAST_COMMIT_MESSAGE" value="Reworked Pillbug pins and testing OLED again." />
+    <MESSAGE value="Keymap maybe and back to i2c on OLED" />
+    <option name="LAST_COMMIT_MESSAGE" value="Keymap maybe and back to i2c on OLED" />
   </component>
 </project>
\ No newline at end of file
diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi
index c3aada7..c8524b9 100644
--- a/config/boards/shields/wyld_dm/wyld_dm.dtsi
+++ b/config/boards/shields/wyld_dm/wyld_dm.dtsi
@@ -2,25 +2,25 @@
 #include <dt-bindings/led/led.h>
 
 
-wyld_dm_6x6 = <
-    RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)               RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
-    RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)               RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
-    RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)               RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
-    RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)               RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-    RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)               RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11)
-                    RC(5,2) RC(5,3)      RC(5,4) RC(5,5)      RC(5,6) RC(5,7)     RC(5,8) RC(5,9)
-                         RC(6,2) RC(6,3) RC(6,4) RC(6,5)      RC(6,6) RC(6,7) RC(6,8) RC(6,9)
-        >;
-
-wyld_dm_5x7 = <
-    RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6)                     RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
-    RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6)                     RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
-    RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(5,1)   RC(5, 10) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
-    RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6)                     RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13)
-    RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)                                                     RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13)
-                                        RC(5,2) RC(5,3) RC(5,4)           RC(5,7) RC(5,8) RC(5,9)
-                                                RC(5,5) RC(5,6)
-        >;
+//wyld_dm_6x6 = <
+//    RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)               RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11)
+//    RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)               RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
+//    RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)               RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)
+//    RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)               RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
+//    RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)               RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11)
+//                    RC(5,2) RC(5,3)      RC(5,4) RC(5,5)      RC(5,6) RC(5,7)     RC(5,8) RC(5,9)
+//                         RC(6,2) RC(6,3) RC(6,4) RC(6,5)      RC(6,6) RC(6,7) RC(6,8) RC(6,9)
+//        >;
+//
+//wyld_dm_5x7 = <
+//    RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6)                     RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
+//    RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6)                     RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
+//    RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(5,1)   RC(5, 10) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+//    RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6)                     RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13)
+//    RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)                                                     RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13)
+//                                        RC(5,2) RC(5,3) RC(5,4)           RC(5,7) RC(5,8) RC(5,9)
+//                                                RC(5,5) RC(5,6)
+//        >;
 
 / {
     chosen {
@@ -40,7 +40,15 @@ wyld_dm_5x7 = <
 // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 |                 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 |
 // | SW30 | SW29 | SW28 | SW27 | SW26 | SW25 |                 | SW25 | SW26 | SW27 | SW28 | SW29 | SW30 |
 //
-        map = wyld_dm_5x7;
+        map = <
+    RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6)                     RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
+    RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6)                     RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
+    RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(5,1)   RC(5, 10) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+    RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6)                     RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13)
+    RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)                                                     RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13)
+                                        RC(5,2) RC(5,3) RC(5,4)           RC(5,7) RC(5,8) RC(5,9)
+                                                RC(5,5) RC(5,6)
+        >;
     };
 
     kscan0: kscan_0 {