From ee35fb07b0c3d3b1fb5f03bf83120eed17628b93 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:31:16 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Put=20Tronxy=20CXY=20products=20?=
 =?UTF-8?q?in=20build=20folder=20(#27353)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/tronxy_cxy_446_v10.py     | 16 +++++++++-------
 ini/stm32f4.ini                                  |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/tronxy_cxy_446_v10.py b/buildroot/share/PlatformIO/scripts/tronxy_cxy_446_v10.py
index 4cbbf375f6..9c7e2b7563 100644
--- a/buildroot/share/PlatformIO/scripts/tronxy_cxy_446_v10.py
+++ b/buildroot/share/PlatformIO/scripts/tronxy_cxy_446_v10.py
@@ -10,29 +10,31 @@ if pioutil.is_pio_build():
     env = pioutil.env
 
     # Check whether the "update" folder exists
-    outpath = "update"
+    outpath = f"{env['PROJECT_BUILD_DIR']}/{env['PIOENV']}/update"
     if not os.path.exists(outpath): os.makedirs(outpath)
 
     # Build "fmw_tronxy.hex" and place in "update" folder
     def output_target_hex():
-        tar_hex = f"{outpath}/fmw_tronxy.hex"
+        hex_path  = f"update/fmw_tronxy.hex"
+        hex_long = f"$PROJECT_BUILD_DIR/$PIOENV/{hex_path}"
         env.AddPostAction(
             "$BUILD_DIR/${PROGNAME}.elf",
             env.VerboseAction(" ".join([
                 "$OBJCOPY", "-O", "ihex", "-R", ".eeprom",
-                "$BUILD_DIR/${PROGNAME}.elf", tar_hex
-            ]), "Building %s" % tar_hex)
+                "$BUILD_DIR/${PROGNAME}.elf", hex_long
+            ]), f"Building {hex_path}")
         )
 
     # Build "fmw_tronxy.bin" and place in "update" folder
     def output_target_bin():
-        tar_bin = f"{outpath}/fmw_tronxy.bin"
+        bin_path  = f"update/fmw_tronxy.bin"
+        bin_long = f"$PROJECT_BUILD_DIR/$PIOENV/{bin_path}"
         env.AddPostAction(
             "$BUILD_DIR/${PROGNAME}.elf",
             env.VerboseAction(" ".join([
                 "$OBJCOPY", "-O", "binary", "-R", ".eeprom",
-                "$BUILD_DIR/${PROGNAME}.elf", tar_bin
-            ]), "Building %s" % tar_bin)
+                "$BUILD_DIR/${PROGNAME}.elf", bin_long
+            ]), f"Building {bin_path}")
         )
 
     output_target_hex()
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 24db0b2dbb..afa4ef5240 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -819,7 +819,6 @@ extends              = stm32_variant
 board                = marlin_STM32F446ZET_tronxy
 board_build.ldscript = buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld
 board_build.offset   = 0x10000
-board_build.rename   = fmw_tronxy.bin
 build_flags          = ${stm32_variant.build_flags}
                        -DSTM32F4xx -DUSE_USB_HS
                        -DUSE_USB_HS_IN_FS