adjust variant

MarlinFirmware · Oct 1, 2022 · fa97ab4 · fa97ab4
1 parent f57516f
commit fa97ab4
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 7 deletions.
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -710,7 +710,7 @@
 #elif MB(FYSETC_SPIDER_KING407)
   #include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4                              env:FYSETC_SPIDER_KING407
 #elif MB(TRONXY_V10)
-  #include "stm32f4/pins_TRONXY_F446.h"         //STM32F4                                 env:tronxy_stm32f446
+  #include "stm32f4/pins_TRONXY_F446.h"         // STM32F4                                env:STM32F446_tronxy
 
 //
 // ARM Cortex M7

diff --git a/...IO/boards/marlin_tronxy_stm32f446zet.json → ...IO/boards/marlin_STM32F446ZET_tronxy.json b/...IO/boards/marlin_tronxy_stm32f446zet.json → ...IO/boards/marlin_STM32F446ZET_tronxy.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DSTM32F446xx",
     "f_cpu": "180000000L",
     "mcu": "stm32f446zet6",
-    "variant": "MARLIN_TRONXY_STM32f446Z"
+    "variant": "MARLIN_F446Zx_TRONXY"
   },
   "connectivity": [
     "can"

diff --git a/...MARLIN_TRONXY_STM32f446Z/PeripheralPins.c → ...nts/MARLIN_F446Zx_TRONXY/PeripheralPins.c b/...MARLIN_TRONXY_STM32f446Z/PeripheralPins.c → ...nts/MARLIN_F446Zx_TRONXY/PeripheralPins.c
diff --git a/...ts/MARLIN_TRONXY_STM32f446Z/PinNamesVar.h → ...riants/MARLIN_F446Zx_TRONXY/PinNamesVar.h b/...ts/MARLIN_TRONXY_STM32f446Z/PinNamesVar.h → ...riants/MARLIN_F446Zx_TRONXY/PinNamesVar.h
diff --git a/...ARLIN_TRONXY_STM32f446Z/hal_conf_custom.h → ...ts/MARLIN_F446Zx_TRONXY/hal_conf_custom.h b/...ARLIN_TRONXY_STM32f446Z/hal_conf_custom.h → ...ts/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
diff --git a/...ants/MARLIN_TRONXY_STM32f446Z/ldscript.ld → ...variants/MARLIN_F446Zx_TRONXY/ldscript.ld b/...ants/MARLIN_TRONXY_STM32f446Z/ldscript.ld → ...variants/MARLIN_F446Zx_TRONXY/ldscript.ld
diff --git a/...ants/MARLIN_TRONXY_STM32f446Z/variant.cpp → ...variants/MARLIN_F446Zx_TRONXY/variant.cpp b/...ants/MARLIN_TRONXY_STM32f446Z/variant.cpp → ...variants/MARLIN_F446Zx_TRONXY/variant.cpp
diff --git a/...riants/MARLIN_TRONXY_STM32f446Z/variant.h → ...O/variants/MARLIN_F446Zx_TRONXY/variant.h b/...riants/MARLIN_TRONXY_STM32f446Z/variant.h → ...O/variants/MARLIN_F446Zx_TRONXY/variant.h
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -688,16 +688,14 @@ debug_tool                  = stlink
 #
 # STM32F446ZET6 ARM Cortex-M4
 #
-[env:tronxy_stm32f446]
+[env:STM32F446_tronxy]
 platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
-board                       = marlin_tronxy_stm32f446zet
+board                       = marlin_STM32F446ZET_tronxy
 board_build.offset          = 0x10000
-board_build.ldscript        = buildroot/share/PlatformIO/variants/MARLIN_TRONXY_STM32f446Z/ldscript.ld
 board_build.rename          = fmw_tronxy.bin
 build_src_filter            = ${common_stm32.build_src_filter}
 build_flags                 = ${stm32_variant.build_flags}
                               -DSTM32F4xx
 build_unflags               = ${stm32_variant.build_unflags} -fno-rtti
-                              -DUSBCON        ;disable arduino use serial
-                              -DUSBD_USE_CDC  ;disable arduino usb hook
+                              -DUSBCON -DUSBD_USE_CDC