fix

Author: Di

.gitignore

@@ -6,4 +6,5 @@ zmk_*
 venv
 .env
 zephyr
-modules
+modules
+build

boards/shields/azoteq_sofle/azoteq_sofle_left.overlay

@@ -1,11 +1,5 @@
 if SHIELD_AZOTEQ_SOFLE_LEFT || SHIELD_AZOTEQ_SOFLE_RIGHT
 
-#config AZOTEQ_SOFLE_FEATURES
-#    bool
-#    default y
-#    select ZMK_WPM
-#    select ZMK_KEYCODE_EVENTS
-
 config ZMK_KEYBOARD_NAME
     default "Stelmakh"
 

boards/shields/azoteq_sofle/azoteq_sofle_right.overlay

@@ -0,0 +1,31 @@
+&pinctrl {
+
+    spi3_default: spi3_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 12)>; // WS2812_VEXT_DATA - old (SPIM_MOSI, 0, 6)
+        };
+    };
+
+    spi3_sleep: spi3_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_MOSI, 1, 12)>;
+            low-power-enable;
+        };
+    };
+
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>; // OLD: (TWIM_SDA, 0, 22) | (TWIM_SCL, 0, 24)
+        };
+    };
+
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+            low-power-enable;
+        };
+    };
+
+};

…s/shields/azoteq_sofle/Kconfig.defconfig …s/shields/azoteq_sofle/Kconfig.defconfigboards/shields/azoteq_sofle/Kconfig.defconfig renamed to config/boards/shields/azoteq_sofle/Kconfig.defconfig boards/shields/azoteq_sofle/Kconfig.defconfig renamed to config/boards/shields/azoteq_sofle/Kconfig.defconfig

@@ -2,103 +2,14 @@
 #include <dt-bindings/led/led.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <dt-bindings/pinctrl/nrf-pinctrl.h>
+
 #include "azoteq_sofle-layouts.dtsi"
+#include "azoteq_sofle-pinctrl.dtsi"
 
 &azoteq_sofle_layout {
     transform = <&default_transform>;
 };
 
-&pinctrl {
-    i2c0_rewired_default: i2c0_rewired_default {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 0, 22)>,
-                    <NRF_PSEL(TWIM_SCL, 0, 24)>;
-        };
-    };
-
-    i2c0_rewired_sleep: i2c0_rewired_sleep {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 0, 22)>,
-                    <NRF_PSEL(TWIM_SCL, 0, 24)>;
-            low-power-enable;
-        };
-    };
-
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    status = "okay";
-    compatible = "nordic,nrf-spim";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <1000000>;
-
-        /* WS2812 */
-        chain-length = <7>; /* 6 LEDs on dongle - just for initialization */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-    };
-};
-
-&i2c0 {
-    status = "okay";
-    clock-frequency = <I2C_BITRATE_FAST>;
-
-    /* Use rewired pins for I2C0 */
-    pinctrl-0 = <&i2c0_rewired_default>;
-    pinctrl-1 = <&i2c0_rewired_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    tps43: iqs5xx@74 {
-        status = "disabled";
-        compatible = "azoteq,iqs5xx";
-        reg = <0x74>;
-
-        one-finger-tap;
-        press-and-hold;
-        press-and-hold-time = <250>;
-        two-finger-tap;
-
-        scroll;
-        natural-scroll-y;
-        natural-scroll-x;
-
-        bottom-beta = <5>;
-        stationary-threshold = <5>;
-
-        flip-y;
-
-        /* Correct GPIO mapping for Nice Nano v2 physical connections:
-         * RST - P1.11 (Nice Nano pin 1.11) - D14
-         * RDY - P1.13 (Nice Nano pin 1.13) - D15
-         */
-        reset-gpios = <&pro_micro 14 GPIO_ACTIVE_LOW>;
-        rdy-gpios = <&pro_micro 15 GPIO_ACTIVE_HIGH>;
-
-    };
-};
 
 / {
     chosen {
@@ -110,8 +21,8 @@
 
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
-        columns = <16>;
-        rows = <4>;
+        columns = <14>;
+        rows = <5>;
         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)
@@ -121,25 +32,87 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
         >;
     };
 
-    tps43_input: tps43_input {
-        compatible = "zmk,input-listener";
-        device = <&tps43>;
-    };
-
     kscan0: kscan {
         wakeup-source;
         diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
     };
 
     left_encoder: encoder_left {
+        status = "disabled";
         compatible = "alps,ec11";
+        label = "LEFT_ENCODER";
+        resolution = <4>;
+        steps = <40>;
         a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
         b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
-        status = "disabled";
+    };
+
+    sensors {
+		compatible = "zmk,keymap-sensors";
+		sensors = <&left_encoder>;
+	};
+
+    ext-power {
+        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
+        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+         init-delay-ms = <50>;
     };
 
     vbatt: vbatt {
         compatible = "zmk,battery-nrf-vddh";
+        init-delay-ms = <50>;
+    };
+
+};
+
+&adc {
+    status = "okay";
+};
+
+&gpiote {
+    status = "okay";
+};
+
+&gpio0 {
+    status = "okay";
+};
+
+&gpio1 {
+    status = "okay";
+};
+
+&usbd {
+    status = "okay";
+};
+
+
+&spi3 {
+    status = "okay";
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
+    pinctrl-names = "default", "sleep";
+
+    led_strip: ws2812@0 {
+        compatible = "worldsemi,ws2812-spi";
+
+        /* SPI */
+        reg = <0>; /* ignored, but necessary for SPI bindings */
+        spi-max-frequency = <1000000>;
+
+        /* WS2812 */
+        chain-length = <7>; /* 6 LEDs on dongle - just for initialization */
+        spi-one-frame = <0x70>;
+        spi-zero-frame = <0x40>;
+
+        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
     };
 };