fix: namings in dongle caused incorrect build outputs

zeljkobekcic · Jul 31, 2024 · 433999e · 433999e
1 parent 5ed9722
commit 433999e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/config/boards/shields/temper-dongle/Kconfig.defconfig b/config/boards/shields/temper-dongle/Kconfig.defconfig
@@ -1,4 +1,4 @@
-if SHIELD_TEMPER_DONGLE
+if SHIELD_TEMPER_DONGLE_DONGLE
 
 config ZMK_KEYBOARD_NAME
 	default "Temper Dongle"
@@ -8,7 +8,7 @@ config ZMK_SPLIT_ROLE_CENTRAL
 
 endif
 
-if SHIELD_TEMPER_LEFT || SHIELD_TEMPER_RIGHT || SHIELD_TEMPER_DONGLE
+if SHIELD_TEMPER_DONGLE_LEFT || SHIELD_TEMPER_DONGLE_RIGHT || SHIELD_TEMPER_DONGLE_DONGLE
 
 config ZMK_SPLIT
     default y

diff --git a/config/boards/shields/temper-dongle/Kconfig.shield b/config/boards/shields/temper-dongle/Kconfig.shield
@@ -1,11 +1,11 @@
 # Copyright (c) 2020 Pete Johanson
 # SPDX-License-Identifier: MIT
 
-config SHIELD_TEMPER_LEFT
+config SHIELD_TEMPER_DONGLE_LEFT
     def_bool $(shields_list_contains,temper_dongle_left)
 
-config SHIELD_TEMPER_RIGHT
+config SHIELD_TEMPER_DONGLE_RIGHT
     def_bool $(shields_list_contains,temper_dongle_right)
 
-config SHIELD_TEMPER_DONGLE
+config SHIELD_TEMPER_DONGLE_DONGLE
     def_bool $(shields_list_contains,temper_dongle_dongle)
diff --git a/.../boards/shields/temper-dongle/temper.conf → .../shields/temper-dongle/temper_dongle.conf b/.../boards/shields/temper-dongle/temper.conf → .../shields/temper-dongle/temper_dongle.conf
diff --git a/.../boards/shields/temper-dongle/temper.dtsi → .../shields/temper-dongle/temper_dongle.dtsi b/.../boards/shields/temper-dongle/temper.dtsi → .../shields/temper-dongle/temper_dongle.dtsi
diff --git a/...oards/shields/temper-dongle/temper.keymap → ...hields/temper-dongle/temper_dongle.keymap b/...oards/shields/temper-dongle/temper.keymap → ...hields/temper-dongle/temper_dongle.keymap
diff --git a/...ards/shields/temper-dongle/temper.zmk.yml → ...ields/temper-dongle/temper_dongle.zmk.yml b/...ards/shields/temper-dongle/temper.zmk.yml → ...ields/temper-dongle/temper_dongle.zmk.yml
@@ -1,5 +1,5 @@
 file_format: "1"
-id: temper
+id: temper_dongle
 name: Chocofi Temper
 type: shield
 url: https://github.com/raeedcho/chocofi-temper

diff --git a/config/boards/shields/temper-dongle/temper_dongle_dongle.overlay b/config/boards/shields/temper-dongle/temper_dongle_dongle.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "temper.dtsi"
+#include "temper_dongle.dtsi"
 
 &kscan0 {
     col-gpios

diff --git a/config/boards/shields/temper-dongle/temper_dongle_left.overlay b/config/boards/shields/temper-dongle/temper_dongle_left.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "temper.dtsi"
+#include "temper_dongle.dtsi"
 
 &kscan0 {
     col-gpios

diff --git a/config/boards/shields/temper-dongle/temper_dongle_right.overlay b/config/boards/shields/temper-dongle/temper_dongle_right.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "temper.dtsi"
+#include "temper_dongle.dtsi"
 
 &default_transform {
     col-offset = <5>;

diff --git a/config/boards/shields/temper/temper.zmk.yml b/config/boards/shields/temper/temper.zmk.yml
@@ -7,6 +7,5 @@ requires: [pro_micro]
 features:
   - keys
 siblings:
-  - temper_dongle_left
-  - temper_dongle_right
-  - temper_dongle_dongle
+  - temper_left
+  - temper_right