Merge pull request #1 from DLBPointon/sofle-update

Delete config/sof.conf
DLBPointon · Aug 18, 2024 · 00469d8 · 00469d8
2 parents 084724e + 404c98c
commit 00469d8
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 48 deletions.
diff --git a/boards/shields/sof/Kconfig.shield b/boards/shields/sof/Kconfig.shield
diff --git a/boards/shields/sof/Kconfig.defconfig → boards/shields/sofle/Kconfig.defconfig b/boards/shields/sof/Kconfig.defconfig → boards/shields/sofle/Kconfig.defconfig
@@ -1,17 +1,17 @@
 # Copyright (c) 2020 Ryan Cross
 # SPDX-License-Identifier: MIT
 
-if SHIELD_SOF_LEFT
+if SHIELD_SOFLE_LEFT
 
 config ZMK_KEYBOARD_NAME
-    default "SOF"
+    default "SOFLE"
 
 config ZMK_SPLIT_ROLE_CENTRAL
     default y
 
 endif
 
-if SHIELD_SOF_LEFT || SHIELD_SOF_RIGHT
+if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT
 
 config ZMK_SPLIT
     default y
@@ -49,4 +49,4 @@ config WS2812_STRIP
     default y
 endif
 
-endif
+endif
diff --git a/boards/shields/sofle/Kconfig.shield b/boards/shields/sofle/Kconfig.shield
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 Ryan Cross
+# SPDX-License-Identifier: MIT
+
+config SHIELD_SOFLE_LEFT
+    def_bool $(shields_list_contains,sofle_left)
+
+config SHIELD_SOFLE_RIGHT
+    def_bool $(shields_list_contains,sofle_right)
diff --git a/boards/shields/sof/sof_left.overlay → boards/shields/sofle/sofle-left.overlay b/boards/shields/sof/sof_left.overlay → boards/shields/sofle/sofle-left.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "sof.dtsi"
+#include "sofle.dtsi"
 
 &kscan0 {
     col-gpios
@@ -19,4 +19,4 @@
 
 &left_encoder {
     status = "okay";
-};
+};
diff --git a/boards/shields/sof/sof_right.overlay → boards/shields/sofle/sofle-right.overlay b/boards/shields/sof/sof_right.overlay → boards/shields/sofle/sofle-right.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "sof.dtsi"
+#include "sofle.dtsi"
 
 &default_transform {
     col-offset = <6>;
@@ -23,4 +23,4 @@
 
 &right_encoder {
     status = "okay";
-};
+};
diff --git a/boards/shields/sof/sof.dtsi → boards/shields/sofle/sofle.dtsi b/boards/shields/sof/sof.dtsi → boards/shields/sofle/sofle.dtsi
@@ -85,4 +85,4 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
         inversion-on;
         prechargep = <0x22>;
     };
-};
+};
diff --git a/boards/shields/sof/sof.zmk.yml → boards/shields/sofle/sofle.zmk.yml b/boards/shields/sof/sof.zmk.yml → boards/shields/sofle/sofle.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
-id: sof
-name: sof
+id: sofle
+name: sofle
 type: shield
 url: https://github.com/DLBPointon
 requires: [pro_micro]
@@ -11,5 +11,5 @@ features:
   - encoder
   - underglow
 siblings:
-  - sof_left
-  - sof_right
+  - sofle_left
+  - sofle_right
diff --git a/boards/shields/sof/sof_right.config → boards/shields/sofle/sofle_left.config b/boards/shields/sof/sof_right.config → boards/shields/sofle/sofle_left.config
@@ -1,2 +1,2 @@
 # Copyright (c) 2020 Ryan Cross
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT
diff --git a/boards/shields/sof/sof_left.config → boards/shields/sofle/sofle_right.config b/boards/shields/sof/sof_left.config → boards/shields/sofle/sofle_right.config
@@ -1,2 +1,2 @@
 # Copyright (c) 2020 Ryan Cross
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT
diff --git a/config/sof.conf b/config/sof.conf
-Original file line number
+Diff line change
@@ Expand Up @@
             inversion-on;
             prechargep = <0x22>;
         };
-    };
+    };