3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-06-26 09:25:18 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🔨 Rename FYSETC S6/Spider envs (#27122)

Browse source
This commit is contained in:
Keith Bennett 2025-03-14 11:11:45 -07:00 • committed by GitHub
parent 9e30173b13
commit 78f871567f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci-build-tests.yml vendored
View file

@ -113,7 +113,7 @@ jobs:
- BTT_GTR_V1_0
- BTT_SKR_PRO
- FLYF407ZG
- FYSETC_S6
- STM32F446VE_fysetc
- LERDGEK
- LERDGEX
- mks_robin_pro2

8
Marlin/src/pins/pins.h
View file

@ -786,13 +786,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)

2
buildroot/bin/mftest
View file

@ -134,7 +134,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' ;;

6
buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json → buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json
View file

@ -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"
},

0
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c → buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PeripheralPins.c
View file

0
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PinNamesVar.h → buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PinNamesVar.h
View file

0
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld → buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/ldscript.ld
View file

0
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.cpp → buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.cpp
View file

0
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h → buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.h
View file

10
buildroot/tests/FYSETC_S6 → buildroot/tests/STM32F446VE_fysetc
View file

@ -1,16 +1,16 @@
#!/usr/bin/env bash
#
# Build tests for FYSETC_S6
# Build tests for STM32F446VE_fysetc
#
# 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"
#

6
ini/renamed.ini
View file

@ -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

17
ini/stm32f4.ini
View file

@ -99,12 +99,12 @@ 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
platform_packages = platformio/tool-dfuutil@~1.11.0
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
@ -113,11 +113,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"