From d9291985c8501ddc4b84714737f62304f503e910 Mon Sep 17 00:00:00 2001 From: Tom Groenwoldt Date: Sat, 17 Feb 2024 02:44:28 +0100 Subject: [PATCH] Shift everything into upper config folder --- .../shields/corne => }/Kconfig.defconfig | 0 .../{boards/shields/corne => }/Kconfig.shield | 0 .../shields/corne/boards/nice_nano.overlay | 46 ----------- .../shields/corne/boards/nice_nano_v2.overlay | 46 ----------- config/boards/shields/corne/corne.conf | 6 -- config/boards/shields/corne/corne.dtsi | 82 ------------------- .../boards/shields/corne/corne_left.overlay | 18 ---- .../boards/shields/corne/corne_right.overlay | 26 ------ .../{boards/shields/corne => }/corne.keymap | 0 .../{boards/shields/corne => }/corne.zmk.yml | 0 .../shields/corne => }/corne_dongle.conf | 0 .../shields/corne => }/corne_dongle.overlay | 0 .../shields/corne => }/corne_left.conf | 0 .../corne => }/corne_peripheral_left.conf | 0 .../corne => }/corne_peripheral_left.overlay | 0 .../shields/corne => }/corne_right.conf | 0 16 files changed, 224 deletions(-) rename config/{boards/shields/corne => }/Kconfig.defconfig (100%) rename config/{boards/shields/corne => }/Kconfig.shield (100%) delete mode 100644 config/boards/shields/corne/boards/nice_nano.overlay delete mode 100644 config/boards/shields/corne/boards/nice_nano_v2.overlay delete mode 100644 config/boards/shields/corne/corne.conf delete mode 100644 config/boards/shields/corne/corne.dtsi delete mode 100644 config/boards/shields/corne/corne_left.overlay delete mode 100644 config/boards/shields/corne/corne_right.overlay rename config/{boards/shields/corne => }/corne.keymap (100%) rename config/{boards/shields/corne => }/corne.zmk.yml (100%) rename config/{boards/shields/corne => }/corne_dongle.conf (100%) rename config/{boards/shields/corne => }/corne_dongle.overlay (100%) rename config/{boards/shields/corne => }/corne_left.conf (100%) rename config/{boards/shields/corne => }/corne_peripheral_left.conf (100%) rename config/{boards/shields/corne => }/corne_peripheral_left.overlay (100%) rename config/{boards/shields/corne => }/corne_right.conf (100%) diff --git a/config/boards/shields/corne/Kconfig.defconfig b/config/Kconfig.defconfig similarity index 100% rename from config/boards/shields/corne/Kconfig.defconfig rename to config/Kconfig.defconfig diff --git a/config/boards/shields/corne/Kconfig.shield b/config/Kconfig.shield similarity index 100% rename from config/boards/shields/corne/Kconfig.shield rename to config/Kconfig.shield diff --git a/config/boards/shields/corne/boards/nice_nano.overlay b/config/boards/shields/corne/boards/nice_nano.overlay deleted file mode 100644 index 424a617..0000000 --- a/config/boards/shields/corne/boards/nice_nano.overlay +++ /dev/null @@ -1,46 +0,0 @@ -#include - -&pinctrl { - spi3_default: spi3_default { - group1 { - psels = ; - }; - }; - - spi3_sleep: spi3_sleep { - group1 { - psels = ; - low-power-enable; - }; - }; -}; - -&spi3 { - compatible = "nordic,nrf-spim"; - status = "okay"; - - pinctrl-0 = <&spi3_default>; - pinctrl-1 = <&spi3_sleep>; - pinctrl-names = "default", "sleep"; - - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - - /* SPI */ - reg = <0>; /* ignored, but necessary for SPI bindings */ - spi-max-frequency = <4000000>; - - /* WS2812 */ - chain-length = <10>; /* arbitrary; change at will */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; - - color-mapping = ; - }; -}; - -/ { - chosen { - zmk,underglow = &led_strip; - }; -}; diff --git a/config/boards/shields/corne/boards/nice_nano_v2.overlay b/config/boards/shields/corne/boards/nice_nano_v2.overlay deleted file mode 100644 index 424a617..0000000 --- a/config/boards/shields/corne/boards/nice_nano_v2.overlay +++ /dev/null @@ -1,46 +0,0 @@ -#include - -&pinctrl { - spi3_default: spi3_default { - group1 { - psels = ; - }; - }; - - spi3_sleep: spi3_sleep { - group1 { - psels = ; - low-power-enable; - }; - }; -}; - -&spi3 { - compatible = "nordic,nrf-spim"; - status = "okay"; - - pinctrl-0 = <&spi3_default>; - pinctrl-1 = <&spi3_sleep>; - pinctrl-names = "default", "sleep"; - - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - - /* SPI */ - reg = <0>; /* ignored, but necessary for SPI bindings */ - spi-max-frequency = <4000000>; - - /* WS2812 */ - chain-length = <10>; /* arbitrary; change at will */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; - - color-mapping = ; - }; -}; - -/ { - chosen { - zmk,underglow = &led_strip; - }; -}; diff --git a/config/boards/shields/corne/corne.conf b/config/boards/shields/corne/corne.conf deleted file mode 100644 index 974243c..0000000 --- a/config/boards/shields/corne/corne.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Uncomment the following lines to enable the Corne RGB Underglow -# CONFIG_ZMK_RGB_UNDERGLOW=y -# CONFIG_WS2812_STRIP=y - -# Uncomment the following line to enable the Corne OLED Display -# CONFIG_ZMK_DISPLAY=y diff --git a/config/boards/shields/corne/corne.dtsi b/config/boards/shields/corne/corne.dtsi deleted file mode 100644 index f6d41e3..0000000 --- a/config/boards/shields/corne/corne.dtsi +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ - -#include - -/ { - chosen { - zephyr,display = &oled; - zmk,kscan = &kscan0; - zmk,matrix-transform = &default_transform; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <12>; - rows = <4>; -// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | -// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | -// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | -// | SW19 | SW20 | SW21 | | SW21 | SW20 | SW19 | - map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) - RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) - >; - }; - - five_column_transform: keymap_transform_1 { - compatible = "zmk,matrix-transform"; - columns = <10>; - rows = <4>; -// | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | -// | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | -// | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | -// | SW19 | SW20 | SW21 | | SW21 | SW20 | SW19 | - map = < -RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) -RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) -RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) - RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) - >; - }; - - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - - diode-direction = "col2row"; - row-gpios - = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - - }; - - // TODO: per-key RGB node(s)? -}; - -&pro_micro_i2c { - status = "okay"; - - oled: ssd1306@3c { - compatible = "solomon,ssd1306fb"; - reg = <0x3c>; - width = <128>; - height = <32>; - segment-offset = <0>; - page-offset = <0>; - display-offset = <0>; - multiplex-ratio = <31>; - segment-remap; - com-invdir; - com-sequential; - inversion-on; - prechargep = <0x22>; - }; -}; diff --git a/config/boards/shields/corne/corne_left.overlay b/config/boards/shields/corne/corne_left.overlay deleted file mode 100644 index 117cb19..0000000 --- a/config/boards/shields/corne/corne_left.overlay +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ - -#include "corne.dtsi" - -&kscan0 { - col-gpios - = <&pro_micro 21 GPIO_ACTIVE_HIGH> - , <&pro_micro 20 GPIO_ACTIVE_HIGH> - , <&pro_micro 19 GPIO_ACTIVE_HIGH> - , <&pro_micro 18 GPIO_ACTIVE_HIGH> - , <&pro_micro 15 GPIO_ACTIVE_HIGH> - , <&pro_micro 14 GPIO_ACTIVE_HIGH> - ; -}; diff --git a/config/boards/shields/corne/corne_right.overlay b/config/boards/shields/corne/corne_right.overlay deleted file mode 100644 index a8a0cfe..0000000 --- a/config/boards/shields/corne/corne_right.overlay +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson - * - * SPDX-License-Identifier: MIT - */ - -#include "corne.dtsi" - -&default_transform { - col-offset = <6>; -}; - -&five_column_transform { - col-offset = <6>; -}; - -&kscan0 { - col-gpios - = <&pro_micro 14 GPIO_ACTIVE_HIGH> - , <&pro_micro 15 GPIO_ACTIVE_HIGH> - , <&pro_micro 18 GPIO_ACTIVE_HIGH> - , <&pro_micro 19 GPIO_ACTIVE_HIGH> - , <&pro_micro 20 GPIO_ACTIVE_HIGH> - , <&pro_micro 21 GPIO_ACTIVE_HIGH> - ; -}; diff --git a/config/boards/shields/corne/corne.keymap b/config/corne.keymap similarity index 100% rename from config/boards/shields/corne/corne.keymap rename to config/corne.keymap diff --git a/config/boards/shields/corne/corne.zmk.yml b/config/corne.zmk.yml similarity index 100% rename from config/boards/shields/corne/corne.zmk.yml rename to config/corne.zmk.yml diff --git a/config/boards/shields/corne/corne_dongle.conf b/config/corne_dongle.conf similarity index 100% rename from config/boards/shields/corne/corne_dongle.conf rename to config/corne_dongle.conf diff --git a/config/boards/shields/corne/corne_dongle.overlay b/config/corne_dongle.overlay similarity index 100% rename from config/boards/shields/corne/corne_dongle.overlay rename to config/corne_dongle.overlay diff --git a/config/boards/shields/corne/corne_left.conf b/config/corne_left.conf similarity index 100% rename from config/boards/shields/corne/corne_left.conf rename to config/corne_left.conf diff --git a/config/boards/shields/corne/corne_peripheral_left.conf b/config/corne_peripheral_left.conf similarity index 100% rename from config/boards/shields/corne/corne_peripheral_left.conf rename to config/corne_peripheral_left.conf diff --git a/config/boards/shields/corne/corne_peripheral_left.overlay b/config/corne_peripheral_left.overlay similarity index 100% rename from config/boards/shields/corne/corne_peripheral_left.overlay rename to config/corne_peripheral_left.overlay diff --git a/config/boards/shields/corne/corne_right.conf b/config/corne_right.conf similarity index 100% rename from config/boards/shields/corne/corne_right.conf rename to config/corne_right.conf