Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor #7

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+1,975 −519
Open

Refactor #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca9b9f
studio support
tokyo2006 Dec 2, 2024
5a60263
[Draw] studio support
a741725193 Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"

18 changes: 18 additions & 0 deletions .github/workflows/draw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) }}
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
build/
zmk/
zephyr/
modules/
tools/
.west/
12 changes: 12 additions & 0 deletions boards/arm/eyelash_sofle/Kconfig.board
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
39 changes: 19 additions & 20 deletions config/boards/arm/sofle/Kconfig.defconfig → boards/arm/eyelash_sofle/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -66,8 +78,6 @@ endchoice

endif

endif # BOARD_SOFLE_LEFT || BOARD_SOFLE_RIGHT

if ZMK_BACKLIGHT

config PWM
Expand All @@ -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
0 config/boards/arm/sofle/board.cmake → boards/arm/eyelash_sofle/board.cmake
View file
Open in desktop
File renamed without changes.
75 changes: 75 additions & 0 deletions boards/arm/eyelash_sofle/eyelash_sofle-layouts.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
;
};
};
Loading