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

Remove STM32H723VET6-based Octopus Max EZ #25934

Merged
merged 4 commits into from
Jun 8, 2023
+47 −1,576
Merged

Remove STM32H723VET6-based Octopus Max EZ #25934

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd6f96b
Remove STM32H723VET6-based Octopus Max EZ
thisiskeithb Jun 5, 2023
63543d2
add a note
thinkyhead Jun 6, 2023
dc14355
more specific MCUs
thinkyhead Jun 8, 2023
eee824b
delete unused JSON
thinkyhead Jun 8, 2023
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 Marlin/src/core/boards.h
View file
Original file line number Diff line number Diff line change
@@ -466,7 +466,7 @@
#define BOARD_BTT_SKR_SE_BX_V3 6005 // BigTreeTech SKR SE BX V3.0 (STM32H743II)
#define BOARD_BTT_SKR_V3_0 6006 // BigTreeTech SKR V3.0 (STM32H743VG)
#define BOARD_BTT_SKR_V3_0_EZ 6007 // BigTreeTech SKR V3.0 EZ (STM32H743VG)
#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6008 // BigTreeTech Octopus Max EZ V1.0 (STM32H723VE / STM32H723ZE)
#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6008 // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)

//
// Espressif ESP32 WiFi
40 changes: 20 additions & 20 deletions Marlin/src/pins/pins.h
View file
Original file line number Diff line number Diff line change
@@ -540,32 +540,32 @@
#elif MB(MALYAN_M200_V2)
#include "stm32f0/pins_MALYAN_M200_V2.h" // STM32F0 env:STM32F070RB_malyan env:STM32F070CB_malyan
#elif MB(MALYAN_M300)
#include "stm32f0/pins_MALYAN_M300.h" // STM32F070 env:malyan_M300
#include "stm32f0/pins_MALYAN_M300.h" // STM32F0 env:malyan_M300

//
// STM32 ARM Cortex-M3
//

#elif MB(STM32F103RE)
#include "stm32f1/pins_STM32F1R.h" // STM32F103RE env:STM32F103RE env:STM32F103RE_maple
#include "stm32f1/pins_STM32F1R.h" // STM32F1 env:STM32F103RE env:STM32F103RE_maple
#elif MB(MALYAN_M200)
#include "stm32f1/pins_MALYAN_M200.h" // STM32F103CB env:STM32F103CB_malyan env:STM32F103CB_malyan_maple
#include "stm32f1/pins_MALYAN_M200.h" // STM32F1 env:STM32F103CB_malyan env:STM32F103CB_malyan_maple
#elif MB(STM3R_MINI)
#include "stm32f1/pins_STM3R_MINI.h" // STM32F103VE? env:STM32F103VE env:STM32F103RE_maple
#include "stm32f1/pins_STM3R_MINI.h" // STM32F1 env:STM32F103VE env:STM32F103RE_maple
#elif MB(GTM32_PRO_VB)
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103VE env:STM32F103VE_GTM32_maple
#elif MB(GTM32_PRO_VD)
#include "stm32f1/pins_GTM32_PRO_VD.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
#include "stm32f1/pins_GTM32_PRO_VD.h" // STM32F1 env:STM32F103VE env:STM32F103VE_GTM32_maple
#elif MB(GTM32_MINI)
#include "stm32f1/pins_GTM32_MINI.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
#include "stm32f1/pins_GTM32_MINI.h" // STM32F1 env:STM32F103VE env:STM32F103VE_GTM32_maple
#elif MB(GTM32_MINI_A30)
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F1 env:STM32F103VE env:STM32F103VE_GTM32_maple
#elif MB(GTM32_REV_B)
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F1 env:STM32F103VE env:STM32F103VE_GTM32_maple
#elif MB(MORPHEUS)
#include "stm32f1/pins_MORPHEUS.h" // STM32F103RE env:STM32F103RE env:STM32F103RE_maple
#include "stm32f1/pins_MORPHEUS.h" // STM32F1 env:STM32F103RE env:STM32F103RE_maple
#elif MB(CHITU3D)
#include "stm32f1/pins_CHITU3D.h" // STM32F103ZE env:STM32F103ZE env:STM32F103RE_maple
#include "stm32f1/pins_CHITU3D.h" // STM32F1 env:STM32F103ZE env:STM32F103RE_maple
#elif MB(MKS_ROBIN)
#include "stm32f1/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin env:mks_robin_maple
#elif MB(MKS_ROBIN_MINI)
@@ -663,15 +663,15 @@
#elif MB(CREALITY_V25S1)
#include "stm32f1/pins_CREALITY_V25S1.h" // STM32F1 env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
#elif MB(CREALITY_V521)
#include "stm32f1/pins_CREALITY_V521.h" // STM32F103VE env:STM32F103VE_creality
#include "stm32f1/pins_CREALITY_V521.h" // STM32F1 env:STM32F103VE_creality
#elif MB(TRIGORILLA_PRO)
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
#elif MB(FLY_MINI)
#include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI env:FLY_MINI_maple
#elif MB(FLSUN_HISPEED)
#include "stm32f1/pins_FLSUN_HISPEED.h" // STM32F1 env:flsun_hispeedv1
#elif MB(BEAST)
#include "stm32f1/pins_BEAST.h" // STM32F103VE? env:STM32F103VE env:STM32F103RE_maple
#include "stm32f1/pins_BEAST.h" // STM32F1 env:STM32F103VE env:STM32F103RE_maple
#elif MB(MINGDA_MPX_ARM_MINI)
#include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1 env:mingda_mpx_arm_mini
#elif MB(ZONESTAR_ZM3E2)
@@ -681,13 +681,13 @@
#elif MB(ZONESTAR_ZM3E4V2)
#include "stm32f1/pins_ZM3E4_V2_0.h" // STM32F1 env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
#elif MB(ERYONE_ERY32_MINI)
#include "stm32f1/pins_ERYONE_ERY32_MINI.h" // STM32F103VET6 env:ERYONE_ERY32_MINI_maple
#include "stm32f1/pins_ERYONE_ERY32_MINI.h" // STM32F1 env:ERYONE_ERY32_MINI_maple
#elif MB(PANDA_PI_V29)
#include "stm32f1/pins_PANDA_PI_V29.h" // STM32F103RCT6 env:PANDA_PI_V29
#include "stm32f1/pins_PANDA_PI_V29.h" // STM32F1 env:PANDA_PI_V29
#elif MB(SOVOL_V131)
#include "gd32f1/pins_SOVOL_V131.h" // GD32F1 env:GD32F103RET6_sovol_maple
#elif MB(TRIGORILLA_V006)
#include "gd32f1/pins_TRIGORILLA_V006.h" // GD32F103 env:trigorilla_v006
#include "gd32f1/pins_TRIGORILLA_V006.h" // GD32F1 env:trigorilla_v006
#elif MB(KEDI_CONTROLLER_V1_2)
#include "stm32f1/pins_KEDI_CONTROLLER_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple

@@ -733,7 +733,7 @@
#elif MB(BTT_OCTOPUS_V1_1)
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32F407ZE_btt env:STM32F407ZE_btt_USB
#elif MB(BTT_OCTOPUS_PRO_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32H723Zx_btt
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32H723ZE_btt
#elif MB(LERDGE_K)
#include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:LERDGEK env:LERDGEK_usb_flash_drive
#elif MB(LERDGE_S)
@@ -810,11 +810,11 @@
#elif MB(BTT_SKR_SE_BX_V3)
#include "stm32h7/pins_BTT_SKR_SE_BX_V3.h" // STM32H7 env:BTT_SKR_SE_BX
#elif MB(BTT_SKR_V3_0)
#include "stm32h7/pins_BTT_SKR_V3_0.h" // STM32H743Vx/STM32H723VG env:STM32H743Vx_btt env:STM32H723VG_btt
#include "stm32h7/pins_BTT_SKR_V3_0.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
#elif MB(BTT_SKR_V3_0_EZ)
#include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H743Vx/STM32H723VG env:STM32H743Vx_btt env:STM32H723VG_btt
#include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743VI_btt env:STM32H723VG_btt
#elif MB(BTT_OCTOPUS_MAX_EZ_V1_0)
#include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H723Zx/STM32H723VE env:STM32H723Zx_btt env:STM32H723VE_btt
#include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723ZE_btt
#elif MB(TEENSY41)
#include "teensy4/pins_TEENSY41.h" // Teensy-4.x env:teensy41
#elif MB(T41U5XBB)
65 changes: 0 additions & 65 deletions buildroot/share/PlatformIO/boards/marlin_CREALITY_STM32F401RC.json
View file

This file was deleted.

61 changes: 0 additions & 61 deletions buildroot/share/PlatformIO/boards/marlin_STM32H723VE.json
View file

This file was deleted.

0 ...PlatformIO/boards/marlin_STM32H723Zx.json → ...PlatformIO/boards/marlin_STM32H723ZE.json
View file
File renamed without changes.
0 ...PlatformIO/boards/marlin_STM32H743Vx.json → ...PlatformIO/boards/marlin_STM32H743VI.json
View file
File renamed without changes.
590 changes: 0 additions & 590 deletions buildroot/share/PlatformIO/variants/MARLIN_H723VE/PeripheralPins.c
View file

This file was deleted.

108 changes: 0 additions & 108 deletions buildroot/share/PlatformIO/variants/MARLIN_H723VE/PinNamesVar.h
View file

This file was deleted.

174 changes: 0 additions & 174 deletions buildroot/share/PlatformIO/variants/MARLIN_H723VE/ldscript.ld
View file

This file was deleted.

273 changes: 0 additions & 273 deletions buildroot/share/PlatformIO/variants/MARLIN_H723VE/variant_MARLIN_STM32H723VE.cpp
View file

This file was deleted.

269 changes: 0 additions & 269 deletions buildroot/share/PlatformIO/variants/MARLIN_H723VE/variant_MARLIN_STM32H723VE.h
View file

This file was deleted.

8 changes: 7 additions & 1 deletion ini/renamed.ini
View file
Original file line number Diff line number Diff line change
@@ -72,5 +72,11 @@ extends = renamed
[env:BIGTREE_OCTOPUS_V1_F407_USB] ;=> STM32F407ZE_btt_USB
extends = renamed

[env:STM32H723Vx_btt] ;=> STM32H723VE_btt or STM32H723VG_btt
[env:STM32H723Vx_btt] ;=> STM32H723VG_btt
extends = renamed

[env:STM32H723Zx_btt] ;=> STM32H723ZE_btt
extends = renamed

[env:STM32H743Vx_btt] ;=> STM32H743VI_btt
extends = renamed
33 changes: 19 additions & 14 deletions ini/stm32h7.ini
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
# 7 : Cortex M7 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
# 43 : Line/Features
# I : 176 pins (T:36, C:48 or 49, M:81, V:100, Z:144, I:176)
# I : 2048KB Flash-memory (C:256KB, D:384KB, E:512KB, G:1024KB)
# I : 2048KB Flash-memory (C:256KB, D:384KB, E:512KB, G:1024KB, I:2048KB)
# T : LQFP package
# 6 : -40...85°C (7: ...105°C)
#
@@ -40,13 +40,12 @@ upload_protocol = cmsis-dap
debug_tool = cmsis-dap

#
# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
# BigTreeTech STM32H743Vx ARM Cortex-M7 Common
#
[env:STM32H743Vx_btt]
[STM32H743Vx_btt]
extends = stm32_variant
platform = ststm32@15.4.1
platform_packages = framework-arduinoststm32@~4.20200.220530
board = marlin_STM32H743Vx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
@@ -60,6 +59,13 @@ build_flags = ${stm32_variant.build_flags}
upload_protocol = cmsis-dap
debug_tool = cmsis-dap

#
# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
#
[env:STM32H743VI_btt]
extends = STM32H743Vx_btt
board = marlin_STM32H743VI

#
# BigTreeTech STM32H723Vx ARM Cortex-M7 Common
#
@@ -85,13 +91,6 @@ build_flags = ${stm32_variant.build_flags}
upload_protocol = cmsis-dap
debug_tool = cmsis-dap

#
# BigTreeTech Octopus Max EZ V1.0 (STM32H723VET6 ARM Cortex-M7)
#
[env:STM32H723VE_btt]
extends = STM32H723Vx_btt
board = marlin_STM32H723VE

#
# BigTreeTech SKR V3.0 / SKR V3.0 EZ (STM32H723VGT6 ARM Cortex-M7)
#
@@ -100,13 +99,12 @@ extends = STM32H723Vx_btt
board = marlin_STM32H723VG

#
# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
# BigTreeTech STM32H723Zx ARM Cortex-M7 Common
#
[env:STM32H723Zx_btt]
[STM32H723Zx_btt]
extends = stm32_variant
platform = ststm32@15.4.1
platform_packages = framework-arduinoststm32@~4.20200.220530
board = marlin_STM32H723Zx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
@@ -124,3 +122,10 @@ build_flags = ${stm32_variant.build_flags}
-UI2C5_BASE
upload_protocol = cmsis-dap
debug_tool = cmsis-dap

#
# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
#
[env:STM32H723ZE_btt]
extends = STM32H723Zx_btt
board = marlin_STM32H723ZE