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

More non maple env's #22358

Merged
merged 25 commits into from
Jul 15, 2021
Merged

More non maple env's #22358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d3deccf
remove more maple
Jul 14, 2021
ab2a85c
add STM32F103VE_longer
Jul 14, 2021
504e80d
add trigorilla_pro
Jul 14, 2021
47c5642
rename chitu_v5_gpio_init
Jul 14, 2021
afd3ae6
fix clonflicts
Jul 14, 2021
5665a99
try this again
Jul 14, 2021
85be3d6
Merge branch 'bugfix-2.0.x' into die-maple-die
thinkyhead Jul 14, 2021
43b7796
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22358
thinkyhead Jul 14, 2021
1d1c1a7
revert unconverted env's name
Jul 14, 2021
a8e85ca
Merge branch 'die-maple-die' of https://github.com/ellensp/Marlin int…
Jul 14, 2021
c8fc348
Add JGAURORA A5S A1 pins
Jul 14, 2021
17ac4a8
tweak spacing
thinkyhead Jul 14, 2021
20e4803
Fix STM32F103RC_fysetc build
thinkyhead Jul 14, 2021
bab38c6
create STM32F103RC_fysetc varient
Jul 14, 2021
4d4a0a5
undo
thinkyhead Jul 14, 2021
eeafb2c
add pins to pins_LONGER3D_LK
Jul 14, 2021
329bc74
add chitu_f103 and chitu_v5_gpio_init
Jul 14, 2021
2adbc60
add pins to CHITU3D_V5
Jul 14, 2021
6fbcb7b
Minor cleanup of TFT / FSMC pins
thinkyhead Jul 14, 2021
5ca4854
Merge 'bugfix-2.0.x' into pr/22358
thinkyhead Jul 14, 2021
37e48b7
Merge branch 'bugfix-2.0.x' into pr/22358
thinkyhead Jul 14, 2021
01b69d2
100 pin package
thinkyhead Jul 14, 2021
675931b
consolidate extra_scripts
thinkyhead Jul 15, 2021
b2d4e03
Chitu3D V5 needs Port G
thinkyhead Jul 15, 2021
970604f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22358
thinkyhead Jul 15, 2021
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/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@
#elif MB(FYSETC_CHEETAH_V12)
#include "stm32f1/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
#elif MB(LONGER3D_LK)
#include "stm32f1/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer
#include "stm32f1/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer env:STM32F103VE_longer_maple
#elif MB(CCROBOT_MEEB_3DP)
#include "stm32f1/pins_CCROBOT_MEEB_3DP.h" // STM32F1 env:STM32F103RC_meeb
#elif MB(CHITU3D_V5)
Expand Down
2 changes: 1 addition & 1 deletion ini/stm32f1-maple.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ upload_protocol = serial
#
# Longer 3D board in Alfawise U20 (STM32F103VET6)
#
[env:STM32F103VE_longer]
[env:STM32F103VE_longer_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
Expand Down
53 changes: 36 additions & 17 deletions ini/stm32f1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@ board_build.encrypt = Robin_pro.bin
# - LVGL UI
#
[env:mks_robin_e3p]
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103VE
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103VE
board_build.core = stm32
board_build.variant = MARLIN_F103Vx
board_build.offset = 0x7000
Expand All @@ -340,22 +340,21 @@ extra_scripts = ${common_stm32.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
buildroot/share/PlatformIO/scripts/stm32_bootloader.py
buildroot/share/PlatformIO/scripts/mks_encrypt.py
debug_tool = jlink
upload_protocol = jlink
debug_tool = jlink
upload_protocol = jlink

#
# JGAurora A5S A1 (STM32F103ZET6)
#
[env:jgaurora_a5s_a1]
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103ZE
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103ZE
board_build.core = stm32
board_build.variant = MARLIN_F103Zx
board_build.offset = 0xA000
board_build.rename = firmware_for_sd_upload.bin
build_flags = ${common_stm32.build_flags}
-DSTM32F1xx -DSTM32_XL_DENSITY
build_flags = ${common_stm32.build_flags} -DSTM32F1xx -DSTM32_XL_DENSITY
board_build.address = 0x0800A000
extra_scripts = ${common_stm32.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
Expand All @@ -366,11 +365,31 @@ extra_scripts = ${common_stm32.extra_scripts}
# FYSETC STM32F103RC
#
[env:STM32F103RC_fysetc]
platform = ${common_stm32.platform}
extends = common_STM32F103RC
extra_scripts = ${common_stm32.extra_scripts}
platform = ${common_stm32.platform}
extends = common_STM32F103RC
extra_scripts = ${common_stm32.extra_scripts}
buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
build_flags = ${common_stm32.build_flags} -DDEBUG_LEVEL=0
lib_ldf_mode = chain
debug_tool = stlink
upload_protocol = serial
build_flags = ${common_stm32.build_flags} -DDEBUG_LEVEL=0
lib_ldf_mode = chain
debug_tool = stlink
upload_protocol = serial

#
# Longer 3D board in Alfawise U20 (STM32F103VET6)
#
[env:STM32F103VE_longer]
platform = ${common_stm32.platform}
extends = common_stm32
board = genericSTM32F103VE
board_build.core = stm32
board_build.variant = MARLIN_F103Zx
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
board_build.offset = 0x1000
board_build.address = 0x08010000
build_flags = ${common_stm32.build_flags}
-DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
build_unflags = ${common_stm32.build_unflags}
-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
extra_scripts = ${common_stm32.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
buildroot/share/PlatformIO/scripts/stm32_bootloader.py
buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py