diff --git a/config/boards/shields/revxlp/Kconfig.defconfig b/config/boards/shields/revxlp/Kconfig.defconfig deleted file mode 100644 index 497e332..0000000 --- a/config/boards/shields/revxlp/Kconfig.defconfig +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# SPDX-License-Identifier: MIT - -if SHIELD_REVXLP - -config ZMK_KEYBOARD_NAME - default "revxlp" - -if ZMK_BACKLIGHT - -config LED_GPIO - default y - -endif # ZMK_BACKLIGHT - -endif diff --git a/config/boards/shields/revxlp/Kconfig.shield b/config/boards/shields/revxlp/Kconfig.shield deleted file mode 100644 index 25a2b5e..0000000 --- a/config/boards/shields/revxlp/Kconfig.shield +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# SPDX-License-Identifier: MIT - -config SHIELD_REVXLP - def_bool $(shields_list_contains,revxlp) - select SPI diff --git a/config/boards/shields/revxlp/boards/seeeduino_xiao.conf b/config/boards/shields/revxlp/boards/seeeduino_xiao.conf deleted file mode 100644 index 81b8cd7..0000000 --- a/config/boards/shields/revxlp/boards/seeeduino_xiao.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_SPI=y -CONFIG_ZMK_KSCAN_MATRIX_POLLING=y diff --git a/config/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf b/config/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf deleted file mode 100644 index 5616bfc..0000000 --- a/config/boards/shields/revxlp/boards/seeeduino_xiao_ble.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SPI=y diff --git a/config/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay b/config/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay deleted file mode 100644 index 5dd6427..0000000 --- a/config/boards/shields/revxlp/boards/seeeduino_xiao_ble.overlay +++ /dev/null @@ -1,14 +0,0 @@ - -&spi2_default { - group1 { - psels = , - ; - }; -}; - -&spi2_sleep { - group1 { - psels = , - ; - }; -}; diff --git a/config/boards/shields/revxlp/boards/seeeduino_xiao_rp2040.conf b/config/boards/shields/revxlp/boards/seeeduino_xiao_rp2040.conf deleted file mode 100644 index 32190ef..0000000 --- a/config/boards/shields/revxlp/boards/seeeduino_xiao_rp2040.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_PWM=y -CONFIG_LED_PWM=y diff --git a/config/boards/shields/revxlp/boards/seeeduino_xiao_rp2040.overlay b/config/boards/shields/revxlp/boards/seeeduino_xiao_rp2040.overlay deleted file mode 100644 index f671b10..0000000 --- a/config/boards/shields/revxlp/boards/seeeduino_xiao_rp2040.overlay +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include - -&backlight { status = "disabled"; }; - -&pinctrl { - pwm_ch0b_default: pwm_ch0b_default { - group1 { - pinmux = ; - }; - }; -}; - -/ { - - chosen { - zmk,backlight = &pwm_leds; - }; - - pwm_leds: pwm_leds { - compatible = "pwm-leds"; - pwm_led0: pwm_led_0 { - status = "okay"; - pwms = <&pwm 1 PWM_MSEC(1) PWM_POLARITY_NORMAL>; - label = "PWM_LED"; - }; - }; -}; - -&pwm { - status = "okay"; - pinctrl-0 = <&pwm_ch0b_default>; - pinctrl-names = "default"; - divider-int-0 = <255>; -}; diff --git a/config/boards/shields/revxlp/revxlp.conf b/config/boards/shields/revxlp/revxlp.conf deleted file mode 100644 index 0f67fc1..0000000 --- a/config/boards/shields/revxlp/revxlp.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Uncomment the following lines to enable backlight -# Ensure no space is left before the `C` in CONFIG either. -# CONFIG_ZMK_BACKLIGHT=y diff --git a/config/boards/shields/revxlp/revxlp.overlay b/config/boards/shields/revxlp/revxlp.overlay deleted file mode 100644 index bfa1d40..0000000 --- a/config/boards/shields/revxlp/revxlp.overlay +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2020 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; - zmk,backlight = &backlight; - }; - - backlight: backlight_leds { - compatible = "gpio-leds"; - led_mosfet { - gpios = <&xiao_d 7 GPIO_ACTIVE_LOW>; - label = "Backlight LED 0"; - }; - }; - - 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/config/boards/shields/revxlp/revxlp.zmk.yml b/config/boards/shields/revxlp/revxlp.zmk.yml deleted file mode 100644 index c30c1a4..0000000 --- a/config/boards/shields/revxlp/revxlp.zmk.yml +++ /dev/null @@ -1,8 +0,0 @@ -file_format: "1" -id: revlp -name: revlp -type: shield -url: https://github.com/cyril279/keyboards/tree/main/revlp -requires: [pro_micro] -features: - - keys diff --git a/config/boards/shields/revxlp/revxlp.keymap b/config/revxlp.keymap similarity index 98% rename from config/boards/shields/revxlp/revxlp.keymap rename to config/revxlp.keymap index c746221..1986484 100644 --- a/config/boards/shields/revxlp/revxlp.keymap +++ b/config/revxlp.keymap @@ -35,6 +35,13 @@ combos { compatible = "zmk,combos"; + lgui_combo { + timeout-ms = <50>; + key-positions = <16 19>; + bindings = <&kp LGUI>; + layers = ; + }; + l_curly_bracket { timeout-ms = <50>; key-positions = <2 14>; diff --git a/config/west.yml b/config/west.yml index 7aa4b6f..94d7cf2 100644 --- a/config/west.yml +++ b/config/west.yml @@ -5,9 +5,12 @@ manifest: - name: petejohanson url-base: https://github.com/petejohanson projects: - - name: zmk - remote: zmkfirmware + - name: revxlp-module + remote: petejohanson revision: main + - name: zmk + remote: petejohanson + revision: build/zephyr-module-keymap-loading-refactor import: app/west.yml self: path: config