Use infused-kim's ZMK fork which has fixes specific for my usage

This commit is contained in:
Daniel Flanagan 2022-07-08 09:31:25 -05:00
parent 074c293d1f
commit 2f5c77f6f1
Signed by: lytedev
GPG Key ID: 5B2020A0F9921EF4
4 changed files with 13 additions and 10 deletions

View File

@ -1,12 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ZMK_DOCKER_IMAGE="${ZMK_DOCKER_IMAGE:-zmkfirmware/zmk-build-arm:2.5}" ZMK_DOCKER_IMAGE="${ZMK_DOCKER_IMAGE:-zmkfirmware/zmk-build-arm:stable}"
docker run -it --rm \ docker run -it --rm \
-v ${PWD}/.cache:/zofle \ -v ${PWD}/.cache:/zofle \
-v ${PWD}/config:/zofle/config:ro \ -v ${PWD}/config:/zofle/config:ro \
-v ${PWD}/build:/build \ -v ${PWD}/build:/build \
"$ZMK_DOCKER_IMAGE" sh -c 'set -x "$ZMK_DOCKER_IMAGE" sh -c '
set -x
set -e set -e
cd /zofle cd /zofle
west init -l config || true # allowed to fail since it will fail if already initialized west init -l config || true # allowed to fail since it will fail if already initialized
@ -17,4 +18,5 @@ docker run -it --rm \
cp /zofle/build/zephyr/zmk.uf2 /build/sofle_left_nice_nano.uf2 cp /zofle/build/zephyr/zmk.uf2 /build/sofle_left_nice_nano.uf2
echo "Building right" echo "Building right"
west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=sofle_right -DZMK_CONFIG="/zofle/config" west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=sofle_right -DZMK_CONFIG="/zofle/config"
cp /zofle/build/zephyr/zmk.uf2 /build/sofle_right_nice_nano.uf2' cp /zofle/build/zephyr/zmk.uf2 /build/sofle_right_nice_nano.uf2
'

View File

@ -102,5 +102,4 @@
sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>; sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
}; };
}; };
}; };

View File

@ -2,10 +2,12 @@ manifest:
remotes: remotes:
- name: zmkfirmware - name: zmkfirmware
url-base: https://github.com/zmkfirmware url-base: https://github.com/zmkfirmware
- name: infused-kim
url-base: https://github.com/infused-kim
projects: projects:
- name: zmk - name: zmk
remote: zmkfirmware remote: infused-kim
revision: main revision: sofle
import: app/west.yml import: app/west.yml
self: self:
path: config path: config

View File

@ -6,7 +6,7 @@ CONFIG_WS2812_STRIP=n
CONFIG_ZMK_EXT_POWER=n CONFIG_ZMK_EXT_POWER=n
CONFIG_ZMK_DISPLAY=n CONFIG_ZMK_DISPLAY=n
CONFIG_ZMK_SLEEP=y CONFIG_ZMK_SLEEP=n
# CONFIG_ZMK_USB_LOGGING=y # CONFIG_ZMK_USB_LOGGING=y
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_BT_CTLR_TX_PWR_PLUS_8=n