diff options
author | Jack Sangdahl <[email protected]> | 2024-02-25 17:29:44 -0700 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-02-25 17:29:44 -0700 |
commit | 7620b42425c6404692cb4b8b51a0276136a748aa (patch) | |
tree | 68c2bdcbb5b37af0e59414b79ac8a7f2fc98c872 | |
parent | c06a8f9c838e25b49b27c1d9393fdc08b6c33fe2 (diff) | |
download | zmk_build-7620b42425c6404692cb4b8b51a0276136a748aa.tar.gz zmk_build-7620b42425c6404692cb4b8b51a0276136a748aa.zip |
revxlp module
-rwxr-xr-x | build.sh | 8 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/Kconfig.defconfig (renamed from revxlp/Kconfig.defconfig) | 2 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/Kconfig.shield (renamed from revxlp/Kconfig.shield) | 4 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf (renamed from revxlp/boards/seeeduino_xiao.conf) | 0 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf (renamed from revxlp/boards/seeeduino_xiao_ble.conf) | 0 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay (renamed from revxlp/boards/seeeduino_xiao_ble.overlay) | 0 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/revxlp.overlay (renamed from revxlp/revxlp.overlay) | 9 | ||||
-rw-r--r-- | revxlp/boards/shields/revxlp/revxlp.zmk.yml (renamed from revxlp/revxlp.zmk.yml) | 0 | ||||
-rw-r--r-- | revxlp/build.yaml | 2 | ||||
-rw-r--r-- | revxlp/config/west.yml | 13 | ||||
-rw-r--r-- | revxlp/zephyr/module.yml | 4 |
11 files changed, 32 insertions, 10 deletions
@@ -13,7 +13,8 @@ build() { printf "building ${GREEN}$1${NORMAL} for ${BLUE}$2${NORMAL}...\n" (cd $ZMK_DIR/app west build -p always -b $2 -- -DSHIELD=$1 \ - -DZMK_CONFIG="$HOME/waffle_git/zmk-build/config" + -DZMK_CONFIG="$HOME/git/zmk-build/config" + # -DZMK_EXTRA_MODULES="$HOME/git/zmk-build/$3" read -p "${BOLD}flash? (y/n) ${NORMAL}" yn case $yn in @@ -21,7 +22,7 @@ build() { printf "${YELLOW}enter bootloader${NORMAL}...\n" sleep 5 doas mount /dev/sdb ~/.local/Media - west flash &> /dev/nul + west flash doas umount /dev/sdb ;; [Nn]*) cp build/zephyr/zmk.uf2 ~/$1.uf2 ;; @@ -40,9 +41,6 @@ case $opt in build corne_right nice_nano_v2 ;; 2) - if [ ! -L $ZMK_DIR/app/boards/shields/revxlp ]; then - ln -sv revxlp $ZMK_DIR/app/boards/shields/revxlp - fi build revxlp seeeduino_xiao_ble ;; 3) diff --git a/revxlp/Kconfig.defconfig b/revxlp/boards/shields/revxlp/Kconfig.defconfig index b6015f4..da27481 100644 --- a/revxlp/Kconfig.defconfig +++ b/revxlp/boards/shields/revxlp/Kconfig.defconfig @@ -3,5 +3,5 @@ if SHIELD_REVXLP config ZMK_KEYBOARD_NAME - default "revxlp" + default "revxlp" endif diff --git a/revxlp/Kconfig.shield b/revxlp/boards/shields/revxlp/Kconfig.shield index 8aac145..98e33ea 100644 --- a/revxlp/Kconfig.shield +++ b/revxlp/boards/shields/revxlp/Kconfig.shield @@ -2,5 +2,5 @@ # SPDX-License-Identifier: MIT config SHIELD_REVXLP - def_bool $(shields_list_contains,revxlp) - select SPI + def_bool $(shields_list_contains,revxlp) + select SPI diff --git a/revxlp/boards/seeeduino_xiao.conf b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf index 81b8cd7..81b8cd7 100644 --- a/revxlp/boards/seeeduino_xiao.conf +++ b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf diff --git a/revxlp/boards/seeeduino_xiao_ble.conf b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf index 5616bfc..5616bfc 100644 --- a/revxlp/boards/seeeduino_xiao_ble.conf +++ b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf diff --git a/revxlp/boards/seeeduino_xiao_ble.overlay b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay index 5b37ffb..5b37ffb 100644 --- a/revxlp/boards/seeeduino_xiao_ble.overlay +++ b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay diff --git a/revxlp/revxlp.overlay b/revxlp/boards/shields/revxlp/revxlp.overlay index dbade4a..88bdc8a 100644 --- a/revxlp/revxlp.overlay +++ b/revxlp/boards/shields/revxlp/revxlp.overlay @@ -1,5 +1,8 @@ -//Copyright (c) 2024 The ZMK Contributors -//SPDX-License-Identifier: MIT +/* + * Copyright (c) 2024 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ #include <dt-bindings/zmk/matrix_transform.h> @@ -14,6 +17,7 @@ gpio-controller; spi-max-frequency = <200000>; reg = <0>; + label = "4HC595"; #gpio-cells = <2>; ngpios = <8>; }; @@ -40,6 +44,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(5,5) RC(5,4) RC(5,3) RC(5,2) kscan0: kscan_0 { compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; diode-direction = "col2row"; col-gpios diff --git a/revxlp/revxlp.zmk.yml b/revxlp/boards/shields/revxlp/revxlp.zmk.yml index 64527ee..64527ee 100644 --- a/revxlp/revxlp.zmk.yml +++ b/revxlp/boards/shields/revxlp/revxlp.zmk.yml diff --git a/revxlp/build.yaml b/revxlp/build.yaml new file mode 100644 index 0000000..a84d80b --- /dev/null +++ b/revxlp/build.yaml @@ -0,0 +1,2 @@ +board: [seeeduino_xiao_ble] +shield: [revxlp] diff --git a/revxlp/config/west.yml b/revxlp/config/west.yml new file mode 100644 index 0000000..3b1b927 --- /dev/null +++ b/revxlp/config/west.yml @@ -0,0 +1,13 @@ +manifest: + remotes: + - name: zmkfirmware + url-base: https://github.com/zmkfirmware + - name: petejohanson + url-base: https://github.com/petejohanson + projects: + - name: zmk + remote: petejohanson + revision: build/zephyr-module-keymap-loading-refactor + import: app/west.yml + self: + path: config diff --git a/revxlp/zephyr/module.yml b/revxlp/zephyr/module.yml new file mode 100644 index 0000000..2c4ee7c --- /dev/null +++ b/revxlp/zephyr/module.yml @@ -0,0 +1,4 @@ +name: revxlp +build: + settings: + board_root: . |