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

Migrate STM32F103RE to unified STM32 #22019

Merged
merged 12 commits into from Jun 3, 2021
Merged

Migrate STM32F103RE to unified STM32 #22019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
078b3f0
upgarde STM32F103RE to non maple
Jun 2, 2021
173cd92
fix capitalization typo
Jun 2, 2021
6b6e83a
update mks_robin_stm32 to mks_robin_maple
Jun 2, 2021
1534a03
force github to work
Jun 2, 2021
600825f
update to maple again
Jun 2, 2021
72cdc14
patch some possibly obsolete pins files
thinkyhead Jun 2, 2021
3f99b62
patch up more endstops, sdss, etc.
thinkyhead Jun 2, 2021
c53c7df
Merge branch 'bugfix-2.0.x' into pr/22019
thinkyhead Jun 2, 2021
4a15d86
follow up in kind
thinkyhead Jun 3, 2021
a98017f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22019
thinkyhead Jun 3, 2021
35b5eb0
Use earlier u8glib
thinkyhead Jun 3, 2021
31f5bc5
fix comment
thinkyhead Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Expand Up @@ -469,25 +469,25 @@
//

#elif MB(STM32F103RE)
#include "stm32f1/pins_STM32F1R.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_STM32F1R.h" // STM32F103RE env:STM32F103RE env:STM32F103RE_maple
#elif MB(MALYAN_M200)
#include "stm32f1/pins_MALYAN_M200.h" // STM32F1 env:STM32F103CB_malyan
#include "stm32f1/pins_MALYAN_M200.h" // STM32F103CB env:STM32F103CB_malyan
#elif MB(STM3R_MINI)
#include "stm32f1/pins_STM3R_MINI.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_STM3R_MINI.h" // STM32F103RE? env:STM32F103RE env:STM32F103RE_maple
#elif MB(GTM32_PRO_VB)
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
#elif MB(GTM32_PRO_VD)
#include "stm32f1/pins_GTM32_PRO_VD.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_GTM32_PRO_VD.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
#elif MB(GTM32_MINI)
#include "stm32f1/pins_GTM32_MINI.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_GTM32_MINI.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
#elif MB(GTM32_MINI_A30)
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
#elif MB(GTM32_REV_B)
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
#elif MB(MORPHEUS)
#include "stm32f1/pins_MORPHEUS.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_MORPHEUS.h" // STM32F103RE env:STM32F103RE env:STM32F103RE_maple
#elif MB(CHITU3D)
#include "stm32f1/pins_CHITU3D.h" // STM32F1 env:STM32F103RE
#include "stm32f1/pins_CHITU3D.h" // STM32F103ZE 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)
Expand Down Expand Up @@ -561,9 +561,9 @@
#elif MB(FLSUN_HISPEED)
#include "stm32f1/pins_FLSUN_HISPEED.h" // STM32F1 env:flsun_hispeedv1
#elif MB(BEAST)
#include "stm32f1/pins_BEAST.h" // STM32F1 env:STM32F103RE
#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:STM32F103RE
#include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1 env:mingda_mpx_arm_mini

//
// ARM Cortex-M4F
Expand Down
8 changes: 4 additions & 4 deletions ini/stm32f1-maple.ini
View file
Open in desktop
Expand Up @@ -131,9 +131,9 @@ lib_deps = ${env:STM32F103RC_btt_512K_maple.lib_deps}
USBComposite for STM32F1@0.91

#
# STM32F103RE with Unified STM32F1 HAL
# Generic STM32F103RE environment
#
[common_STM32F103RE]
[env:STM32F103RE_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RE
Expand All @@ -144,7 +144,7 @@ monitor_speed = 115200
#
[env:STM32F103RET6_creality_maple]
platform = ${common_stm32f1.platform}
extends = common_STM32F103RE
extends = env:STM32F103RE_maple
build_flags = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = creality.ld
Expand All @@ -160,7 +160,7 @@ upload_protocol = jlink
#
[env:STM32F103RE_btt]
platform = ${common_stm32f1.platform}
extends = common_STM32F103RE
extends = env:STM32F103RE_maple
board_build.address = 0x08007000
board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
extra_scripts = ${common_stm32f1.extra_scripts}
Expand Down
27 changes: 27 additions & 0 deletions ini/stm32f1.ini
View file
Open in desktop
Expand Up @@ -57,6 +57,33 @@ extra_scripts = ${common.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
buildroot/share/PlatformIO/scripts/stm32_bootloader.py

#
# STM32F103RE
#
[env:STM32F103RE]
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103RE
monitor_speed = 115200

#
# STM32F103VE
#
[env:STM32F103VE]
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103VE
monitor_speed = 115200

#
# STM32F103ZE
#
[env:STM32F103ZE]
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103ZE
monitor_speed = 115200

[env:STM32F103RC_btt]
platform = ${common_stm32.platform}
extends = common_STM32F103RC
Expand Down