studio support

a741725193 · Dec 7, 2024 · dca9b9f · dca9b9f
1 parent 9e2ce4d
commit dca9b9f
Show file tree

Hide file tree

Showing 35 changed files with 453 additions and 519 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,25 +2,10 @@ name: Build ZMK firmware
 on:
   workflow_dispatch:
   push:
-    paths:
-      - "config/**"
+    paths-ignore:
+      - "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'"
 
diff --git a/.github/workflows/draw.yml b/.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) }}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 build/
 zmk/
-zephyr/
 modules/
 tools/
 .west/
diff --git a/boards/arm/eyelash_sofle/Kconfig.board b/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
diff --git a/config/boards/arm/sofle/Kconfig.defconfig → boards/arm/eyelash_sofle/Kconfig.defconfig b/config/boards/arm/sofle/Kconfig.defconfig → 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
-    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)
-
+endif # BOARD_EYELASH_SOFLE_LEFT || BOARD_EYELASH_SOFLE_RIGHT
diff --git a/config/boards/arm/sofle/board.cmake → boards/arm/eyelash_sofle/board.cmake b/config/boards/arm/sofle/board.cmake → boards/arm/eyelash_sofle/board.cmake
diff --git a/boards/arm/eyelash_sofle/eyelash_sofle-layouts.dtsi b/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>
+            ;
+    };
+};