diff --git a/zofle/build.bash b/zofle/build.bash index 50cacbd..db889ba 100755 --- a/zofle/build.bash +++ b/zofle/build.bash @@ -1,12 +1,13 @@ #!/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 \ -v ${PWD}/.cache:/zofle \ -v ${PWD}/config:/zofle/config:ro \ -v ${PWD}/build:/build \ - "$ZMK_DOCKER_IMAGE" sh -c 'set -x + "$ZMK_DOCKER_IMAGE" sh -c ' + set -x set -e cd /zofle 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 echo "Building right" 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 + ' \ No newline at end of file diff --git a/zofle/config/sofle.keymap b/zofle/config/sofle.keymap index e12556f..973e7d5 100644 --- a/zofle/config/sofle.keymap +++ b/zofle/config/sofle.keymap @@ -102,5 +102,4 @@ sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>; }; }; -}; - +}; \ No newline at end of file diff --git a/zofle/config/west.yml b/zofle/config/west.yml index 379d291..fd49241 100644 --- a/zofle/config/west.yml +++ b/zofle/config/west.yml @@ -2,10 +2,12 @@ manifest: remotes: - name: zmkfirmware url-base: https://github.com/zmkfirmware + - name: infused-kim + url-base: https://github.com/infused-kim projects: - name: zmk - remote: zmkfirmware - revision: main + remote: infused-kim + revision: sofle import: app/west.yml self: - path: config + path: config \ No newline at end of file diff --git a/zorne/config/corne.conf b/zorne/config/corne.conf index a8f498c..71d6e9f 100644 --- a/zorne/config/corne.conf +++ b/zorne/config/corne.conf @@ -6,7 +6,7 @@ CONFIG_WS2812_STRIP=n CONFIG_ZMK_EXT_POWER=n CONFIG_ZMK_DISPLAY=n -CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_SLEEP=n # CONFIG_ZMK_USB_LOGGING=y -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_BT_CTLR_TX_PWR_PLUS_8=n \ No newline at end of file