From 6f8ab2a2bd513f75b8c8d9e27a0ab4fe30311d11 Mon Sep 17 00:00:00 2001 From: OGRE Date: Tue, 15 Aug 2023 00:23:18 -0400 Subject: [PATCH] Normalized internal naming for cmake to figure out file existance --- app/boards/shields/{ergos1_oe => ergo_s1_oe}/Kconfig.defconfig | 0 app/boards/shields/{ergos1_oe => ergo_s1_oe}/Kconfig.shield | 1 + .../shields/{ergos1_oe => ergo_s1_oe}/boards/nice_nano.overlay | 0 .../{ergos1_oe/ergos1_oe.dtsi => ergo_s1_oe/ergo_s1_oe.dtsi} | 0 .../ergos1_oe.keymap => ergo_s1_oe/ergo_s1_oe.keymap} | 0 .../ergos1_oe.zmk.yml => ergo_s1_oe/ergo_s1_oe.zmk.yml} | 0 .../ergos1_oe_left.conf => ergo_s1_oe/ergo_s1_oe_left.conf} | 0 .../ergo_s1_oe_left.overlay} | 2 +- .../ergos1_oe_right.conf => ergo_s1_oe/ergo_s1_oe_right.conf} | 0 .../ergo_s1_oe_right.overlay} | 2 +- 10 files changed, 3 insertions(+), 2 deletions(-) rename app/boards/shields/{ergos1_oe => ergo_s1_oe}/Kconfig.defconfig (100%) rename app/boards/shields/{ergos1_oe => ergo_s1_oe}/Kconfig.shield (99%) rename app/boards/shields/{ergos1_oe => ergo_s1_oe}/boards/nice_nano.overlay (100%) rename app/boards/shields/{ergos1_oe/ergos1_oe.dtsi => ergo_s1_oe/ergo_s1_oe.dtsi} (100%) rename app/boards/shields/{ergos1_oe/ergos1_oe.keymap => ergo_s1_oe/ergo_s1_oe.keymap} (100%) rename app/boards/shields/{ergos1_oe/ergos1_oe.zmk.yml => ergo_s1_oe/ergo_s1_oe.zmk.yml} (100%) rename app/boards/shields/{ergos1_oe/ergos1_oe_left.conf => ergo_s1_oe/ergo_s1_oe_left.conf} (100%) rename app/boards/shields/{ergos1_oe/ergos1_oe_left.overlay => ergo_s1_oe/ergo_s1_oe_left.overlay} (94%) rename app/boards/shields/{ergos1_oe/ergos1_oe_right.conf => ergo_s1_oe/ergo_s1_oe_right.conf} (100%) rename app/boards/shields/{ergos1_oe/ergos1_oe_right.overlay => ergo_s1_oe/ergo_s1_oe_right.overlay} (94%) diff --git a/app/boards/shields/ergos1_oe/Kconfig.defconfig b/app/boards/shields/ergo_s1_oe/Kconfig.defconfig similarity index 100% rename from app/boards/shields/ergos1_oe/Kconfig.defconfig rename to app/boards/shields/ergo_s1_oe/Kconfig.defconfig diff --git a/app/boards/shields/ergos1_oe/Kconfig.shield b/app/boards/shields/ergo_s1_oe/Kconfig.shield similarity index 99% rename from app/boards/shields/ergos1_oe/Kconfig.shield rename to app/boards/shields/ergo_s1_oe/Kconfig.shield index 7307e723..db803ae9 100644 --- a/app/boards/shields/ergos1_oe/Kconfig.shield +++ b/app/boards/shields/ergo_s1_oe/Kconfig.shield @@ -1,5 +1,6 @@ # Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT + config SHIELD_ERGO_S1_OE_LEFT def_bool $(shields_list_contains,ergo_s1_oe_left) diff --git a/app/boards/shields/ergos1_oe/boards/nice_nano.overlay b/app/boards/shields/ergo_s1_oe/boards/nice_nano.overlay similarity index 100% rename from app/boards/shields/ergos1_oe/boards/nice_nano.overlay rename to app/boards/shields/ergo_s1_oe/boards/nice_nano.overlay diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.dtsi b/app/boards/shields/ergo_s1_oe/ergo_s1_oe.dtsi similarity index 100% rename from app/boards/shields/ergos1_oe/ergos1_oe.dtsi rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe.dtsi diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.keymap b/app/boards/shields/ergo_s1_oe/ergo_s1_oe.keymap similarity index 100% rename from app/boards/shields/ergos1_oe/ergos1_oe.keymap rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe.keymap diff --git a/app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml b/app/boards/shields/ergo_s1_oe/ergo_s1_oe.zmk.yml similarity index 100% rename from app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe.zmk.yml diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_left.conf b/app/boards/shields/ergo_s1_oe/ergo_s1_oe_left.conf similarity index 100% rename from app/boards/shields/ergos1_oe/ergos1_oe_left.conf rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe_left.conf diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay b/app/boards/shields/ergo_s1_oe/ergo_s1_oe_left.overlay similarity index 94% rename from app/boards/shields/ergos1_oe/ergos1_oe_left.overlay rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe_left.overlay index 49def51c..58c2609c 100644 --- a/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay +++ b/app/boards/shields/ergo_s1_oe/ergo_s1_oe_left.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "ergos1_oe.dtsi" +#include "ergo_s1_oe.dtsi" &kscan0 { col-gpios diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_right.conf b/app/boards/shields/ergo_s1_oe/ergo_s1_oe_right.conf similarity index 100% rename from app/boards/shields/ergos1_oe/ergos1_oe_right.conf rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe_right.conf diff --git a/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay b/app/boards/shields/ergo_s1_oe/ergo_s1_oe_right.overlay similarity index 94% rename from app/boards/shields/ergos1_oe/ergos1_oe_right.overlay rename to app/boards/shields/ergo_s1_oe/ergo_s1_oe_right.overlay index c3db30bc..5fed211b 100644 --- a/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay +++ b/app/boards/shields/ergo_s1_oe/ergo_s1_oe_right.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "ergos1_oe.dtsi" +#include "ergo_s1_oe.dtsi" &default_transform { col-offset = <8>;