From df5034cbe0d6622a56df8df124eb75f500e0fb08 Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Wed, 22 May 2024 22:51:55 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20Rename=20FYSETC=20S6/Spider?= =?UTF-8?q?=20Environments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-build-tests.yml | 2 +- Marlin/src/pins/pins.h | 8 ++++---- buildroot/bin/mftest | 2 +- ...c_s6.json => marlin_STM32F446VE_fysetc.json} | 6 +++--- .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../ldscript.ld | 0 .../variant.cpp | 0 .../variant.h | 0 .../tests/{FYSETC_S6 => STM32F446VE_fysetc} | 2 +- ini/renamed.ini | 6 ++++++ ini/stm32f4.ini | 17 ++++++++++------- 12 files changed, 26 insertions(+), 17 deletions(-) rename buildroot/share/PlatformIO/boards/{marlin_fysetc_s6.json => marlin_STM32F446VE_fysetc.json} (85%) rename buildroot/share/PlatformIO/variants/{MARLIN_FYSETC_S6 => MARLIN_F446VE_FYSETC}/PeripheralPins.c (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_FYSETC_S6 => MARLIN_F446VE_FYSETC}/PinNamesVar.h (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_FYSETC_S6 => MARLIN_F446VE_FYSETC}/ldscript.ld (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_FYSETC_S6 => MARLIN_F446VE_FYSETC}/variant.cpp (100%) rename buildroot/share/PlatformIO/variants/{MARLIN_FYSETC_S6 => MARLIN_F446VE_FYSETC}/variant.h (100%) rename buildroot/tests/{FYSETC_S6 => STM32F446VE_fysetc} (95%) diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml index 6fde07da4291..e28de45dd361 100644 --- a/.github/workflows/ci-build-tests.yml +++ b/.github/workflows/ci-build-tests.yml @@ -110,7 +110,7 @@ jobs: - BTT_GTR_V1_0 - BTT_SKR_PRO - FLYF407ZG - - FYSETC_S6 + - STM32F446VE_fysetc - LERDGEK - LERDGEX - mks_robin_pro2 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index a8d97ecd233f..5a4811e2e64b 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -780,13 +780,13 @@ #elif MB(LERDGE_X) #include "stm32f4/pins_LERDGE_X.h" // STM32F4 env:LERDGEX env:LERDGEX_usb_flash_drive #elif MB(FYSETC_S6) - #include "stm32f4/pins_FYSETC_S6.h" // STM32F4 env:FYSETC_S6 env:FYSETC_S6_8000 + #include "stm32f4/pins_FYSETC_S6.h" // STM32F4 env:STM32F446VE_fysetc env:STM32F446VE_fysetc_32k_bootloader #elif MB(FYSETC_S6_V2_0) - #include "stm32f4/pins_FYSETC_S6_V2_0.h" // STM32F4 env:FYSETC_S6 env:FYSETC_S6_8000 + #include "stm32f4/pins_FYSETC_S6_V2_0.h" // STM32F4 env:STM32F446VE_fysetc env:STM32F446VE_fysetc_32k_bootloader #elif MB(FYSETC_SPIDER) - #include "stm32f4/pins_FYSETC_SPIDER.h" // STM32F4 env:FYSETC_S6 env:FYSETC_S6_8000 + #include "stm32f4/pins_FYSETC_SPIDER.h" // STM32F4 env:STM32F446VE_fysetc env:STM32F446VE_fysetc_32k_bootloader #elif MB(FYSETC_SPIDER_V2_2) - #include "stm32f4/pins_FYSETC_SPIDER_V2_2.h" // STM32F4 env:FYSETC_S6 env:FYSETC_S6_8000 + #include "stm32f4/pins_FYSETC_SPIDER_V2_2.h" // STM32F4 env:STM32F446VE_fysetc_32k_bootloader #elif MB(FLYF407ZG) #include "stm32f4/pins_FLYF407ZG.h" // STM32F4 env:FLYF407ZG #elif MB(MKS_ROBIN2) diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest index b6f78e4f42e8..6fe9479354fc 100755 --- a/buildroot/bin/mftest +++ b/buildroot/bin/mftest @@ -133,7 +133,7 @@ lp9|lpc9) TESTENV='LPC1769' ;; f1) TESTENV='STM32F103RE' ;; f4) TESTENV='STM32F4' ;; f7) TESTENV='STM32F7' ;; - s6) TESTENV='FYSETC_S6' ;; + s6) TESTENV='STM32F446VE_fysetc' ;; teensy) TESTENV='teensy31' ;; t31) TESTENV='teensy31' ;; t32) TESTENV='teensy31' ;; diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json b/buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json similarity index 85% rename from buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json rename to buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json index 286e46ffbd20..bbeefdf9779a 100644 --- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json +++ b/buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json @@ -3,14 +3,14 @@ "cpu": "cortex-m4", "extra_flags": "-DSTM32F446xx", "f_cpu": "180000000L", - "mcu": "stm32f446ret6", - "variant": "MARLIN_FYSETC_S6" + "mcu": "stm32f446vet6", + "variant": "MARLIN_F446VE_FYSETC" }, "connectivity": [ "can" ], "debug": { - "jlink_device": "STM32F446RE", + "jlink_device": "STM32F446VE", "openocd_target": "stm32f4x", "svd_path": "STM32F446x.svd" }, diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PeripheralPins.c similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PeripheralPins.c diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PinNamesVar.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PinNamesVar.h rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PinNamesVar.h diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/ldscript.ld similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/ldscript.ld diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.cpp similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.cpp rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.cpp diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.h similarity index 100% rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.h diff --git a/buildroot/tests/FYSETC_S6 b/buildroot/tests/STM32F446VE_fysetc similarity index 95% rename from buildroot/tests/FYSETC_S6 rename to buildroot/tests/STM32F446VE_fysetc index 9043b7b6e383..d7d10d0bb707 100755 --- a/buildroot/tests/FYSETC_S6 +++ b/buildroot/tests/STM32F446VE_fysetc @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Build tests for FYSETC_S6 +# Build tests for STM32F446VE_fysetc # # exit on first failure diff --git a/ini/renamed.ini b/ini/renamed.ini index f39cbec6adeb..4f9ce0793dae 100644 --- a/ini/renamed.ini +++ b/ini/renamed.ini @@ -140,3 +140,9 @@ extends = renamed [env:BIGTREE_SKR_2_F429_USB_debug] ;=> STM32F429VG_btt_USB_debug extends = renamed + +[env:FYSETC_S6] ;=> STM32F446VE_fysetc +extends = renamed + +[env:FYSETC_S6_8000] ;=> STM32F446VE_fysetc_32k_bootloader +extends = renamed diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 6334de6db214..a3b98d21314f 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -60,11 +60,11 @@ board_build.offset = 0x8000 upload_protocol = dfu # -# FYSETC S6 (STM32F446RET6 ARM Cortex-M4) +# FYSETC S6 / Spider V1.x/2.x/3.x with 64k bootloader (STM32F446VET6 ARM Cortex-M4) # -[env:FYSETC_S6] +[env:STM32F446VE_fysetc] extends = stm32_variant -board = marlin_fysetc_s6 +board = marlin_STM32F446VE_fysetc board_build.offset = 0x10000 board_upload.offset_address = 0x08010000 build_flags = ${stm32_variant.build_flags} -DHAL_PCD_MODULE_ENABLED @@ -73,11 +73,14 @@ upload_protocol = dfu upload_command = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE" # -# FYSETC S6 new bootloader +# FYSETC S6 / Spider V1.x/2.x/3.x with 32k bootloader +# All S6 & Spider (V2.2+) boards made after 2021/06/23 use this bootloader +# S6 - https://github.com/FYSETC/FYSETC-S6/tree/main/bootloader +# Spider - https://github.com/FYSETC/FYSETC-SPIDER/tree/main/bootloader # -[env:FYSETC_S6_8000] -extends = env:FYSETC_S6 -board = marlin_fysetc_s6 +[env:STM32F446VE_fysetc_32k_bootloader] +extends = env:STM32F446VE_fysetc +board = marlin_STM32F446VE_fysetc board_build.offset = 0x8000 board_upload.offset_address = 0x08008000 upload_command = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE" From 1350d2a71ec7d7bd54e81c76c1c0aaed5c345da7 Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Wed, 29 May 2024 20:47:38 -0700 Subject: [PATCH 2/2] Standalone FYSETC S6 test In preparation for removing this *super basic* board config. --- buildroot/tests/STM32F446VE_fysetc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildroot/tests/STM32F446VE_fysetc b/buildroot/tests/STM32F446VE_fysetc index d7d10d0bb707..bdc51e43ca03 100755 --- a/buildroot/tests/STM32F446VE_fysetc +++ b/buildroot/tests/STM32F446VE_fysetc @@ -6,11 +6,11 @@ # exit on first failure set -e -# Build examples +# Build basic FYSETC S6 configuration restore_configs -use_example_configs FYSETC/S6 -opt_enable MEATPACK_ON_SERIAL_PORT_1 -opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130 +opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT -1 BAUDRATE 115200 TEMP_SENSOR_BED 0 \ + DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400, 400 }' Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130 +opt_enable MEATPACK_ON_SERIAL_PORT_1 EEPROM_SETTINGS SDSUPPORT exec_test $1 $2 "FYSETC S6 Example" "$3" #