Skip to content

Commit 5ae1f57

Browse files
doctorcooperyumagulovrnl4u
authored
Reorganized transform and configs (#31)
* feat: dao42 keymap * Reorganized transform and configs * Change reset to sys_reset (#30) * Added symlink and json for online editor --------- Co-authored-by: Rafael Yumagulov <yumagulovrn@gmail.com> Co-authored-by: Leo Lou <louyuhong@gmail.com>
1 parent 2bb9969 commit 5ae1f57

File tree

14 files changed

+123
-155
lines changed

14 files changed

+123
-155
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,5 @@
11
on: [push, pull_request, workflow_dispatch]
22

3-
name: Build
4-
53
jobs:
6-
matrix:
7-
runs-on: ubuntu-latest
8-
name: Fetch Build Keyboards
9-
outputs:
10-
matrix: ${{ steps.set-matrix.outputs.matrix }}
11-
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v2
14-
- name: Install yaml2json
15-
run: python3 -m pip install remarshal
16-
- id: set-matrix
17-
name: Fetch Build Matrix
18-
run: |
19-
matrix=$(yaml2json build.yaml | jq -c .)
20-
yaml2json build.yaml
21-
echo "::set-output name=matrix::${matrix}"
224
build:
23-
runs-on: ubuntu-latest
24-
container:
25-
image: zmkfirmware/zmk-build-arm:stable
26-
needs: matrix
27-
name: Build
28-
strategy:
29-
fail-fast: false
30-
matrix: ${{fromJson(needs.matrix.outputs.matrix)}}
31-
steps:
32-
- name: Prepare variables
33-
id: variables
34-
run: |
35-
if [ -n "${{ matrix.shield }}" ]; then
36-
EXTRA_CMAKE_ARGS="-DSHIELD=${{ matrix.shield }}"
37-
ARTIFACT_NAME="${{ matrix.shield }}-${{ matrix.board }}-zmk"
38-
DISPLAY_NAME="${{ matrix.shield }} - ${{ matrix.board }}"
39-
else
40-
EXTRA_CMAKE_ARGS=
41-
DISPLAY_NAME="${{ matrix.board }}"
42-
ARTIFACT_NAME="${{ matrix.board }}-zmk"
43-
fi
44-
echo ::set-output name=extra-cmake-args::${EXTRA_CMAKE_ARGS}
45-
echo ::set-output name=artifact-name::${ARTIFACT_NAME}
46-
echo ::set-output name=display-name::${DISPLAY_NAME}
47-
- name: Checkout
48-
uses: actions/checkout@v2
49-
- name: Cache west modules
50-
uses: actions/cache@v2
51-
env:
52-
cache-name: cache-zephyr-modules
53-
with:
54-
path: |
55-
modules/
56-
tools/
57-
zephyr/
58-
bootloader/
59-
zmk/
60-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
61-
restore-keys: |
62-
${{ runner.os }}-build-${{ env.cache-name }}-
63-
${{ runner.os }}-build-
64-
${{ runner.os }}-
65-
- name: West Init
66-
run: west init -l config
67-
- name: West Update
68-
run: west update
69-
- name: West Zephyr export
70-
run: west zephyr-export
71-
- name: West Build (${{ steps.variables.outputs.display-name }})
72-
run: |
73-
west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/config ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }}
74-
- name: ${{ steps.variables.outputs.display-name }} Kconfig file
75-
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
76-
- name: Rename artifacts
77-
run: |
78-
mkdir build/artifacts
79-
if [ -f build/zephyr/zmk.uf2 ]
80-
then
81-
cp build/zephyr/zmk.uf2 "build/artifacts/${{ steps.variables.outputs.artifact-name }}.uf2"
82-
elif [ -f build/zephyr/zmk.hex ]
83-
then
84-
cp build/zephyr/zmk.hex "build/artifacts/${{ steps.variables.outputs.artifact-name }}.hex"
85-
fi
86-
- name: Archive (${{ steps.variables.outputs.display-name }})
87-
uses: actions/upload-artifact@v2
88-
with:
89-
name: firmware
90-
path: build/artifacts
5+
uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main

‎build.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
include:
22
- board: dao_left
33
- board: dao_right
4-
- board: nice_nano_v2
5-
shield: settings_reset

‎config/boards/arm/dao/Kconfig.defconfig‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ if BOARD_DAO_LEFT
1111

1212
endif # BOARD_DAO_LEFT
1313

14-
if BOARD_DAO_RIGHT
15-
16-
config ZMK_KEYBOARD_NAME
17-
default "Dao Right"
18-
19-
endif # BOARD_DAO_RIGHT
20-
21-
2214
if BOARD_DAO_LEFT || BOARD_DAO_RIGHT
2315

2416
config BOARD

‎config/boards/arm/dao/dao.conf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Turn on logging, and set ZMK logging to debug output
2+
# CONFIG_ZMK_USB_LOGGING=y
3+
4+
# Increase transmit power level
5+
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

‎config/boards/arm/dao/dao.dtsi‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,27 @@
2323
zmk,battery = &vbatt;
2424
};
2525

26+
2627
default_transform: keymap_transform_0 {
2728
compatible = "zmk,matrix-transform";
2829
columns = <12>;
30+
rows = <4>;
31+
32+
// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 |
33+
// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 |
34+
// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
35+
// | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | |
36+
map = <
37+
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)
38+
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
39+
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
40+
RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
41+
>;
42+
};
43+
44+
extra_keys_transform: keymap_transform_1 {
45+
compatible = "zmk,matrix-transform";
46+
columns = <14>;
2947
rows = <4>;
3048

3149
// | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 |
@@ -133,4 +151,4 @@
133151
reg = <0x000f4000 0x0000c000>;
134152
};
135153
};
136-
};
154+
};

‎config/boards/arm/dao/dao.keymap‎

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,61 +16,48 @@
1616
&lt { quick_tap_ms = <200>; };
1717
&mt { quick_tap_ms = <200>; };
1818

19+
/ {
20+
chosen {
21+
zmk,matrix_transform = &default_transform;
22+
// zmk,matrix_transform = &extra_keys_transform;
23+
};
24+
};
25+
1926
/ {
2027
keymap {
2128
compatible = "zmk,keymap";
2229

2330
default_layer {
24-
// -----------------------------------------------------------------------------------------
25-
// | GUI | ~ | Q | W | E | R | T | | Y | U | I | O | P | [ | GUI/] |
26-
// | CTRL | A | S | D | F | G | | H | J | K | L | ; |CTRL/'|
27-
// | LALT | Z | X | C | V | B | | N | M | , | . | / | RALT |
28-
// | RSE | SPC | LWR | | LWR | BKSP | RSE |
2931
bindings = <
30-
&kp LWIN &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &mt RWIN RBKT
31-
&kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT
32-
&kp LALT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH
33-
&lt RSE TAB &mt LSHFT SPACE &lt LWR RET &lt LWR ESC &mt RSHFT BSPC &lt RSE DEL
32+
&mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT
33+
&mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT
34+
&mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH
35+
&lt RSE TAB &mt LSHFT SPACE &lt LWR RET &lt LWR ESC &mt RSHFT BSPC &lt RSE DEL
3436
>;
3537
};
3638
lower_layer {
37-
// -----------------------------------------------------------------------------------------
38-
// | | _ | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
39-
// | + | ! | @ | # | $ | % | | ^ | & | * | ( | ) | - |
40-
// | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
41-
// | GUI | | SPC | | ENT | | ALT |
4239
bindings = <
43-
&trans &kp UNDER &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &mt RGUI F12
44-
&mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS
45-
&mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans
46-
&lt ADJ TAB &trans &trans &trans &trans &lt ADJ DEL
40+
&mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
41+
&mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS
42+
&mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT
43+
&lt ADJ TAB &trans &trans &trans &trans &lt ADJ DEL
4744
>;
4845
};
4946

5047
raise_layer {
51-
// -----------------------------------------------------------------------------------------
52-
// | | NMLK | / | 7 | 8 | 9 | - | | VOLU| HOME| PRSC| PGUP| SCLK| CLCK| |
53-
// | CTRL | * | 4 | 5 | 6 | + | | MUT | LEFT| UP | RGHT| INS | APP |
54-
// | | 0 | 1 | 2 | 3 | . | | VOLD| END | DOWN| PGDN| PAUS| |
55-
// | | | ADJ | | ADJ | | |
5648
bindings = <
57-
&trans &kp KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CAPS &trans
58-
&mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP
59-
&trans &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &trans
60-
&trans &trans &lt ADJ RET &lt ADJ ESC &trans &trans
49+
&mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK
50+
&mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP
51+
&kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT
52+
&trans &trans &lt ADJ RET &lt ADJ ESC &trans &trans
6153
>;
6254
};
6355
adjust_layer {
64-
// -----------------------------------------------------------------------------------------
65-
// | RST | BLDR | | | | | | | | | | | | BLDR | RST |
66-
// | BTCLR| BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BTCLR|
67-
// | | | | | | | | | | | | | |
68-
// | | | | | | | |
6956
bindings = <
70-
&sys_reset &bootloader &none &none &none &none &none &none &none &none &none &none &bootloader &sys_reset
71-
&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0 &bt BT_CLR
72-
&none &none &none &none &none &none &none &none &none &none &none &none
73-
&trans &none &trans &trans &none &trans
57+
&bootloader &none &none &none &none &none &none &none &none &none &none &bootloader
58+
&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0 &bt BT_CLR
59+
&sys_reset &none &none &none &none &none &none &none &none &none &none &sys_reset
60+
&trans &none &trans &none &trans &trans
7461
>;
7562
};
7663
};

‎config/boards/arm/dao/dao.zmk.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
file_format: "1"
2+
id: dao
3+
name: Dao
4+
url: https://github.com/yumagulovrn/dao-choc-ble
5+
type: board
6+
arch: arm
7+
features:
8+
- keys
9+
outputs:
10+
- usb
11+
- ble
12+
siblings:
13+
- dao_left
14+
- dao_right

‎config/boards/arm/dao/dao_left.keymap‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎config/boards/arm/dao/dao_left_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ CONFIG_FLASH=y
2323
CONFIG_FLASH_PAGE_LAYOUT=y
2424
CONFIG_FLASH_MAP=y
2525

26-
# Enable external crystal
27-
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
28-
CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y
29-
3026
# # Turn on logging, and set ZMK logging to debug output
3127
# CONFIG_ZMK_USB_LOGGING=y
3228

‎config/boards/arm/dao/dao_right.dts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
col-offset = <6>;
1111
};
1212

13+
&extra_keys_transform {
14+
col-offset = <6>;
15+
};
16+
1317
&kscan0 {
1418
col-gpios
1519
= <&gpio0 12 GPIO_ACTIVE_HIGH>

0 commit comments

Comments
 (0)