From 69b0274bc522f73bf17c99fd1baabade190a8e3e Mon Sep 17 00:00:00 2001
From: AJ <1754228+280Zo@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:31:12 -0800
Subject: [PATCH] prevent copying the pysical layout dtsi for reset firmware

---
 .github/workflows/user_config_build.yaml | 11 ++++++-----
 config/charybdis.keymap                  |  4 ----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/user_config_build.yaml b/.github/workflows/user_config_build.yaml
index e79af386..d4ad9e6a 100644
--- a/.github/workflows/user_config_build.yaml
+++ b/.github/workflows/user_config_build.yaml
@@ -126,8 +126,13 @@ jobs:
             cp -R "${{ inputs.config_path }}"/* "$base_config_path/"
             echo "config files ready"
             
-            # Copy active keymap to the board directory & adjust for bt/dongle format
+            # Copy keymap & physical layouts
             if [ "${{ env.shield }}" != "settings_reset" ]; then
+              # Copy physical layout file to shield directory
+              mv -v "$base_config_path/charybdis-layouts.dtsi" \
+              "${GITHUB_WORKSPACE}/boards/shields/charybdis-${{ env.format }}/"
+
+              # Copy active keymap to the board directory & adjust for bt/dongle format
               cp -Rv "$GITHUB_WORKSPACE/${{ inputs.keymap_path }}/${{ env.keymap }}.keymap" \
                 "$base_config_path/charybdis.keymap"
               echo "format: ${{ env.format }}"
@@ -139,10 +144,6 @@ jobs:
                   ;;
               esac
             fi
-
-            # Copy physical layout file to shield directory
-            mv -v "$base_config_path/charybdis-layouts.dtsi" \
-            "${GITHUB_WORKSPACE}/boards/shields/charybdis-${{ env.format }}/"
           fi
 
           # Remove untargeted shields so they don't get auto picked up by the west build command
diff --git a/config/charybdis.keymap b/config/charybdis.keymap
index f81c6d55..35133b42 100644
--- a/config/charybdis.keymap
+++ b/config/charybdis.keymap
@@ -22,10 +22,6 @@
 //     chosen { zmk,matrix_transform = &default_transform; };
 // };
 
-/ {
-    chosen { zmk,physical-layout = &charybdis_physical_layout; };
-};
-
 / {
     /* input config for mouse move mode */
     trackball_listener {