From 7620b42425c6404692cb4b8b51a0276136a748aa Mon Sep 17 00:00:00 2001 From: Jack Sangdahl <0x6A73@pm.me> Date: Sun, 25 Feb 2024 17:29:44 -0700 Subject: revxlp module --- build.sh | 8 +-- revxlp/Kconfig.defconfig | 7 --- revxlp/Kconfig.shield | 6 -- revxlp/boards/seeeduino_xiao.conf | 2 - revxlp/boards/seeeduino_xiao_ble.conf | 1 - revxlp/boards/seeeduino_xiao_ble.overlay | 13 ---- revxlp/boards/shields/revxlp/Kconfig.defconfig | 7 +++ revxlp/boards/shields/revxlp/Kconfig.shield | 6 ++ .../shields/revxlp/boards/seeeduino_xiao.conf | 2 + .../shields/revxlp/boards/seeeduino_xiao_ble.conf | 1 + .../revxlp/boards/seeeduino_xiao_ble.overlay | 13 ++++ revxlp/boards/shields/revxlp/revxlp.overlay | 69 ++++++++++++++++++++++ revxlp/boards/shields/revxlp/revxlp.zmk.yml | 7 +++ revxlp/build.yaml | 2 + revxlp/config/west.yml | 13 ++++ revxlp/revxlp.overlay | 64 -------------------- revxlp/revxlp.zmk.yml | 7 --- revxlp/zephyr/module.yml | 4 ++ 18 files changed, 127 insertions(+), 105 deletions(-) delete mode 100644 revxlp/Kconfig.defconfig delete mode 100644 revxlp/Kconfig.shield delete mode 100644 revxlp/boards/seeeduino_xiao.conf delete mode 100644 revxlp/boards/seeeduino_xiao_ble.conf delete mode 100644 revxlp/boards/seeeduino_xiao_ble.overlay create mode 100644 revxlp/boards/shields/revxlp/Kconfig.defconfig create mode 100644 revxlp/boards/shields/revxlp/Kconfig.shield create mode 100644 revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf create mode 100644 revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf create mode 100644 revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay create mode 100644 revxlp/boards/shields/revxlp/revxlp.overlay create mode 100644 revxlp/boards/shields/revxlp/revxlp.zmk.yml create mode 100644 revxlp/build.yaml create mode 100644 revxlp/config/west.yml delete mode 100644 revxlp/revxlp.overlay delete mode 100644 revxlp/revxlp.zmk.yml create mode 100644 revxlp/zephyr/module.yml diff --git a/build.sh b/build.sh index 416cd21..21568db 100755 --- a/build.sh +++ b/build.sh @@ -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/Kconfig.defconfig deleted file mode 100644 index b6015f4..0000000 --- a/revxlp/Kconfig.defconfig +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2024 The ZMK Contributors -# SPDX-License-Identifier: MIT - -if SHIELD_REVXLP -config ZMK_KEYBOARD_NAME - default "revxlp" -endif diff --git a/revxlp/Kconfig.shield b/revxlp/Kconfig.shield deleted file mode 100644 index 8aac145..0000000 --- a/revxlp/Kconfig.shield +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2024 The ZMK Contributors -# SPDX-License-Identifier: MIT - -config SHIELD_REVXLP - def_bool $(shields_list_contains,revxlp) - select SPI diff --git a/revxlp/boards/seeeduino_xiao.conf b/revxlp/boards/seeeduino_xiao.conf deleted file mode 100644 index 81b8cd7..0000000 --- a/revxlp/boards/seeeduino_xiao.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_SPI=y -CONFIG_ZMK_KSCAN_MATRIX_POLLING=y diff --git a/revxlp/boards/seeeduino_xiao_ble.conf b/revxlp/boards/seeeduino_xiao_ble.conf deleted file mode 100644 index 5616bfc..0000000 --- a/revxlp/boards/seeeduino_xiao_ble.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SPI=y diff --git a/revxlp/boards/seeeduino_xiao_ble.overlay b/revxlp/boards/seeeduino_xiao_ble.overlay deleted file mode 100644 index 5b37ffb..0000000 --- a/revxlp/boards/seeeduino_xiao_ble.overlay +++ /dev/null @@ -1,13 +0,0 @@ -&spi2_default { - group1 { - psels = , - ; - }; -}; - -&spi2_sleep { - group1 { - psels = , - ; - }; -}; diff --git a/revxlp/boards/shields/revxlp/Kconfig.defconfig b/revxlp/boards/shields/revxlp/Kconfig.defconfig new file mode 100644 index 0000000..da27481 --- /dev/null +++ b/revxlp/boards/shields/revxlp/Kconfig.defconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_REVXLP +config ZMK_KEYBOARD_NAME + default "revxlp" +endif diff --git a/revxlp/boards/shields/revxlp/Kconfig.shield b/revxlp/boards/shields/revxlp/Kconfig.shield new file mode 100644 index 0000000..98e33ea --- /dev/null +++ b/revxlp/boards/shields/revxlp/Kconfig.shield @@ -0,0 +1,6 @@ +# Copyright (c) 2024 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_REVXLP + def_bool $(shields_list_contains,revxlp) + select SPI diff --git a/revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf new file mode 100644 index 0000000..81b8cd7 --- /dev/null +++ b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf @@ -0,0 +1,2 @@ +CONFIG_SPI=y +CONFIG_ZMK_KSCAN_MATRIX_POLLING=y diff --git a/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf new file mode 100644 index 0000000..5616bfc --- /dev/null +++ b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf @@ -0,0 +1 @@ +CONFIG_SPI=y diff --git a/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay new file mode 100644 index 0000000..5b37ffb --- /dev/null +++ b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay @@ -0,0 +1,13 @@ +&spi2_default { + group1 { + psels = , + ; + }; +}; + +&spi2_sleep { + group1 { + psels = , + ; + }; +}; diff --git a/revxlp/boards/shields/revxlp/revxlp.overlay b/revxlp/boards/shields/revxlp/revxlp.overlay new file mode 100644 index 0000000..88bdc8a --- /dev/null +++ b/revxlp/boards/shields/revxlp/revxlp.overlay @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2024 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +&xiao_serial { status = "disabled"; }; + +&xiao_spi { + status = "okay"; + cs-gpios = <&xiao_d 9 GPIO_ACTIVE_LOW>; + shifter: 595@0 { + compatible = "zmk,gpio-595"; + status = "okay"; + gpio-controller; + spi-max-frequency = <200000>; + reg = <0>; + label = "4HC595"; + #gpio-cells = <2>; + ngpios = <8>; + }; +}; + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <6>; + rows = <7>; + + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(1,5) RC(1,4) RC(1,3) RC(1,2) RC(1,1) RC(1,0) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,5) RC(3,4) RC(3,3) RC(3,2) RC(3,1) RC(3,0) +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) RC(5,1) RC(5,0) + RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) + >; + }; + + kscan0: kscan_0 { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + diode-direction = "col2row"; + + col-gpios + = <&shifter 7 GPIO_ACTIVE_HIGH> + , <&shifter 6 GPIO_ACTIVE_HIGH> + , <&shifter 5 GPIO_ACTIVE_HIGH> + , <&shifter 4 GPIO_ACTIVE_HIGH> + , <&shifter 3 GPIO_ACTIVE_HIGH> + , <&shifter 2 GPIO_ACTIVE_HIGH> + ; + + row-gpios + = <&xiao_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; +}; diff --git a/revxlp/boards/shields/revxlp/revxlp.zmk.yml b/revxlp/boards/shields/revxlp/revxlp.zmk.yml new file mode 100644 index 0000000..64527ee --- /dev/null +++ b/revxlp/boards/shields/revxlp/revxlp.zmk.yml @@ -0,0 +1,7 @@ +file_format: "1" +id: revxlp +name: revxlp +type: shield +url: https://gitlab.com/lpgalaxy/revxlp +features: + - keys 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/revxlp.overlay b/revxlp/revxlp.overlay deleted file mode 100644 index dbade4a..0000000 --- a/revxlp/revxlp.overlay +++ /dev/null @@ -1,64 +0,0 @@ -//Copyright (c) 2024 The ZMK Contributors -//SPDX-License-Identifier: MIT - -#include - -&xiao_serial { status = "disabled"; }; - -&xiao_spi { - status = "okay"; - cs-gpios = <&xiao_d 9 GPIO_ACTIVE_LOW>; - shifter: 595@0 { - compatible = "zmk,gpio-595"; - status = "okay"; - gpio-controller; - spi-max-frequency = <200000>; - reg = <0>; - #gpio-cells = <2>; - ngpios = <8>; - }; -}; - -/ { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <6>; - rows = <7>; - - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(1,5) RC(1,4) RC(1,3) RC(1,2) RC(1,1) RC(1,0) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,5) RC(3,4) RC(3,3) RC(3,2) RC(3,1) RC(3,0) -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) RC(5,1) RC(5,0) - RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) - >; - }; - - kscan0: kscan_0 { - compatible = "zmk,kscan-gpio-matrix"; - diode-direction = "col2row"; - - col-gpios - = <&shifter 7 GPIO_ACTIVE_HIGH> - , <&shifter 6 GPIO_ACTIVE_HIGH> - , <&shifter 5 GPIO_ACTIVE_HIGH> - , <&shifter 4 GPIO_ACTIVE_HIGH> - , <&shifter 3 GPIO_ACTIVE_HIGH> - , <&shifter 2 GPIO_ACTIVE_HIGH> - ; - - row-gpios - = <&xiao_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - }; -}; diff --git a/revxlp/revxlp.zmk.yml b/revxlp/revxlp.zmk.yml deleted file mode 100644 index 64527ee..0000000 --- a/revxlp/revxlp.zmk.yml +++ /dev/null @@ -1,7 +0,0 @@ -file_format: "1" -id: revxlp -name: revxlp -type: shield -url: https://gitlab.com/lpgalaxy/revxlp -features: - - keys 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: . -- cgit v1.2.3