steve's branch

bullwinkle3000 · Oct 2, 2024 · fa3bfd5 · fa3bfd5
1 parent 6783d1e
commit fa3bfd5
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 167 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi
@@ -32,7 +32,7 @@
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
         columns = <12>;
-        rows = <6>;
+        rows = <5>;
 // | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |                 | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |
 // | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |                 | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |
 // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |                 | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |
@@ -50,15 +50,15 @@
 //                                                RC(5,5) RC(5,6)
 //        >;
 
+		// 4x6 mini
                 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(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(4,4)  RC(4,7) 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,2) RC(4,3)                                                  RC(4,8) RC(4,9)
-                                     RC(5,2) RC(5,1)                     RC(5,8)
-                                       RC(5,4) RC(5,0)                 RC(5,7)
-                                         RC(5,3) RC(5,6)             RC(5,6)
+    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,2) RC(4,1) RC(4,0)    RC(4,6) RC(4,7) RC(4,8)
+                                             RC(4,4) RC(4,3)    RC(4,9) RC(4,10)
+
 
         >;
     };
@@ -76,34 +76,10 @@
             , <&gpio1 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.07
 			, <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.02
 			, <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.03
-			, <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>  // 1.04
             ;
 
     };
 
-    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)>;
-		steps = <60>;
-		status = "disabled";
-	};
-
-	right_encoder: encoder_right {
-		compatible = "alps,ec11";
-		label = "RIGHT_ENCODER";
-		a-gpios = <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		steps = <60>;
-		status = "disabled";
-	};
-
-    sensors: sensors {
-        compatible = "zmk,keymap-sensors";
-        sensors = <&right_encoder>, <&left_encoder>;
-        triggers-per-rotation = <15>;
-    };
 };
 
 &pinctrl {

diff --git a/config/boards/shields/wyld_dm/wyld_dm_left.overlay b/config/boards/shields/wyld_dm/wyld_dm_left.overlay
@@ -43,9 +43,7 @@ nice_view_spi: &spi0 {
     cs-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
 };
 
-&left_encoder {
-	status = "okay";
-};
+
 
 
 
diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.conf b/config/boards/shields/wyld_dm/wyld_dm_right.conf
@@ -4,19 +4,19 @@ CONFIG_PINCTRL=y
 CONFIG_SPI=y
 CONFIG_INPUT=y
 
-CONFIG_PMW3610=y
-CONFIG_PMW3610_CPI=2400
-CONFIG_PMW3610_CPI_DIVIDOR=4
-CONFIG_PMW3610_ORIENTATION_90=y
-CONFIG_PMW3610_SNIPE_CPI=800
-CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4
-CONFIG_PMW3610_SCROLL_TICK=32
-CONFIG_PMW3610_INVERT_X=y
-CONFIG_PMW3610_AUTOMOUSE_TIMEOUT_MS=750
-
-CONFIG_PMW3610_POLLING_RATE_125_SW=y
-
-CONFIG_PMW3610_SMART_ALGORITHM=y
+# CONFIG_PMW3610=y
+# CONFIG_PMW3610_CPI=2400
+# CONFIG_PMW3610_CPI_DIVIDOR=4
+# CONFIG_PMW3610_ORIENTATION_90=y
+# CONFIG_PMW3610_SNIPE_CPI=800
+# CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4
+# CONFIG_PMW3610_SCROLL_TICK=32
+# CONFIG_PMW3610_INVERT_X=y
+# CONFIG_PMW3610_AUTOMOUSE_TIMEOUT_MS=750
+#
+# CONFIG_PMW3610_POLLING_RATE_125_SW=y
+#
+# CONFIG_PMW3610_SMART_ALGORITHM=y
 
 
 
diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.overlay b/config/boards/shields/wyld_dm/wyld_dm_right.overlay
@@ -22,9 +22,6 @@
 			;
 };
 
-&right_encoder {
-	status = "okay";
-};
 
 &pinctrl {
     spi0_default: spi0_default {
@@ -47,29 +44,12 @@
 nice_view_spi: &spi0 {
   compatible = "nordic,nrf-spim";
   status = "okay";
-
   pinctrl-0 = <&spi0_default>;
   pinctrl-1 = <&spi0_sleep>;
   pinctrl-names = "default", "sleep";
-  cs-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, <&gpio0 6 GPIO_ACTIVE_LOW>;
-  trackball: trackball@1 {
-      status = "okay";
-      compatible = "pixart,pmw3610";
-      reg = <1>;
-      spi-max-frequency = <2000000>;
-      irq-gpios = <&gpio0 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-//      snipe-layers = <1>;
-//      scroll-layers = <2>;
-//      automouse-layer = <3>;
-  };
+  cs-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
 };
 
 
-/ {
-  pmw3610_listener {
-    compatible = "zmk,input-listener";
-    device = <&trackball>;
-  };
-};
 
 
diff --git a/config/west.yml b/config/west.yml
@@ -1,28 +1,11 @@
-#manifest:
-#  remotes:
-#    - name: zmkfirmware
-#      url-base: https://github.com/zmkfirmware
-#  projects:
-#    - name: zmk
-#      remote: zmkfirmware
-#      revision: main
-#      import: app/west.yml
-#  self:
-#    path: config
-
 manifest:
   remotes:
     - name: zmkfirmware
-      url-base: https://github.com/petejohanson
-    - name: inorichi
-      url-base: https://github.com/inorichi
+      url-base: https://github.com/zmkfirmware
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: feat/pointers-move-scroll
-      import: app/west.yml
-    - name: zmk-pmw3610-driver
-      remote: inorichi
       revision: main
+      import: app/west.yml
   self:
-    path: config
+    path: config
diff --git a/config/wyld_dm.conf b/config/wyld_dm.conf
@@ -1,4 +1,4 @@
-CONFIG_ZMK_KEYBOARD_NAME="wyld_5x6_track"
+CONFIG_ZMK_KEYBOARD_NAME="wyld_4x6_mini"
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_ZMK_EXT_POWER=y
 # CONFIG_BT_LL_SW_LLCP_LEGACY=y
@@ -14,7 +14,7 @@ CONFIG_ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS=10
 
 CONFIG_PINCTRL=y
 CONFIG_GPIO=y
-CONFIG_I2C=y
+# CONFIG_I2C=y
 CONFIG_SPI=y
 # CONFIG_INPUT=y
 
@@ -45,8 +45,8 @@ CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
 CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
 CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=2
 # #
-CONFIG_EC11=y
-CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+# CONFIG_EC11=y
+# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 #enable displays
 # CONFIG_ZMK_DISPLAY=y