studio support

.github/workflows/build.yml

@@ -2,25 +2,10 @@ name: Build ZMK firmware
 on:
   workflow_dispatch:
   push:
-    paths:
+    paths-ignore:
-      - "config/**"
+      - "keymap-drawer/**"
 
 jobs:
   build:
     uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
-  draw:
-    uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
-    permissions:
-      contents: write
-    with:
-      commit_message: "[Draw] ${{ github.event.head_commit.message }}"
-      amend_commit: false
-      install_branch: "main"
-      keymap_patterns: "config/*.keymap"
-      json_path: "config"
-      config_path: "keymap_drawer.config.yaml" # config file, ignored if not exists
-      output_folder: "keymap-drawer"
-      destination: "both"
-      parse_args: ""  # map of extra args to pass to `keymap parse`, e.g. "corne:'-l Def Lwr Rse' cradio:''"
-      draw_args: ""   # map of extra args to pass to `keymap draw`, e.g. "corne:'-k corne_rotated' cradio:'-k paroxysm'"
 

.github/workflows/draw.yml

@@ -0,0 +1,18 @@
+name: Draw Keymap
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "config/**"
+      - .github/workflows/draw.yml
+      - keymap_drawer.config.yaml
+
+jobs:
+  draw:
+    uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
+    permissions:
+      contents: write
+    with:
+      commit_message: "[Draw] ${{ github.event.head_commit.message }}"
+      destination: "commit"
+      fail_on_error: ${{ fromJSON(true) }}

.gitignore

@@ -1,6 +1,5 @@
 build/
 zmk/
-zephyr/
 modules/
 tools/
 .west/

boards/arm/eyelash_sofle/Kconfig.board

@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+config BOARD_EYELASH_SOFLE_LEFT
+    bool "eyelash_sofle left"
+    depends on SOC_NRF52840_QIAA
+
+config BOARD_EYELASH_SOFLE_RIGHT
+    bool "eyelash_sofle right"
+    depends on SOC_NRF52840_QIAA

boards/arm/eyelash_sofle/Kconfig.defconfig

@@ -1,23 +1,35 @@
 #
-# Copyright (c) 2022 Darryl deHaan
+# Copyright (c) 2024 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 #
 
-if BOARD_SOFLE_LEFT
+if BOARD_EYELASH_SOFLE_LEFT
 
 config ZMK_KEYBOARD_NAME
-    default "Sofle"
+    default "Eyelash Sofle"
 
 config ZMK_SPLIT_ROLE_CENTRAL
     default y
 
-endif # BOARD_SOFLE_LEFT
+endif # BOARD_EYELASH_SOFLE_LEFT
 
 
-if BOARD_SOFLE_LEFT || BOARD_SOFLE_RIGHT
+if BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT
 
 config BOARD
-    default "sofle"
+    default "eyelash_sofle"
+
+config BOARD_ENABLE_DCDC
+    bool "Enable DCDC mode"
+    select SOC_DCDC_NRF52X
+    default y
+    depends on (BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT)
+
+config BOARD_ENABLE_DCDC_HV
+    bool "Enable High Voltage DCDC converter"
+    default y
+    select SOC_DCDC_NRF52X_HV
+    depends on (BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT)
 
 config ZMK_SPLIT
     default y
@@ -66,8 +78,6 @@ endchoice
 
 endif
 
-endif # BOARD_SOFLE_LEFT || BOARD_SOFLE_RIGHT
-
 if ZMK_BACKLIGHT
 
 config PWM
@@ -78,15 +88,4 @@ config LED_PWM
 
 endif # ZMK_BACKLIGHT
 
-config BOARD_ENABLE_DCDC
+endif # BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on (BOARD_SOFLE_LEFT || BOARD_SOFLE_RIGHT)
-
-config BOARD_ENABLE_DCDC_HV
-    bool "Enable High Voltage DCDC converter"
-    default y
-    select SOC_DCDC_NRF52X_HV
-    depends on (BOARD_SOFLE_LEFT || BOARD_SOFLE_RIGHT)
-

boards/arm/eyelash_sofle/eyelash_sofle-layouts.dtsi

@@ -0,0 +1,75 @@
+#include <physical_layouts.dtsi>
+
+/ {
+    eyelash_sofle_layout: eyelash_sofle_layout {
+        compatible = "zmk,physical-layout";
+        display-name = "Layout";
+        transform = <&default_transform>;
+        keys  //                     w   h    x    y     rot    rx    ry
+            = <&key_physical_attrs 100 100    0   50       0     0     0>
+            , <&key_physical_attrs 100 100  100   50       0     0     0>
+            , <&key_physical_attrs 100 100  200   12       0     0     0>
+            , <&key_physical_attrs 100 100  300    0       0     0     0>
+            , <&key_physical_attrs 100 100  400   12       0     0     0>
+            , <&key_physical_attrs 100 100  500   12       0     0     0>
+            , <&key_physical_attrs 100 100  775   12       0     0     0>
+            , <&key_physical_attrs 100 100 1050   12       0     0     0>
+            , <&key_physical_attrs 100 100 1150   12       0     0     0>
+            , <&key_physical_attrs 100 100 1250    0       0     0     0>
+            , <&key_physical_attrs 100 100 1350   12       0     0     0>
+            , <&key_physical_attrs 100 100 1450   50       0     0     0>
+            , <&key_physical_attrs 100 100 1550   50       0     0     0>
+            , <&key_physical_attrs 100 100    0  150       0     0     0>
+            , <&key_physical_attrs 100 100  100  150       0     0     0>
+            , <&key_physical_attrs 100 100  200  112       0     0     0>
+            , <&key_physical_attrs 100 100  300  100       0     0     0>
+            , <&key_physical_attrs 100 100  400  112       0     0     0>
+            , <&key_physical_attrs 100 100  500  112       0     0     0>
+            , <&key_physical_attrs 100 100  775  212       0     0     0>
+            , <&key_physical_attrs 100 100 1050  112       0     0     0>
+            , <&key_physical_attrs 100 100 1150  112       0     0     0>
+            , <&key_physical_attrs 100 100 1250  100       0     0     0>
+            , <&key_physical_attrs 100 100 1350  112       0     0     0>
+            , <&key_physical_attrs 100 100 1450  150       0     0     0>
+            , <&key_physical_attrs 100 100 1550  150       0     0     0>
+            , <&key_physical_attrs 100 100    0  250       0     0     0>
+            , <&key_physical_attrs 100 100  100  250       0     0     0>
+            , <&key_physical_attrs 100 100  200  212       0     0     0>
+            , <&key_physical_attrs 100 100  300  200       0     0     0>
+            , <&key_physical_attrs 100 100  400  212       0     0     0>
+            , <&key_physical_attrs 100 100  500  212       0     0     0>
+            , <&key_physical_attrs 100 100  675  112       0     0     0>
+            , <&key_physical_attrs 100 100 1050  212       0     0     0>
+            , <&key_physical_attrs 100 100 1150  212       0     0     0>
+            , <&key_physical_attrs 100 100 1250  200       0     0     0>
+            , <&key_physical_attrs 100 100 1350  212       0     0     0>
+            , <&key_physical_attrs 100 100 1450  250       0     0     0>
+            , <&key_physical_attrs 100 100 1550  250       0     0     0>
+            , <&key_physical_attrs 100 100    0  350       0     0     0>
+            , <&key_physical_attrs 100 100  100  350       0     0     0>
+            , <&key_physical_attrs 100 100  200  312       0     0     0>
+            , <&key_physical_attrs 100 100  300  300       0     0     0>
+            , <&key_physical_attrs 100 100  400  312       0     0     0>
+            , <&key_physical_attrs 100 100  500  312       0     0     0>
+            , <&key_physical_attrs 100 100  875  112       0     0     0>
+            , <&key_physical_attrs 100 100 1050  312       0     0     0>
+            , <&key_physical_attrs 100 100 1150  312       0     0     0>
+            , <&key_physical_attrs 100 100 1250  300       0     0     0>
+            , <&key_physical_attrs 100 100 1350  312       0     0     0>
+            , <&key_physical_attrs 100 100 1450  350       0     0     0>
+            , <&key_physical_attrs 100 100 1550  350       0     0     0>
+            , <&key_physical_attrs 100 100  650  338       0     0     0>
+            , <&key_physical_attrs 100 100  200  412       0     0     0>
+            , <&key_physical_attrs 100 100  300  400       0     0     0>
+            , <&key_physical_attrs 100 100  400  412       0     0     0>
+            , <&key_physical_attrs 100 100  550  412    3000   500   412>
+            , <&key_physical_attrs 100 100  675  362    3000   500   412>
+            , <&key_physical_attrs 100 100  775  112       0     0     0>
+            , <&key_physical_attrs 100 100  875  362 (-3000)  1150   412>
+            , <&key_physical_attrs 100 100 1000  412 (-3000)  1150   412>
+            , <&key_physical_attrs 100 100 1150  412       0     0     0>
+            , <&key_physical_attrs 100 100 1250  400       0     0     0>
+            , <&key_physical_attrs 100 100 1350  412       0     0     0>
+            ;
+    };
+};

boards/arm/eyelash_sofle/eyelash_sofle.dtsi

@@ -10,20 +10,22 @@
 #include <dt-bindings/led/led.h>
 #include <dt-bindings/zmk/matrix_transform.h>
 
+#include "eyelash_sofle-layouts.dtsi"
+
 / {
-    model = "sofle";
+    model = "eyelash_sofle";
-    compatible = "sofle";
+    compatible = "eyelashperipherals,eyelash_sofle";
 
     chosen {
         zephyr,code-partition = &code_partition;
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
         zmk,kscan = &kscan0;
-        zephyr,display = &oled;
+        zmk,battery = &vbatt;
-        zephyr,console = &cdc_acm_uart;
         zmk,underglow = &led_strip;
-        zmk,matrix-transform = &default_transform;
+        zmk,physical-layout = &default_layout;
         zmk,backlight = &backlight;
+        zmk,physical-layout = &eyelash_sofle_layout;
     };
 
 	left_encoder: encoder_left {
@@ -31,6 +33,8 @@
 		label = "LEFT_ENCODER";
 		resolution = <4>;
         steps = <40>;
+        a-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+	    b-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 		status = "disabled";
 	};
 
@@ -39,6 +43,19 @@
 		sensors = <&left_encoder>;
 	};
 
+    kscan0: kscan {
+        compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+        diode-direction = "col2row";
+        row-gpios
+            = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
+    };
+
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
         columns = <14>;
@@ -51,6 +68,25 @@
             RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)  RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,12)
         >;
     };
+
+    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>;
+    };
+
+    backlight: pwmleds {
+        compatible = "pwm-leds";
+        pwm_led_0 {
+            pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_NORMAL>;
+        };
+    };
 };
 
 &adc {
@@ -113,21 +149,6 @@
 };
 
 &pinctrl {
-    i2c0_default: i2c0_default {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-                <NRF_PSEL(TWIM_SCL, 0, 20)>;
-        };
-    };
-
-    i2c0_sleep: i2c0_sleep {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-                <NRF_PSEL(TWIM_SCL, 0, 20)>;
-            low-power-enable;
-        };
-    };
-
     spi3_default: spi3_default {
         group1 {
             psels = <NRF_PSEL(SPIM_MOSI, 1, 12)>; // WS2812_VEXT_DATA
@@ -140,29 +161,34 @@
             low-power-enable;
         };
     };
+
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+        };
     };
 
-&i2c0 {
+    spi0_sleep: spi0_sleep {
-	status = "okay";
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
+                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
+                <NRF_PSEL(SPIM_MISO, 0, 25)>;
+            low-power-enable;
+        };
+    };
 
-	compatible = "nordic,nrf-twi";
+    pwm0_default: pwm0_default {
-	pinctrl-0 = <&i2c0_default>;
+        group1 {
-	pinctrl-1 = <&i2c0_sleep>;
+            psels = <NRF_PSEL(PWM_OUT0, 1, 13)>;
-	pinctrl-names = "default", "sleep";
+        };
-	oled: ssd1306@3c {
+    };
-		compatible = "solomon,ssd1306fb";
+    pwm0_sleep: pwm0_sleep {
-		reg = <0x3c>;
+        group1 {
-		label = "DISPLAY";
+            psels = <NRF_PSEL(PWM_OUT0, 1, 13)>;
-		width = <128>;
+            low-power-enable;
-		height = <32>;
+        };
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		multiplex-ratio = <31>;
-		segment-remap;
-		com-invdir;
-		com-sequential;
-		prechargep = <0x22>;
     };
 };
 
@@ -189,9 +215,23 @@
         color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
     };
 };
+
 &pwm0 {
     status = "okay";
     pinctrl-0 = <&pwm0_default>;
     pinctrl-1 = <&pwm0_sleep>;
     pinctrl-names = "default", "sleep";
 };
+
+zephyr_udc0: &usbd {
+    compatible = "nordic,nrf-usbd";
+    status = "okay";
+};
+
+nice_view_spi: &spi0 {
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&spi0_default>;
+    pinctrl-1 = <&spi0_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+};

boards/arm/eyelash_sofle/eyelash_sofle.keymap

@@ -1,4 +1,3 @@
-#include <behaviors/mouse_keys.dtsi>
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
@@ -6,14 +5,23 @@
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/rgb.h>
 
+#include <input/processors.dtsi>
+
+/*
+
+   &mmv_input_listener {
+       input-processors = <&zip_xy_scaler 2 1>;
+   };
+
+   &msc_input_listener {
+       input-processors = <&zip_xy_scaler 2 1>;
+   };
+
+ */
+
 #define ZMK_MOUSE_DEFAULT_MOVE_VAL 1200  // 600
 #define ZMK_MOUSE_DEFAULT_SCRL_VAL 20    // 10
-#define U_MS_U &mmv MOVE_UP
+
-#define U_MS_D &mmv MOVE_DOWN
-#define U_MS_L &mmv MOVE_LEFT
-#define U_MS_R &mmv MOVE_RIGHT
-#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1200  //  600
-#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20    // 10
 
 / {
     behaviors {
@@ -70,7 +78,7 @@
         layer_2 {
             bindings = <
 &kp TILDE  &bt BT_SEL 0  &bt BT_SEL 1    &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4    &mmv MOVE_UP     &kp F6  &kp F7  &kp F8      &kp F9     &kp F10      &trans
-&trans     &bt BT_CLR    &bt BT_CLR_ALL  &trans        &trans        &trans          &mmv MOVE_DOWN   &trans  &trans  &kp F11     &kp F12    &kp UNDER    &kp PLUS
+&studio_unlock      &bt BT_CLR    &bt BT_CLR_ALL  &trans        &trans        &trans          &mmv MOVE_DOWN   &trans  &trans  &kp F11     &kp F12    &kp UNDER    &kp PLUS
 &trans     &out OUT_USB  &out OUT_BLE    &trans        &trans        &trans          &mmv MOVE_LEFT   &trans  &trans  &trans      &trans     &kp LBRC     &kp RBRC
 &trans     &sys_reset    &trans          &bootloader   &trans        &trans          &mmv MOVE_RIGHT  &trans  &trans  &sys_reset  &soft_off  &bootloader  &trans
 &trans     &trans        &trans          &trans        &trans        &trans          &mkp LCLK        &trans  &trans  &trans      &trans     &trans

boards/arm/eyelash_sofle/eyelash_sofle.yaml

@@ -1,6 +1,6 @@
-identifier: sofle
+identifier: eyelash_sofle
-name: Solfe
+name: Eyelash Sofle
-url: https://github.com/tokyo2006/zmk-config-sofle
+url: https://github.com/a741725193/zmk-sofle
 type: mcu
 arch: arm
 toolchain:

boards/arm/eyelash_sofle/eyelash_sofle.zmk.yml

@@ -0,0 +1,15 @@
+file_format: "1"
+id: eyelash_sofle
+name: Eyelash Sofle
+url: https://github.com/a741725193/zmk-sofle
+type: board
+arch: arm
+features:
+  - keys
+  - display
+outputs:
+  - usb
+  - ble
+siblings:
+  - eyelash_sofle_left
+  - eyelash_sofle_right

boards/arm/eyelash_sofle/eyelash_sofle_left.dts

@@ -0,0 +1,25 @@
+/*
+*
+* Copyright (c) 2021 Darryl deHaan
+* SPDX-License-Identifier: MIT
+*
+*/
+
+#include "eyelash_sofle.dtsi"
+
+&kscan0 {
+     col-gpios
+        = <&gpio0 22 GPIO_ACTIVE_HIGH>
+         , <&gpio0 29 GPIO_ACTIVE_HIGH>
+         , <&gpio0 3 GPIO_ACTIVE_HIGH>
+         , <&gpio0 28 GPIO_ACTIVE_HIGH>
+         , <&gpio0 30 GPIO_ACTIVE_HIGH>
+         , <&gpio0 21 GPIO_ACTIVE_HIGH>
+         , <&gpio0 23 GPIO_ACTIVE_HIGH>
+         ;
+};
+
+&left_encoder {
+    status = "okay";
+};
+

boards/arm/eyelash_sofle/eyelash_sofle_left_defconfig

@@ -5,7 +5,7 @@
 
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_SOFLE_LEFT=y
+CONFIG_BOARD_EYELASH_SOFLE_LEFT=y
 CONFIG_ZMK_SLEEP=y
 
 

boards/arm/eyelash_sofle/eyelash_sofle_right.dts

@@ -0,0 +1,24 @@
+/*
+*
+* Copyright (c) 2021 Darryl deHaan
+* SPDX-License-Identifier: MIT
+*
+*/
+#include "eyelash_sofle.dtsi"
+
+&kscan0 {
+     col-gpios
+        = <&gpio0 22 GPIO_ACTIVE_HIGH>
+         , <&gpio0 29 GPIO_ACTIVE_HIGH>
+         , <&gpio0 3 GPIO_ACTIVE_HIGH>
+         , <&gpio0 28 GPIO_ACTIVE_HIGH>
+         , <&gpio0 30 GPIO_ACTIVE_HIGH>
+         , <&gpio0 21 GPIO_ACTIVE_HIGH>
+         , <&gpio0 23 GPIO_ACTIVE_HIGH>
+         ;
+};
+
+&default_transform {
+    col-offset = <7>;
+};
+

boards/arm/eyelash_sofle/eyelash_sofle_right_defconfig

@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2024 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+CONFIG_SOC_SERIES_NRF52X=y
+CONFIG_SOC_NRF52840_QIAA=y
+CONFIG_BOARD_EYELASH_SOFLE_RIGHT=y
+
+# Enable 32kHz crystal
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# enable pinctrl
+CONFIG_PINCTRL=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# Enable SPI
+CONFIG_SPI=y
+
+# Enable writing to flash
+CONFIG_USE_DT_CODE_PARTITION=y
+CONFIG_BUILD_OUTPUT_UF2=y
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+
+CONFIG_ZMK_USB=n
+CONFIG_ZMK_BLE=y
+
+#EXT POWER
+CONFIG_ZMK_EXT_POWER=y

build.yaml

@@ -1,10 +1,13 @@
+---
 include:
-
+  - board: eyelash_sofle_left
-  - board: nice_nano_v2
+    shield: nice_view
+  - board: eyelash_sofle_right
+    shield: nice_view_custom
+  - board: eyelash_sofle_left
+    shield: nice_view
+    snippet: studio-rpc-usb-uart
+    cmake-args: -DCONFIG_ZMK_STUDIO=y
+    artifact-name: eyelash_sofle_studio_left
+  - board: eyelash_sofle_left
     shield: settings_reset
-  - board: sofle_left
-    shield: nice_view_adapter nice_view
-    artifact-name: sofle_left_nice_view
-  - board: sofle_right
-    shield: nice_view_adapter nice_view_custom
-    artifact-name: sofle_right_nice_view

config/Kconfig

@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-config BOARD_SOFLE_LEFT
-    bool
-
-config BOARD_SOFLE_RIGHT
-    bool
-
-

config/boards/arm/sofle/Kconfig.board

@@ -1,17 +0,0 @@
-#
-# Copyright (c) 2022 Darryl deHaan
-# SPDX-License-Identifier: MIT
-#
-
-config BOARD_SOFLE_LEFT
-    bool "sofle left"
-    depends on SOC_NRF52840_QIAA
-
-
-config BOARD_SOFLE_RIGHT
-    bool "sofle right"
-    depends on SOC_NRF52840_QIAA
-
-   
-
-

config/boards/arm/sofle/sofle.conf

@@ -1,29 +0,0 @@
-# go to sleep after one hour (1*60*60*1000ms)
-# CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=3600000
-
-# Turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=n
-#
-# Copyright (c) 2022 Darryl deHaan
-# SPDX-License-Identifier: MIT
-#
-
-CONFIG_ZMK_SLEEP=y
-
-
-CONFIG_WS2812_STRIP=y
-CONFIG_ZMK_RGB_UNDERGLOW=y
-CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
-CONFIG_ZMK_RGB_UNDERGLOW_ON_START=n
-CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=90
-
-CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
-CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB=y
-CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=160
-CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3
-
-#CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
-CONFIG_ZMK_MOUSE=y
-
-CONFIG_BOARD_ENABLE_DCDC=y
-

config/boards/arm/sofle/sofle.zmk.yml

@@ -1,15 +0,0 @@
-file_format: "1"
-id: sofle
-name: Sofle
-url: https://github.com/tokyo2006/zmk-config-sofle
-type: board
-arch: arm
-features:
-  - keys
-  - display
-outputs:
-  - usb
-  - ble
-siblings:
-  - sofle_left
-  - sofle_right

config/boards/arm/sofle/sofle_left.dts

@@ -1,85 +0,0 @@
-/*
-*
-* Copyright (c) 2021 Darryl deHaan
-* SPDX-License-Identifier: MIT
-*
-*/
-
-#include "sofle.dtsi"
-#include <dt-bindings/led/led.h>
-
-/{
-    chosen {
-        zmk,battery = &vbatt;
-        zmk,backlight = &backlight;
-
-    };
-
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-     wakeup-source;
-        diode-direction = "col2row";
-        row-gpios
-            = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-
-        col-gpios
-            = <&gpio0 3 GPIO_ACTIVE_HIGH>
-            , <&gpio0 28 GPIO_ACTIVE_HIGH>
-            , <&gpio0 30 GPIO_ACTIVE_HIGH>
-            , <&gpio0 21 GPIO_ACTIVE_HIGH>
-            , <&gpio0 23 GPIO_ACTIVE_HIGH>
-            , <&gpio0 22 GPIO_ACTIVE_HIGH>
-            ;
-    };
-
-    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";
-    };
-backlight: pwmleds {
-        compatible = "pwm-leds";
-        pwm_led_0 {
-            pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_NORMAL>;
-        };
-    };
-
-};
-
-&left_encoder {
-	a-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-	b-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-    status = "okay";
-};
-&pinctrl {
-    // Other pinctrl definitions for other hardware
-    pwm0_default: pwm0_default {
-        group1 {
-            psels = <NRF_PSEL(PWM_OUT0, 1, 13)>;
-        };
-    };
-    pwm0_sleep: pwm0_sleep {
-        group1 {
-            psels = <NRF_PSEL(PWM_OUT0, 1, 13)>;
-            low-power-enable;
-        
-        };
-    };
-};
-&pwm0 {
-    status = "okay";
-    pinctrl-0 = <&pwm0_default>;
-    pinctrl-1 = <&pwm0_sleep>;
-    pinctrl-names = "default", "sleep";
-};
-

config/boards/arm/sofle/sofle_right.dts

@@ -1,104 +0,0 @@
-/*
-*
-* Copyright (c) 2021 Darryl deHaan
-* SPDX-License-Identifier: MIT
-*
-*/
-#include "sofle.dtsi"
-#include <dt-bindings/led/led.h>
-
-/{
-    chosen {
-        zmk,battery = &vbatt;
-        zmk,backlight = &backlight;
-    };
-
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
-        diode-direction = "col2row";
-        row-gpios
-            = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-
-        col-gpios
-           = <&gpio0 22 GPIO_ACTIVE_HIGH>
-            , <&gpio0 29 GPIO_ACTIVE_HIGH>
-            , <&gpio0 3 GPIO_ACTIVE_HIGH>
-            , <&gpio0 28 GPIO_ACTIVE_HIGH>
-            , <&gpio0 30 GPIO_ACTIVE_HIGH>
-            , <&gpio0 21 GPIO_ACTIVE_HIGH>
-            , <&gpio0 23 GPIO_ACTIVE_HIGH>
-            ;
-    };
-
-    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>;
-    };
-backlight: pwmleds {
-        compatible = "pwm-leds";
-        pwm_led_0 {
-            pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_NORMAL>;
-        };
-    };
-
-};
-&default_transform {
-    col-offset = <7>;
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    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 = <4000000>;
-
-        /* WS2812 */
-        chain-length = <7>; /* 6 keys have underglow at the moment */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-    };
-};
-&pinctrl {
-    // Other pinctrl definitions for other hardware
-    pwm0_default: pwm0_default {
-        group1 {
-            psels = <NRF_PSEL(PWM_OUT0, 1, 13)>;
-        };
-    };
-    pwm0_sleep: pwm0_sleep {
-        group1 {
-            psels = <NRF_PSEL(PWM_OUT0, 1, 13)>;
-            low-power-enable;
-        };
-    };
-};
-&pwm0 {
-    status = "okay";
-    pinctrl-0 = <&pwm0_default>;
-    pinctrl-1 = <&pwm0_sleep>;
-    pinctrl-names = "default", "sleep";
-};

config/boards/arm/sofle/sofle_right_defconfig

@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2022 Darryl deHaan
-# SPDX-License-Identifier: MIT
-#
-
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_SOFLE_RIGHT=y
-CONFIG_ZMK_SLEEP=y
-
-
-
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# enable pinctrl
-CONFIG_PINCTRL=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# Enable SPI
-CONFIG_SPI=y
-
-# Enable writing to flash
-CONFIG_USE_DT_CODE_PARTITION=y
-CONFIG_BUILD_OUTPUT_UF2=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
-
-# Enable 32kHz crystal
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y
-
-CONFIG_ZMK_USB=n
-CONFIG_ZMK_BLE=y
-
-# enable display drivers
-CONFIG_ZMK_DISPLAY=y
-
-
-
-
-#CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
-#CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
-#CONFIG_LV_Z_BITS_PER_PIXEL=1
-#CONFIG_LV_COLOR_DEPTH_1=y
-#CONFIG_LV_DPI_DEF=145
-#CONFIG_LV_Z_VDB_SIZE=100
-#CONFIG_LV_USE_THEME_MONO=y
-#CONFIG_LV_COLOR_CHROMA_KEY_HEX=0x00FF00
-#CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_16=y
-#CONFIG_LV_FONT_MONTSERRAT_26=y
-#CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y
-
-#EXT POWER
-CONFIG_ZMK_EXT_POWER=y
-
-#BLE-passkey
-CONFIG_ZMK_BLE_PASSKEY_ENTRY=n
-
-#BLE-clean
-CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=n
-
-#usb-name
-CONFIG_USB_DEVICE_MANUFACTURER="sofle"
-
-CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n
-CONFIG_ZMK_MOUSE=y
-

config/boards/shields/nice_view_adapter/Kconfig.shield

@@ -1,2 +0,0 @@
-config SHIELD_NICE_VIEW_ADAPTER
-    def_bool $(shields_list_contains,nice_view_adapter)

config/boards/shields/nice_view_adapter/boards/sofle_left.overlay

@@ -1,29 +0,0 @@
-&pinctrl {
-    spi0_default: spi0_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
-                <NRF_PSEL(SPIM_MISO, 0, 25)>;
-        };
-    };
-    spi0_sleep: spi0_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
-                <NRF_PSEL(SPIM_MISO, 0, 25)>;
-            low-power-enable;
-        };
-    };
-};
-
-nice_view_spi: &spi0 {
-    compatible = "nordic,nrf-spim";
-    pinctrl-0 = <&spi0_default>;
-    pinctrl-1 = <&spi0_sleep>;
-    pinctrl-names = "default", "sleep";
-    cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
-};
-
-&i2c0 {
-    status = "disabled";
-};

config/boards/shields/nice_view_adapter/boards/sofle_right.overlay

@@ -1,29 +0,0 @@
-&pinctrl {
-    spi0_default: spi0_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
-                <NRF_PSEL(SPIM_MISO, 0, 25)>;
-        };
-    };
-    spi0_sleep: spi0_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 20)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 17)>,
-                <NRF_PSEL(SPIM_MISO, 0, 25)>;
-            low-power-enable;
-        };
-    };
-};
-
-nice_view_spi: &spi0 {
-    compatible = "nordic,nrf-spim";
-    pinctrl-0 = <&spi0_default>;
-    pinctrl-1 = <&spi0_sleep>;
-    pinctrl-names = "default", "sleep";
-    cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
-};
-
-&i2c0 {
-    status = "disabled";
-};

config/boards/shields/nice_view_adapter/nice_view_adapter.conf

@@ -1,2 +0,0 @@
-CONFIG_SSD1306=n
-CONFIG_ZMK_DISPLAY_STATUS_SCREEN_CUSTOM=y

config/boards/shields/nice_view_adapter/nice_view_adapter.zmk.yml

@@ -1,7 +0,0 @@
-file_format: "1"
-id: nice_view_adapter
-name: nice!view adapter
-type: shield
-url: https://nicekeyboards.com/nice-view
-requires: [i2c_oled]
-exposes: [nice_view_header]

config/eyelash_sofle.conf

@@ -2,7 +2,7 @@
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=3600000
 
 # Turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=n
+CONFIG_ZMK_USB_LOGGING=n
 #
 # Copyright (c) 2022 Darryl deHaan
 # SPDX-License-Identifier: MIT
@@ -42,7 +42,3 @@ CONFIG_ZMK_BACKLIGHT=y
 CONFIG_ZMK_BACKLIGHT_BRT_START=100
 CONFIG_ZMK_BACKLIGHT_ON_START=y
 CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=n
-
-
-
-

config/eyelash_sofle.json

@@ -1,6 +1,6 @@
 {
-    "id": "sofle",
+    "id": "eyelash_sofle",
-    "name": "Sofle",
+    "name": "Eyelash Sofle",
     "layouts": {
       "default_layout": {
         "name": "default_layout",

config/eyelash_sofle.keymap

@@ -0,0 +1,90 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/mouse.h>
+#include <dt-bindings/zmk/outputs.h>
+#include <dt-bindings/zmk/rgb.h>
+
+#include <input/processors.dtsi>
+
+/*
+
+   &mmv_input_listener {
+       input-processors = <&zip_xy_scaler 2 1>;
+   };
+
+   &msc_input_listener {
+       input-processors = <&zip_xy_scaler 2 1>;
+   };
+
+ */
+
+#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1200  // 600
+#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20    // 10
+
+
+/ {
+    behaviors {
+        mmv {
+            acceleration-exponent = <1>;      // 1
+            time-to-max-speed-ms = <900>;    // 40
+            delay-ms = <0>;                   // 0
+        };
+
+        msc {
+            acceleration-exponent = <1>;      // 0
+            time-to-max-speed-ms = <400>;      // 500
+            delay-ms = <0>;                   //   10
+        };
+    };
+
+    scroll_encoder: scroll_encoder {
+        compatible = "zmk,behavior-sensor-rotate";
+        #sensor-binding-cells = <0>;
+        bindings = <&msc SCRL_DOWN>, <&msc SCRL_UP>;
+
+        tap-ms = <30>;
+    };
+
+    keymap {
+        compatible = "zmk,keymap";
+
+        layer0 {
+            bindings = <
+&kp ESC     &kp N1     &kp N2        &kp N3        &kp N4  &kp N5       &kp UP_ARROW     &kp N6     &kp N7     &kp N8     &kp N9           &kp N0      &kp BACKSPACE
+&kp TAB     &kp Q      &kp W         &kp E         &kp R   &kp T        &kp DOWN_ARROW   &kp Y      &kp U      &kp I      &kp O            &kp P       &kp BSLH
+&kp CAPS    &kp A      &kp S         &kp D         &kp F   &kp G        &kp LEFT_ARROW   &kp H      &kp J      &kp K      &kp L            &kp SEMI    &kp APOS
+&kp LSHFT   &kp Z      &kp X         &kp C         &kp V   &kp B        &kp RIGHT_ARROW  &kp N      &kp M      &kp COMMA  &kp DOT          &kp FSLH    &kp ENTER
+&kp C_MUTE  &kp LCTRL  &kp LEFT_GUI  &kp LEFT_ALT  &mo 1   &kp SPACE    &kp ENTER        &kp SPACE  &kp ENTER  &mo 2      &kp RIGHT_SHIFT  &kp DELETE
+            >;
+
+            sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOL_DN>;
+            display-name = "LAYER0";
+        };
+
+        layer_1 {
+            bindings = <
+&kp GRAVE   &kp F1           &kp F2          &kp F3           &kp F4           &kp F5             &mmv MOVE_UP     &kp F6           &kp F7           &kp F8      &kp F9     &kp F10           &trans
+&trans      &kp GRAVE        &mkp LCLK       &mkp MCLK        &mkp RCLK        &mkp MB4           &mmv MOVE_DOWN   &kp PG_UP        &kp END          &kp UP      &kp HOME   &kp MINUS         &kp EQUAL
+&trans      &kp TILDE        &trans          &trans           &trans           &mkp MB5           &mmv MOVE_LEFT   &kp PG_DN        &kp LEFT         &kp DOWN    &kp RIGHT  &kp LEFT_BRACKET  &kp RIGHT_BRACKET
+&trans      &rgb_ug RGB_OFF  &rgb_ug RGB_ON  &rgb_ug RGB_EFF  &rgb_ug RGB_EFR  &rgb_ug RGB_SPI    &mmv MOVE_RIGHT  &rgb_ug RGB_BRI  &rgb_ug RGB_BRD  &kp INSERT  &kp F11    &kp F12           &trans
+&kp C_MUTE  &trans           &trans          &trans           &trans           &trans             &mkp LCLK        &trans           &trans           &trans      &trans     &trans
+            >;
+
+            display-name = "layer1";
+            sensor-bindings = <&scroll_encoder>;
+        };
+
+        layer_2 {
+            bindings = <
+&kp TILDE  &bt BT_SEL 0  &bt BT_SEL 1    &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4    &mmv MOVE_UP     &kp F6  &kp F7  &kp F8      &kp F9     &kp F10      &trans
+&studio_unlock      &bt BT_CLR    &bt BT_CLR_ALL  &trans        &trans        &trans          &mmv MOVE_DOWN   &trans  &trans  &kp F11     &kp F12    &kp UNDER    &kp PLUS
+&trans     &out OUT_USB  &out OUT_BLE    &trans        &trans        &trans          &mmv MOVE_LEFT   &trans  &trans  &trans      &trans     &kp LBRC     &kp RBRC
+&trans     &sys_reset    &trans          &bootloader   &trans        &trans          &mmv MOVE_RIGHT  &trans  &trans  &sys_reset  &soft_off  &bootloader  &trans
+&trans     &trans        &trans          &trans        &trans        &trans          &mkp LCLK        &trans  &trans  &trans      &trans     &trans
+            >;
+
+            sensor-bindings = <&scroll_encoder>;
+        };
+    };
+};

config/west.yml

@@ -1,16 +1,25 @@
 manifest:
   remotes:
     - name: zmkfirmware
-      url-base: https://github.com/petejohanson
+      url-base: https://github.com/zmkfirmware
+      # Additional modules containing boards/shields/custom code can be listed here as well.
+      # See:
+      # - https://zmk.dev/docs/features/modules
+      # - https://docs.zephyrproject.org/3.5.0/develop/west/manifest.html#projects
     - name: gpeye
       url-base: https://github.com/GPeye
+    - name: petejohanson
+      url-base: https://github.com/petejohanson
   projects:
-    - name: zmk
+    - name: eyelash_sofle
-      remote: zmkfirmware
+      url: https://github.com/a741725193/zmk-sofle
-      revision: feat/pointers-move-scroll
+      revision: refactor
-      import: app/west.yml
+    - name: mario-peripheral-animation
-    - name: urchin-peripheral-animation
       remote: gpeye
       revision: main 
+    - name: zmk
+      remote: petejohanson
+      revision: feat/pointers-with-input-processors
+      import: app/west.yml
   self:
     path: config

zephyr/module.yml

@@ -0,0 +1,3 @@
+build:
+  settings:
+     board_root: .