Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🔨 Rename FYSETC S6/Spider Environments #27122

Open
wants to merge 2 commits into
base: bugfix-2.1.x
Choose a base branch
from
Open

🔨 Rename FYSETC S6/Spider Environments #27122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df5034c
🔨 Rename FYSETC S6/Spider Environments
thisiskeithb May 23, 2024
1350d2a
Standalone FYSETC S6 test
thisiskeithb May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
- BTT_GTR_V1_0
- BTT_SKR_PRO
- FLYF407ZG
- FYSETC_S6
- STM32F446VE_fysetc
- LERDGEK
- LERDGEX
- mks_robin_pro2
Expand Down
8 changes: 4 additions & 4 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion buildroot/bin/mftest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ;;
Expand Down
6 changes: 3 additions & 3 deletions ...e/PlatformIO/boards/marlin_fysetc_s6.json → ...mIO/boards/marlin_STM32F446VE_fysetc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
0 ...ariants/MARLIN_FYSETC_S6/PeripheralPins.c → ...nts/MARLIN_F446VE_FYSETC/PeripheralPins.c
View file
Open in desktop
File renamed without changes.
0 ...O/variants/MARLIN_FYSETC_S6/PinNamesVar.h → ...riants/MARLIN_F446VE_FYSETC/PinNamesVar.h
View file
Open in desktop
File renamed without changes.
0 ...mIO/variants/MARLIN_FYSETC_S6/ldscript.ld → ...variants/MARLIN_F446VE_FYSETC/ldscript.ld
View file
Open in desktop
File renamed without changes.
0 ...mIO/variants/MARLIN_FYSETC_S6/variant.cpp → ...variants/MARLIN_F446VE_FYSETC/variant.cpp
View file
Open in desktop
File renamed without changes.
0 ...ormIO/variants/MARLIN_FYSETC_S6/variant.h → ...O/variants/MARLIN_F446VE_FYSETC/variant.h
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions buildroot/tests/FYSETC_S6 → buildroot/tests/STM32F446VE_fysetc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MEATPACK_ON_SERIAL_PORT_1 is about the only useful part of this test, so it can likely be merged into another test & then this test can be completely removed to speed up CI checks.


#
Expand Down
6 changes: 6 additions & 0 deletions ini/renamed.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 10 additions & 7 deletions ini/stm32f4.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down