From f3df6a3851a79b1223a584993d9868acfa1f3571 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 14 Mar 2024 20:53:58 +0000 Subject: [PATCH] changes --- .github/workflows/build.yml | 43 +--------- .../boards => boards}/arm/pw9/Kconfig.board | 0 .../arm/pw9/Kconfig.defconfig | 0 {config/boards => boards}/arm/pw9/board.cmake | 0 .../boards => boards}/arm/pw9/pinctrl.dtsi | 0 {config/boards => boards}/arm/pw9/pw9.dts | 0 {config/boards => boards}/arm/pw9/pw9.yaml | 0 .../boards => boards}/arm/pw9/pw9_defconfig | 0 build.yaml | 2 + config/pw9.keymap | 79 +------------------ config/west.yml | 6 ++ zephyr/module.yml | 3 + 12 files changed, 15 insertions(+), 118 deletions(-) rename {config/boards => boards}/arm/pw9/Kconfig.board (100%) rename {config/boards => boards}/arm/pw9/Kconfig.defconfig (100%) rename {config/boards => boards}/arm/pw9/board.cmake (100%) rename {config/boards => boards}/arm/pw9/pinctrl.dtsi (100%) rename {config/boards => boards}/arm/pw9/pw9.dts (100%) rename {config/boards => boards}/arm/pw9/pw9.yaml (100%) rename {config/boards => boards}/arm/pw9/pw9_defconfig (100%) create mode 100644 build.yaml create mode 100644 zephyr/module.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fff5ef..37cba72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,46 +1,5 @@ on: [push, pull_request, workflow_dispatch] -name: Build - jobs: build: - runs-on: ubuntu-latest - container: - image: zmkfirmware/zmk-build-arm:stable - name: Build - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Cache west modules - uses: actions/cache@v3 - env: - cache-name: cache-zephyr-modules - with: - path: | - modules/ - tools/ - zephyr/ - bootloader/ - zmk/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - name: West Init - run: west init -l config - - name: West Update - run: west update - - name: West Zephyr export - run: west zephyr-export - - name: West Build (pw9) - run: west build -s zmk/app -b pw9 -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" - - name: pw9 Kconfig file - run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" - - name: Rename zmk.uf2 - run: cp build/zephyr/zmk.uf2 pw9.uf2 - - name: Archive (pw9) - uses: actions/upload-artifact@v3 - with: - name: firmware - path: pw9.uf2 + uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main \ No newline at end of file diff --git a/config/boards/arm/pw9/Kconfig.board b/boards/arm/pw9/Kconfig.board similarity index 100% rename from config/boards/arm/pw9/Kconfig.board rename to boards/arm/pw9/Kconfig.board diff --git a/config/boards/arm/pw9/Kconfig.defconfig b/boards/arm/pw9/Kconfig.defconfig similarity index 100% rename from config/boards/arm/pw9/Kconfig.defconfig rename to boards/arm/pw9/Kconfig.defconfig diff --git a/config/boards/arm/pw9/board.cmake b/boards/arm/pw9/board.cmake similarity index 100% rename from config/boards/arm/pw9/board.cmake rename to boards/arm/pw9/board.cmake diff --git a/config/boards/arm/pw9/pinctrl.dtsi b/boards/arm/pw9/pinctrl.dtsi similarity index 100% rename from config/boards/arm/pw9/pinctrl.dtsi rename to boards/arm/pw9/pinctrl.dtsi diff --git a/config/boards/arm/pw9/pw9.dts b/boards/arm/pw9/pw9.dts similarity index 100% rename from config/boards/arm/pw9/pw9.dts rename to boards/arm/pw9/pw9.dts diff --git a/config/boards/arm/pw9/pw9.yaml b/boards/arm/pw9/pw9.yaml similarity index 100% rename from config/boards/arm/pw9/pw9.yaml rename to boards/arm/pw9/pw9.yaml diff --git a/config/boards/arm/pw9/pw9_defconfig b/boards/arm/pw9/pw9_defconfig similarity index 100% rename from config/boards/arm/pw9/pw9_defconfig rename to boards/arm/pw9/pw9_defconfig diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..1bd1653 --- /dev/null +++ b/build.yaml @@ -0,0 +1,2 @@ +--- +board: [ "pw9" ] \ No newline at end of file diff --git a/config/pw9.keymap b/config/pw9.keymap index 3bc62f1..5ff080a 100644 --- a/config/pw9.keymap +++ b/config/pw9.keymap @@ -1,88 +1,15 @@ #include +#include +#include #include / { - macros { - init: init { - compatible = "zmk,behavior-macro"; - label = "init"; - #binding-cells = <0>; - bindings = <&kp I &kp N &kp I &kp T &kp I &kp A &kp L &kp I &kp S &kp E &kp ENTER>; - }; - input: input { - compatible = "zmk,behavior-macro"; - label = "input"; - #binding-cells = <0>; - bindings = <&kp I &kp N &kp P &kp U &kp T &kp ENTER>; - }; - speed: speed { - compatible = "zmk,behavior-macro"; - label = "speed"; - #binding-cells = <0>; - bindings = <&kp S &kp P &kp E &kp E &kp D &kp ENTER>; - }; - dispense: dispense { - compatible = "zmk,behavior-macro"; - label = "dispense"; - #binding-cells = <0>; - bindings = <&kp D &kp I &kp S &kp P &kp E &kp N &kp S &kp E &kp ENTER>; - }; - stop: stop { - compatible = "zmk,behavior-macro"; - label = "stop"; - #binding-cells = <0>; - bindings = <&kp S &kp T &kp O &kp P &kp ENTER>; - }; - pickup: pickup { - compatible = "zmk,behavior-macro"; - label = "pickup"; - #binding-cells = <0>; - bindings = <&kp P &kp I &kp C &kp K &kp U &kp P &kp ENTER>; - }; - two: two { - compatible = "zmk,behavior-macro"; - label = "two"; - #binding-cells = <0>; - bindings = <&kp NUMBER_2 &kp ENTER>; - }; - num_1: num_1 { - compatible = "zmk,behavior-macro"; - label = "num_1"; - #binding-cells = <0>; - bindings = <&kp N1 &kp ENTER>; - }; - sample_pickup: sample_pickup { - compatible = "zmk,behavior-macro"; - label = "new_macroq"; - #binding-cells = <0>; - bindings = <&kp S &kp A &kp M &kp P &kp L &kp E &kp UNDERSCORE &kp P &kp I &kp C &kp K &kp U &kp P &kp ENTER>; - }; - prime_chip: prime_chip { - compatible = "zmk,behavior-macro"; - label = "new_macrow"; - #binding-cells = <0>; - bindings = <&kp P &kp R &kp I &kp M &kp E &kp UNDERSCORE &kp C &kp H &kp I &kp P &kp ENTER>; - }; - measure_sample: measure_sample { - compatible = "zmk,behavior-macro"; - label = "new_macroe"; - #binding-cells = <0>; - bindings = <&kp M &kp E &kp A &kp S &kp U &kp R &kp E &kp UNDERSCORE &kp S &kp A &kp M &kp P &kp L &kp E &kp ENTER>; - }; - cleanIL: cleanIL { - compatible = "zmk,behavior-macro"; - label = "new_macror"; - #binding-cells = <0>; - bindings = <&kp C &kp L &kp E &kp A &kp N &kp I &kp L &kp ENTER>; - }; - }; - keymap { compatible = "zmk,keymap"; default_layer { bindings = < -&kp Q &kp W &kp E +&awawa &keysmash &kp E &kp A &kp S &kp D &kp Z &kp X &kp C >; diff --git a/config/west.yml b/config/west.yml index 379d291..dcd4b7d 100644 --- a/config/west.yml +++ b/config/west.yml @@ -7,5 +7,11 @@ manifest: remote: zmkfirmware revision: main import: app/west.yml + - name: keysmash + url: https://github.com/ReFil/refil-zmk-behaviour-modules + revision: keysmash + - name: awawa + url: https://github.com/ReFil/refil-zmk-behaviour-modules + revision: awawa self: path: config diff --git a/zephyr/module.yml b/zephyr/module.yml new file mode 100644 index 0000000..2c80f98 --- /dev/null +++ b/zephyr/module.yml @@ -0,0 +1,3 @@ +build: + settings: + board_root: . \ No newline at end of file