commit 7620b42425c6404692cb4b8b51a0276136a748aa
parent c06a8f9c838e25b49b27c1d9393fdc08b6c33fe2
Author: Jack Sangdahl <0x6A73@pm.me>
Date: Sun, 25 Feb 2024 17:29:44 -0700
revxlp module
Diffstat:
14 files changed, 104 insertions(+), 82 deletions(-)
diff --git 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
@@ -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
@@ -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/shields/revxlp/Kconfig.defconfig 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
@@ -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/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
diff --git a/revxlp/boards/seeeduino_xiao_ble.overlay b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay
diff --git a/revxlp/boards/shields/revxlp/revxlp.overlay b/revxlp/boards/shields/revxlp/revxlp.overlay
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2024 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+&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/revxlp.zmk.yml b/revxlp/boards/shields/revxlp/revxlp.zmk.yml
diff --git a/revxlp/build.yaml 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
@@ -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
@@ -1,64 +0,0 @@
-//Copyright (c) 2024 The ZMK Contributors
-//SPDX-License-Identifier: MIT
-
-#include <dt-bindings/zmk/matrix_transform.h>
-
-&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/zephyr/module.yml b/revxlp/zephyr/module.yml
@@ -0,0 +1,4 @@
+name: revxlp
+build:
+ settings:
+ board_root: .
