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

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 23 commits
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
26 changes: 13 additions & 13 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,17 +486,17 @@
#elif MB(MKS_ROBIN)
#include "stm32f1/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin env:mks_robin_maple
#elif MB(MKS_ROBIN_MINI)
#include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini
#include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini env:mks_robin_mini_maple
#elif MB(MKS_ROBIN_NANO)
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
#elif MB(MKS_ROBIN_NANO_V2)
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
#elif MB(MKS_ROBIN_LITE)
#include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
#include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite env:mks_robin_lite_maple
#elif MB(MKS_ROBIN_LITE3)
#include "stm32f1/pins_MKS_ROBIN_LITE3.h" // STM32F1 env:mks_robin_lite3
#include "stm32f1/pins_MKS_ROBIN_LITE3.h" // STM32F1 env:mks_robin_lite3 env:mks_robin_lite3_maple
#elif MB(MKS_ROBIN_PRO)
#include "stm32f1/pins_MKS_ROBIN_PRO.h" // STM32F1 env:mks_robin_pro
#include "stm32f1/pins_MKS_ROBIN_PRO.h" // STM32F1 env:mks_robin_pro env:mks_robin_pro_maple
#elif MB(MKS_ROBIN_E3)
#include "stm32f1/pins_MKS_ROBIN_E3.h" // STM32F1 env:mks_robin_e3 env:mks_robin_e3_maple
#elif MB(MKS_ROBIN_E3_V1_1)
Expand All @@ -506,7 +506,7 @@
#elif MB(MKS_ROBIN_E3D_V1_1)
#include "stm32f1/pins_MKS_ROBIN_E3D_V1_1.h" // STM32F1 env:mks_robin_e3
#elif MB(MKS_ROBIN_E3P)
#include "stm32f1/pins_MKS_ROBIN_E3P.h" // STM32F1 env:mks_robin_e3p
#include "stm32f1/pins_MKS_ROBIN_E3P.h" // STM32F1 env:mks_robin_e3p env:mks_robin_e3p_maple
#elif MB(BTT_SKR_MINI_V1_1)
#include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
#elif MB(BTT_SKR_MINI_E3_V1_0)
Expand All @@ -522,21 +522,21 @@
#elif MB(BTT_SKR_CR6)
#include "stm32f1/pins_BTT_SKR_CR6.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
#elif MB(JGAURORA_A5S_A1)
#include "stm32f1/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
#include "stm32f1/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1 env:jgaurora_a5s_a1_maple
#elif MB(FYSETC_AIO_II)
#include "stm32f1/pins_FYSETC_AIO_II.h" // STM32F1 env:STM32F103RC_fysetc
#include "stm32f1/pins_FYSETC_AIO_II.h" // STM32F1 env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
#elif MB(FYSETC_CHEETAH)
#include "stm32f1/pins_FYSETC_CHEETAH.h" // STM32F1 env:STM32F103RC_fysetc
#include "stm32f1/pins_FYSETC_CHEETAH.h" // STM32F1 env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
#elif MB(FYSETC_CHEETAH_V12)
#include "stm32f1/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103RC_fysetc
#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)
#include "stm32f1/pins_CHITU3D_V5.h" // STM32F1 env:chitu_f103 env:chitu_v5_gpio_init
#include "stm32f1/pins_CHITU3D_V5.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
#elif MB(CHITU3D_V6)
#include "stm32f1/pins_CHITU3D_V6.h" // STM32F1 env:chitu_f103
#include "stm32f1/pins_CHITU3D_V6.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple
#elif MB(CREALITY_V4)
#include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
#elif MB(CREALITY_V4210)
Expand All @@ -550,7 +550,7 @@
#elif MB(CREALITY_V453)
#include "stm32f1/pins_CREALITY_V453.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
#elif MB(TRIGORILLA_PRO)
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro env:trigorilla_pro_maple
#elif MB(FLY_MINI)
#include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI env:FLY_MINI_maple
#elif MB(FLSUN_HISPEED)
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5

#define TFT_CS_PIN FSMC_CS_PIN
#define TFT_RS_PIN FSMC_RS_PIN
#endif

#if ENABLED(TFT_LVGL_UI)
Expand Down
2 changes: 1 addition & 1 deletion ...re/PlatformIO/scripts/stm32_bootloader.py → ...e/PlatformIO/scripts/offset_and_rename.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# stm32_bootloader.py
# offset_and_rename.py
#
# - If 'build.offset' is provided, either by JSON or by the environment...
# - Set linker flag LD_FLASH_OFFSET and relocate the VTAB based on 'build.offset'.
Expand Down
3 changes: 1 addition & 2 deletions ini/avr.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ board = megaatmega1280
[mega_extended_optimized]
extends = common_avr8
board_build.variant = MARLIN_MEGA_EXTENDED
extra_scripts = ${common.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
extra_scripts = ${env:mega2560ext.extra_scripts}
upload_speed = 57600
build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues

Expand Down
26 changes: 13 additions & 13 deletions ini/stm32f1-maple.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ upload_protocol = dfu
#
# FYSETC STM32F103RC
#
[env:STM32F103RC_fysetc]
[env:STM32F103RC_fysetc_maple]
platform = ${common_stm32f1.platform}
extends = common_STM32F103RC_maple
extra_scripts = ${common_stm32f1.extra_scripts}
Expand Down 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 All @@ -190,7 +190,7 @@ build_unflags = ${common_stm32f1.build_unflags}
#
# MKS Robin Mini (STM32F103VET6)
#
[env:mks_robin_mini]
[env:mks_robin_mini_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
Expand Down Expand Up @@ -228,7 +228,7 @@ build_flags = ${common_stm32f1.build_flags}
#
# MKS Robin Pro (STM32F103ZET6)
#
[env:mks_robin_pro]
[env:mks_robin_pro_maple]
platform = ${common_stm32f1.platform}
extends = env:mks_robin_maple
extra_scripts = ${common_stm32f1.extra_scripts}
Expand All @@ -237,7 +237,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
#
# TRIGORILLA PRO (STM32F103ZET6)
#
[env:trigorilla_pro]
[env:trigorilla_pro_maple]
platform = ${common_stm32f1.platform}
extends = env:mks_robin_maple
extra_scripts = ${common_stm32f1.extra_scripts}
Expand All @@ -259,7 +259,7 @@ build_flags = ${common_stm32f1.build_flags}
# MKS Robin E3p (STM32F103VET6)
# - LVGL UI
#
[env:mks_robin_e3p]
[env:mks_robin_e3p_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103VE
Expand All @@ -273,7 +273,7 @@ upload_protocol = jlink
#
# MKS Robin Lite/Lite2 (STM32F103RCT6)
#
[env:mks_robin_lite]
[env:mks_robin_lite_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
Expand All @@ -283,7 +283,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
#
# MKS ROBIN LITE3 (STM32F103RCT6)
#
[env:mks_robin_lite3]
[env:mks_robin_lite3_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103RC
Expand All @@ -293,7 +293,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
#
# JGAurora A5S A1 (STM32F103ZET6)
#
[env:jgaurora_a5s_a1]
[env:jgaurora_a5s_a1_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = genericSTM32F103ZE
Expand Down Expand Up @@ -321,7 +321,7 @@ lib_ignore = ${common_stm32f1.lib_ignore}
#
# Chitu boards like Tronxy X5s (STM32F103ZET6)
#
[env:chitu_f103]
[env:chitu_f103_maple]
platform = ${common_stm32f1.platform}
extends = common_stm32f1
board = marlin_CHITU_F103
Expand All @@ -338,10 +338,10 @@ build_unflags = ${common_stm32f1.build_unflags}
# Some Chitu V5 boards have a problem with GPIO init.
# Use this target if G28 or G29 are always failing.
#
[env:chitu_v5_gpio_init]
[env:chitu_v5_gpio_init_maple]
platform = ${common_stm32f1.platform}
extends = env:chitu_f103
build_flags = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
extends = env:chitu_f103_maple
build_flags = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX

#
# FLYmaker FLY Mini (STM32F103RCT6)
Expand Down
Loading