From a35a2d0dad94aa4d1ac562ed93be0c7a552ce31f Mon Sep 17 00:00:00 2001 From: Matthias Bidlingmeyer Date: Sat, 23 Dec 2023 16:03:38 +0100 Subject: [PATCH] test: rename shield to matze --- boards/shields/corne-dongle/Kconfig.defconfig | 31 ----------------- boards/shields/corne-dongle/Kconfig.shield | 14 -------- boards/shields/matze/Kconfig.defconfig | 33 +++++++++++++++++++ boards/shields/matze/Kconfig.shield | 14 ++++++++ .../boards/nice_nano.overlay | 0 .../boards/nice_nano_v2.overlay | 0 .../corne.conf => matze/matze.conf} | 0 .../corne.dtsi => matze/matze.dtsi} | 0 .../corne.keymap => matze/matze.keymap} | 0 .../corne.zmk.yml => matze/matze.zmk.yml} | 12 +++---- .../matze_central_left.conf} | 0 .../matze_central_left.overlay} | 2 +- .../matze_dongle.conf} | 0 .../matze_dongle.overlay} | 2 +- .../corne_left.conf => matze/matze_left.conf} | 0 .../matze_left.overlay} | 2 +- .../matze_right.conf} | 0 .../matze_right.overlay} | 2 +- build.yaml | 8 ++--- 19 files changed, 61 insertions(+), 59 deletions(-) delete mode 100644 boards/shields/corne-dongle/Kconfig.defconfig delete mode 100644 boards/shields/corne-dongle/Kconfig.shield create mode 100644 boards/shields/matze/Kconfig.defconfig create mode 100644 boards/shields/matze/Kconfig.shield rename boards/shields/{corne-dongle => matze}/boards/nice_nano.overlay (100%) rename boards/shields/{corne-dongle => matze}/boards/nice_nano_v2.overlay (100%) rename boards/shields/{corne-dongle/corne.conf => matze/matze.conf} (100%) rename boards/shields/{corne-dongle/corne.dtsi => matze/matze.dtsi} (100%) rename boards/shields/{corne-dongle/corne.keymap => matze/matze.keymap} (100%) rename boards/shields/{corne-dongle/corne.zmk.yml => matze/matze.zmk.yml} (56%) rename boards/shields/{corne-dongle/corne_central_left.conf => matze/matze_central_left.conf} (100%) rename boards/shields/{corne-dongle/corne_left.overlay => matze/matze_central_left.overlay} (94%) rename boards/shields/{corne-dongle/corne_dongle.conf => matze/matze_dongle.conf} (100%) rename boards/shields/{corne-dongle/corne_dongle.overlay => matze/matze_dongle.overlay} (94%) rename boards/shields/{corne-dongle/corne_left.conf => matze/matze_left.conf} (100%) rename boards/shields/{corne-dongle/corne_central_left.overlay => matze/matze_left.overlay} (94%) rename boards/shields/{corne-dongle/corne_right.conf => matze/matze_right.conf} (100%) rename boards/shields/{corne-dongle/corne_right.overlay => matze/matze_right.overlay} (95%) diff --git a/boards/shields/corne-dongle/Kconfig.defconfig b/boards/shields/corne-dongle/Kconfig.defconfig deleted file mode 100644 index 6d92220..0000000 --- a/boards/shields/corne-dongle/Kconfig.defconfig +++ /dev/null @@ -1,31 +0,0 @@ -if SHIELD_CORNE_CENTRAL_LEFT - -config ZMK_SPLIT_ROLE_CENTRAL - default y - -config ZMK_KEYBOARD_NAME - default "Corne Left" - -endif - - -if SHIELD_CORNE_DONGLE - -config ZMK_SPLIT_ROLE_CENTRAL - default y - -config ZMK_KEYBOARD_NAME - default "Corne Dongle" - -config ZMK_USB - default y - -endif - - -if SHIELD_CORNE_LEFT || SHIELD_CORNE_RIGHT - -config ZMK_SPLIT - default y - -endif diff --git a/boards/shields/corne-dongle/Kconfig.shield b/boards/shields/corne-dongle/Kconfig.shield deleted file mode 100644 index c7a56a2..0000000 --- a/boards/shields/corne-dongle/Kconfig.shield +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2020 Pete Johanson -# SPDX-License-Identifier: MIT - -config SHIELD_CORNE_LEFT - def_bool $(shields_list_contains,corne_left) - -config SHIELD_CORNE_CENTRAL_LEFT - def_bool $(shields_list_contains,corne_central_left) - -config SHIELD_CORNE_RIGHT - def_bool $(shields_list_contains,corne_right) - -config SHIELD_CORNE_DONGLE - def_bool $(shields_list_contains,corne_dongle) diff --git a/boards/shields/matze/Kconfig.defconfig b/boards/shields/matze/Kconfig.defconfig new file mode 100644 index 0000000..54aa3ff --- /dev/null +++ b/boards/shields/matze/Kconfig.defconfig @@ -0,0 +1,33 @@ +if SHIELD_MATZE_CENTRAL_LEFT + +config ZMK_KEYBOARD_NAME + default "Matze Left" + +config ZMK_SPLIT_ROLE_CENTRAL + default y + +endif + +if SHIELD_MATZE_DONGLE + +config ZMK_KEYBOARD_NAME + default "Matze Dongle" + +config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +config ZMK_USB + default y + +endif + +if SHIELD_MATZE_LEFT || SHIELD_MATZE_RIGHT || SHIELD_MATZE_DONGLE || SHIELD_MATZE_CENTRAL_LEFT + +config ZMK_SPLIT + default y + +config ZMK_BLE + default y + +endif + diff --git a/boards/shields/matze/Kconfig.shield b/boards/shields/matze/Kconfig.shield new file mode 100644 index 0000000..2ac5d48 --- /dev/null +++ b/boards/shields/matze/Kconfig.shield @@ -0,0 +1,14 @@ +# Copyright (c) 2020 Pete Johanson +# SPDX-License-Identifier: MIT + +config SHIELD_MATZE_LEFT + def_bool $(shields_list_contains,matze_left) + +config SHIELD_MATZE_CENTRAL_LEFT + def_bool $(shields_list_contains,matze_central_left) + +config SHIELD_MATZE_RIGHT + def_bool $(shields_list_contains,matze_right) + +config SHIELD_MATZE_DONGLE + def_bool $(shields_list_contains,matze_dongle) diff --git a/boards/shields/corne-dongle/boards/nice_nano.overlay b/boards/shields/matze/boards/nice_nano.overlay similarity index 100% rename from boards/shields/corne-dongle/boards/nice_nano.overlay rename to boards/shields/matze/boards/nice_nano.overlay diff --git a/boards/shields/corne-dongle/boards/nice_nano_v2.overlay b/boards/shields/matze/boards/nice_nano_v2.overlay similarity index 100% rename from boards/shields/corne-dongle/boards/nice_nano_v2.overlay rename to boards/shields/matze/boards/nice_nano_v2.overlay diff --git a/boards/shields/corne-dongle/corne.conf b/boards/shields/matze/matze.conf similarity index 100% rename from boards/shields/corne-dongle/corne.conf rename to boards/shields/matze/matze.conf diff --git a/boards/shields/corne-dongle/corne.dtsi b/boards/shields/matze/matze.dtsi similarity index 100% rename from boards/shields/corne-dongle/corne.dtsi rename to boards/shields/matze/matze.dtsi diff --git a/boards/shields/corne-dongle/corne.keymap b/boards/shields/matze/matze.keymap similarity index 100% rename from boards/shields/corne-dongle/corne.keymap rename to boards/shields/matze/matze.keymap diff --git a/boards/shields/corne-dongle/corne.zmk.yml b/boards/shields/matze/matze.zmk.yml similarity index 56% rename from boards/shields/corne-dongle/corne.zmk.yml rename to boards/shields/matze/matze.zmk.yml index d4873c2..9a2889c 100644 --- a/boards/shields/corne-dongle/corne.zmk.yml +++ b/boards/shields/matze/matze.zmk.yml @@ -1,13 +1,13 @@ file_format: "1" -id: corne -name: Corne +id: matze +name: Matze type: shield url: https://github.com/foostan/crkbd/ requires: [pro_micro] features: - keys siblings: - - corne_left - - corne_central_left - - corne_right - - corne_dongle + - matze_left + - matze_central_left + - matze_right + - matze_dongle diff --git a/boards/shields/corne-dongle/corne_central_left.conf b/boards/shields/matze/matze_central_left.conf similarity index 100% rename from boards/shields/corne-dongle/corne_central_left.conf rename to boards/shields/matze/matze_central_left.conf diff --git a/boards/shields/corne-dongle/corne_left.overlay b/boards/shields/matze/matze_central_left.overlay similarity index 94% rename from boards/shields/corne-dongle/corne_left.overlay rename to boards/shields/matze/matze_central_left.overlay index 117cb19..6ef6212 100644 --- a/boards/shields/corne-dongle/corne_left.overlay +++ b/boards/shields/matze/matze_central_left.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "corne.dtsi" +#include "matze.dtsi" &kscan0 { col-gpios diff --git a/boards/shields/corne-dongle/corne_dongle.conf b/boards/shields/matze/matze_dongle.conf similarity index 100% rename from boards/shields/corne-dongle/corne_dongle.conf rename to boards/shields/matze/matze_dongle.conf diff --git a/boards/shields/corne-dongle/corne_dongle.overlay b/boards/shields/matze/matze_dongle.overlay similarity index 94% rename from boards/shields/corne-dongle/corne_dongle.overlay rename to boards/shields/matze/matze_dongle.overlay index 117cb19..6ef6212 100644 --- a/boards/shields/corne-dongle/corne_dongle.overlay +++ b/boards/shields/matze/matze_dongle.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "corne.dtsi" +#include "matze.dtsi" &kscan0 { col-gpios diff --git a/boards/shields/corne-dongle/corne_left.conf b/boards/shields/matze/matze_left.conf similarity index 100% rename from boards/shields/corne-dongle/corne_left.conf rename to boards/shields/matze/matze_left.conf diff --git a/boards/shields/corne-dongle/corne_central_left.overlay b/boards/shields/matze/matze_left.overlay similarity index 94% rename from boards/shields/corne-dongle/corne_central_left.overlay rename to boards/shields/matze/matze_left.overlay index 117cb19..6ef6212 100644 --- a/boards/shields/corne-dongle/corne_central_left.overlay +++ b/boards/shields/matze/matze_left.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "corne.dtsi" +#include "matze.dtsi" &kscan0 { col-gpios diff --git a/boards/shields/corne-dongle/corne_right.conf b/boards/shields/matze/matze_right.conf similarity index 100% rename from boards/shields/corne-dongle/corne_right.conf rename to boards/shields/matze/matze_right.conf diff --git a/boards/shields/corne-dongle/corne_right.overlay b/boards/shields/matze/matze_right.overlay similarity index 95% rename from boards/shields/corne-dongle/corne_right.overlay rename to boards/shields/matze/matze_right.overlay index a8a0cfe..53a7ca3 100644 --- a/boards/shields/corne-dongle/corne_right.overlay +++ b/boards/shields/matze/matze_right.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "corne.dtsi" +#include "matze.dtsi" &default_transform { col-offset = <6>; diff --git a/build.yaml b/build.yaml index 014d9ec..5c64e63 100644 --- a/build.yaml +++ b/build.yaml @@ -15,14 +15,14 @@ include: # centrals - board: nrf52840dk_nrf52840 - shield: corne_dongle + shield: matze_dongle - board: nice_nano_v2 - shield: corne_central_left + shield: matze_central_left # peripherals - board: nice_nano_v2 - shield: corne_left + shield: matze_left - board: nice_nano_v2 - shield: corne_right + shield: matze_right # To reset the boards - board: nice_nano_v2 shield: settings_reset