aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack <[email protected]>2022-08-04 17:25:06 -0600
committerjack <[email protected]>2022-08-04 17:25:06 -0600
commit1cdbe9bc0cf224640d43c378d31b04573375115b (patch)
tree1d31a52536e1f7eb219c2526ce7a2f8101d4a6bd
parent4dfb77425ab2b2f68f153cb3e79fc5a822845816 (diff)
downloadzmk_build-1cdbe9bc0cf224640d43c378d31b04573375115b.tar.gz
zmk_build-1cdbe9bc0cf224640d43c378d31b04573375115b.zip
layout updates
-rwxr-xr-xbuild.sh13
-rw-r--r--config/corne-ish_zen.keymap6
-rw-r--r--config/corne.keymap6
3 files changed, 17 insertions, 8 deletions
diff --git a/build.sh b/build.sh
index 47a9c88..8995312 100755
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,7 @@ ZSDK_VERSION=0.13.2
ZEN_BRANCH=Board-Corne-ish-Zen-dedicated-work-queue
CONFIG_DIR=~/waffle_git/zmk-build/config
ZMK_DIR=~/waffle_git/zmk
+UF2=~/*.uf2
update() {
(cd ${ZMK_DIR} ; git pull ; west update)
@@ -12,6 +13,12 @@ update() {
rm zephyr-toolchain-arm-${ZSDK_VERSION}-linux-x86_64-setup.run
}
+test_uf2() {
+ if test -f ${UF2}; then
+ rm ${UF2}
+ fi
+}
+
read -p "update? (y/n) " -n 1 -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
@@ -26,6 +33,7 @@ do
case $opt in
"corne")
echo "building corne firmware..."
+ test_uf2
(cd ${ZMK_DIR}
if [ $(git branch --show-current) == "${ZEN_BRANCH}"]; then
git checkout main
@@ -41,6 +49,7 @@ do
;;
"corne-ish zen")
echo "building corne-ish zen firmware..."
+ test_uf2
(cd ${ZMK_DIR}
if [[ $(git branch --show-current) = "main" ]]; then
git checkout ${ZEN_BRANCH}
@@ -49,7 +58,7 @@ do
(cd ${ZMK_DIR}/app
west build -p -b corne-ish_zen_left -- -DZMK_CONFIG="${CONFIG_DIR}"
cp ${ZMK_DIR}/app/build/zephyr/zmk.uf2 ~/corne-ish_zen_left.uf2
- west build -p -b corne-ish_zen_left -- -DZMK_CONFIG="${CONFIG_DIR}"
+ west build -p -b corne-ish_zen_right -- -DZMK_CONFIG="${CONFIG_DIR}"
cp ${ZMK_DIR}/app/build/zephyr/zmk.uf2 ~/corne-ish_zen_right.uf2
)
break
@@ -57,6 +66,6 @@ do
"quit")
break
;;
- *) echo "invalid option $REPLY";;
+ *) echo "invalid option: $REPLY";;
esac
done
diff --git a/config/corne-ish_zen.keymap b/config/corne-ish_zen.keymap
index ac1b86d..3062351 100644
--- a/config/corne-ish_zen.keymap
+++ b/config/corne-ish_zen.keymap
@@ -27,9 +27,9 @@
};
sym {
bindings = <
- &trans &trans &trans &trans &trans &trans &kp C_PREV &kp C_PLAY &kp C_NEXT &bt BT_CLR &bootloader &trans
- &trans &trans &trans &trans &trans &trans &trans &trans &trans &bt BT_PRV &bt BT_NXT &trans
- &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
+ &trans &bootloader &bt BT_NXT &trans &trans &trans &kp C_PREV &kp C_PLAY &kp C_NEXT &trans &trans &trans
+ &trans &bt BT_CLR &bt BT_PRV &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
&trans &trans &kp C_VOL_DN &trans &trans &trans
>;
};
diff --git a/config/corne.keymap b/config/corne.keymap
index ac1b86d..3062351 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -27,9 +27,9 @@
};
sym {
bindings = <
- &trans &trans &trans &trans &trans &trans &kp C_PREV &kp C_PLAY &kp C_NEXT &bt BT_CLR &bootloader &trans
- &trans &trans &trans &trans &trans &trans &trans &trans &trans &bt BT_PRV &bt BT_NXT &trans
- &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
+ &trans &bootloader &bt BT_NXT &trans &trans &trans &kp C_PREV &kp C_PLAY &kp C_NEXT &trans &trans &trans
+ &trans &bt BT_CLR &bt BT_PRV &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
&trans &trans &kp C_VOL_DN &trans &trans &trans
>;
};