commit 7caf3fdf91bf4974591398381a45b1a8e387f5bd
parent 5535159d5279220c2d5fc5e428b721e4a4a59df2
Author: Jack Sangdahl <jack@pngu.org>
Date: Wed, 5 Feb 2025 16:22:50 -0700
Tidy revxlp configuration
Diffstat:
8 files changed, 64 insertions(+), 84 deletions(-)
diff --git a/config/revxlp.keymap b/config/revxlp.keymap
@@ -1,6 +1,5 @@
// Copyright 2024 jack@pngu.org
// SPDX-License-Identifier: MIT
-
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
diff --git a/revxlp/boards/shields/revxlp/Kconfig.defconfig b/revxlp/boards/shields/revxlp/Kconfig.defconfig
@@ -1,7 +1,4 @@
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
if SHIELD_REVXLP
config ZMK_KEYBOARD_NAME
- default "revxlp"
+ default "revxlp"
endif
diff --git a/revxlp/boards/shields/revxlp/Kconfig.shield b/revxlp/boards/shields/revxlp/Kconfig.shield
@@ -1,6 +1,3 @@
-# Copyright (c) 2024 The ZMK Contributors
-# 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/shields/revxlp/boards/seeeduino_xiao.conf b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao.conf
@@ -1,2 +0,0 @@
-CONFIG_SPI=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y
diff --git a/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay b/revxlp/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay
@@ -1,13 +1,13 @@
&spi2_default {
- group1 {
- psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
- <NRF_PSEL(SPIM_MOSI, 1, 15)>;
- };
+ group1 {
+ psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+ <NRF_PSEL(SPIM_MOSI, 1, 15)>;
+ };
};
&spi2_sleep {
- group1 {
- psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
- <NRF_PSEL(SPIM_MOSI, 1, 15)>;
- };
+ group1 {
+ psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+ <NRF_PSEL(SPIM_MOSI, 1, 15)>;
+ };
};
diff --git a/revxlp/boards/shields/revxlp/revxlp.overlay b/revxlp/boards/shields/revxlp/revxlp.overlay
@@ -1,69 +1,62 @@
-/*
- * 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>;
- };
+ 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;
- };
+ 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";
- 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)
- >;
- };
+ 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>
+ ;
- 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)>
- ;
- };
+ 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/build.yaml b/revxlp/build.yaml
@@ -1,2 +0,0 @@
-board: [seeeduino_xiao_ble]
-shield: [revxlp]
diff --git a/revxlp/config/west.yml b/revxlp/config/west.yml
@@ -2,12 +2,10 @@ 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
+ remote: zmkfirmware
+ revision: main
import: app/west.yml
self:
path: config
