copied stuff from Altenswoop

charludo · Oct 15, 2023 · 18a675e · 18a675e
1 parent 2f3d53c
commit 18a675e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/build.yaml b/build.yaml
@@ -17,5 +17,5 @@ include:
     shield: arkenswoop_left
   - board: nice_nano_v2
     shield: arkenswoop_right
-  - board: nice_nano_v2
-    shield: settings_reset
+  # - board: nice_nano_v2
+  #   shield: settings_reset
diff --git a/config/arkenswoop.keymap b/config/arkenswoop.keymap
@@ -9,7 +9,6 @@
  */
 
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/mouse.h>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/outputs.h>
@@ -346,7 +345,9 @@
                   &none  &symbol_activate 2 2  &nav_activate 3 SPACE  &shift_activate LSHIFT 0  &num_activate 1 0  &none
             >;
 
-            sensor-bindings = <&inc_dec_kp C D>;
+            sensor-bindings =
+                <&inc_dec_kp C_AC_SCROLL_UP C_AC_SCROLL_DOWN>,
+                <&inc_dec_kp K_VOLUME_UP K_VOLUME_DOWN>;
         };
 
         numbers {
@@ -357,7 +358,9 @@
                           &trans        &trans       &trans  &trans     &trans  &trans
             >;
 
-            sensor-bindings = <&inc_dec_kp DOWN_ARROW UP_ARROW>;
+            sensor-bindings =
+                <&inc_dec_kp PAGE_UP PAGE_DOWN>,
+                <&inc_dec_kp LG(LS(Z)) LG(Z)>;
         }; 
 
         symbols {
@@ -369,6 +372,9 @@
             >;
 
             sensor-bindings = <&inc_dec_kp DOWN_ARROW UP_ARROW>;
+            sensor-bindings =
+                <&inc_dec_kp LG(RIGHT) LG(LEFT)>,
+                <&inc_dec_kp TAB LS(TAB)>;
         };
 
         navigation {
@@ -379,7 +385,7 @@
                          &kp K_PREVIOUS  &trans         &trans     &trans  &trans      &kp K_NEXT
             >;
 
-            sensor-bindings = <&inc_dec_kp DOWN_ARROW UP_ARROW>;
+            sensor-bindings = <&inc_dec_kp F24 F24>, <&inc_dec_kp F15 F14>;
         };
 
         function {
@@ -390,7 +396,7 @@
                          &kp K_MUTE  &none         &none              &none  &none   &none
             >;
 
-            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
+            sensor-bindings = <&inc_dec_kp F24 F24>, <&inc_dec_kp F15 F14>;
         };
     };
 };

diff --git a/config/boards/shields/arkenswoop/arkenswoop.dtsi b/config/boards/shields/arkenswoop/arkenswoop.dtsi
@@ -41,24 +41,24 @@ 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)
     left_encoder: encoder_left {
         compatible = "alps,ec11";
         label = "LEFT_ENCODER";
-        a-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        a-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         steps = <16>;
-        status = "okay";
+        status = "disabled";
     };
 
     right_encoder: encoder_right {
         compatible = "alps,ec11";
         label = "RIGHT_ENCODER";
-        a-gpios = <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        a-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         steps = <16>;
-        status = "okay";
+        status = "disabled";
     };
 
     sensors {
         compatible = "zmk,keymap-sensors";
-        sensors = <&left_encoder>;
+        sensors = <&left_encoder &right_encoder>;
         triggers-per-rotation = <16>;
     };
 };

diff --git a/config/boards/shields/arkenswoop/arkenswoop_left.overlay b/config/boards/shields/arkenswoop/arkenswoop_left.overlay
@@ -7,6 +7,7 @@
 #include "arkenswoop.dtsi"
 
 &kscan0 {
+    diode-direction = "col2row";
     col-gpios
         = <&pro_micro 15 GPIO_ACTIVE_HIGH>
         , <&pro_micro 18 GPIO_ACTIVE_HIGH>

diff --git a/config/boards/shields/arkenswoop/arkenswoop_right.overlay b/config/boards/shields/arkenswoop/arkenswoop_right.overlay
@@ -11,6 +11,7 @@
 };
 
 &kscan0 {
+    diode-direction = "col2row";
     col-gpios
         = <&pro_micro 21 GPIO_ACTIVE_HIGH>
         , <&pro_micro 20 GPIO_ACTIVE_HIGH>

diff --git a/config/west.yml b/config/west.yml
@@ -1,10 +1,11 @@
 manifest:
   remotes:
-    - name: urob
-      url-base: https://github.com/urob
+    # zmk official
+    - name: zmkfirmware
+      url-base: https://github.com/zmkfirmware
   projects:
     - name: zmk
-      remote: urob
+      remote: zmkfirmware
       revision: main
       import: app/west.yml
   self: