andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2.0.5.4 : Use ststm32 < 6.2

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
354a9e5970
commit
5513e67512
3 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/Version.h
  2. 4
      Marlin/src/inc/Version.h
  3. 62
      platformio.ini

4
Marlin/Version.h
View File

@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.0.5.3"
//#define SHORT_BUILD_VERSION "2.0.5.4"
/**
* Verbose version identifier which should contain a reference to the location
@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2020-01-31"
//#define STRING_DISTRIBUTION_DATE "2020-07-09"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.

4
Marlin/src/inc/Version.h
View File

@ -25,7 +25,7 @@
* Release version. Leave the Marlin version or apply a custom scheme.
*/
#ifndef SHORT_BUILD_VERSION
#define SHORT_BUILD_VERSION "2.0.5.3"
#define SHORT_BUILD_VERSION "2.0.5.4"
#endif
/**
@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-03-31"
#define STRING_DISTRIBUTION_DATE "2020-07-09"
#endif
/**

62
platformio.ini
View File

@ -249,7 +249,7 @@ lib_deps = Servo
# STM32F103RC
#
[env:STM32F103RC]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -265,7 +265,7 @@ monitor_speed = 115200
# STM32F103RC_fysetc
#
[env:STM32F103RC_fysetc]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
#board_build.core = maple
platform_packages = tool-stm32duino
@ -291,7 +291,7 @@ upload_protocol = serial
#
[env:STM32F103RC_btt]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -306,7 +306,7 @@ lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
[env:STM32F103RC_btt_USB]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -321,7 +321,7 @@ lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
[env:STM32F103RC_btt_512K]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
board_upload.maximum_size=524288
platform_packages = tool-stm32duino
@ -337,7 +337,7 @@ lib_ignore = Adafruit NeoPixel, SPI
monitor_speed = 115200
[env:STM32F103RC_btt_512K_USB]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
board_upload.maximum_size=524288
platform_packages = tool-stm32duino
@ -356,7 +356,7 @@ monitor_speed = 115200
# STM32F103RE
#
[env:STM32F103RE]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RE
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -373,7 +373,7 @@ monitor_speed = 115200
# STM32F103RE_btt_USB ......... RET6 (USB mass storage)
#
[env:STM32F103RE_btt]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RE
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -389,7 +389,7 @@ upload_protocol = stlink
monitor_speed = 115200
[env:STM32F103RE_btt_USB]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RE
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -408,7 +408,7 @@ monitor_speed = 115200
# STM32F4 with STM32GENERIC
#
[env:STM32F4]
platform = ststm32
platform = ststm32@<6.2.0
board = disco_f407vg
build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
lib_ignore = Adafruit NeoPixel, TMCStepper
@ -418,7 +418,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
# STM32F7 with STM32GENERIC
#
[env:STM32F7]
platform = ststm32
platform = ststm32@<6.2.0
board = remram_v1
build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
lib_ignore = Adafruit NeoPixel, TMCStepper
@ -428,7 +428,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
# ARMED (STM32)
#
[env:ARMED]
platform = ststm32
platform = ststm32@<6.2.0
board = armed_v1
build_flags = ${common.build_flags}
-DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
@ -441,7 +441,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
# Geeetech GTM32 (STM32F103VET6)
#
[env:STM32F103VE_GTM32]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103VE
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
@ -456,7 +456,7 @@ upload_protocol = serial
# Longer 3D board in Alfawise U20 (STM32F103VET6)
#
[env:STM32F103VE_longer]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103VE
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -USERIAL_USB
@ -470,7 +470,7 @@ lib_ignore = Adafruit NeoPixel, LiquidTWI2, SPI
# MKS Robin Mini (STM32F103VET6)
#
[env:mks_robin_mini]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103VE
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
@ -483,7 +483,7 @@ lib_ignore = Adafruit NeoPixel, SPI
# MKS Robin Nano (STM32F103VET6)
#
[env:mks_robin_nano]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103VE
platform_packages = tool-stm32duino
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -499,7 +499,7 @@ lib_ignore = Adafruit NeoPixel, SPI
# MKS Robin (STM32F103ZET6)
#
[env:mks_robin]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103ZE
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
@ -514,7 +514,7 @@ lib_ignore = Adafruit NeoPixel, SPI
# MKS Robin Pro (STM32F103ZET6)
#
[env:mks_robin_pro]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103ZE
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -528,7 +528,7 @@ lib_ignore = Adafruit NeoPixel, SPI, TMCStepper
# MKS Robin Lite/Lite2 (STM32F103RCT6)
#
[env:mks_robin_lite]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
@ -541,7 +541,7 @@ lib_ignore = Adafruit NeoPixel, SPI
# MKS ROBIN LITE3 (STM32F103RCT6)
#
[env:mks_robin_lite3]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103RC
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
@ -555,7 +555,7 @@ lib_ignore = Adafruit NeoPixel, SPI
# JGAurora A5S A1 (STM32F103ZET6)
#
[env:jgaurora_a5s_a1]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103ZE
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@ -568,7 +568,7 @@ lib_ignore = Adafruit NeoPixel, SPI
# Malyan M200 (STM32F103CB)
#
[env:STM32F103CB_malyan]
platform = ststm32
platform = ststm32@<6.2.0
board = malyanM200
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
-DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
@ -579,7 +579,7 @@ lib_ignore = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
# Chitu boards like Tronxy X5s (STM32F103ZET6)
#
[env:chitu_f103]
platform = ststm32
platform = ststm32@<6.2.0
board = genericSTM32F103ZE
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@ -593,7 +593,7 @@ lib_ignore = Adafruit NeoPixel
# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
#
[env:STM32F401VE_STEVAL]
platform = ststm32
platform = ststm32@<6.2.0
board = STEVAL_STM32F401VE
platform_packages = framework-arduinoststm32@>=3.107,<4
build_flags = ${common.build_flags}
@ -611,7 +611,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
# FLYF407ZG
#
[env:FLYF407ZG]
platform = ststm32
platform = ststm32@<6.2.0
board = FLYF407ZG
platform_packages = framework-arduinoststm32@>=3.107,<4
build_flags = ${common.build_flags}
@ -628,7 +628,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
# FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
#
[env:FYSETC_S6]
platform = ststm32
platform = ststm32@<6.2.0
board = fysetc_s6
platform_packages =
tool-stm32duino
@ -651,7 +651,7 @@ upload_protocol = serial
# Shield - https://github.com/jmz52/Hardware
#
[env:STM32F407VE_black]
platform = ststm32
platform = ststm32@<6.2.0
board = blackSTM32F407VET6
platform_packages = framework-arduinoststm32@>=3.107,<4
build_flags = ${common.build_flags}
@ -667,7 +667,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
# BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
#
[env:BIGTREE_SKR_PRO]
platform = ststm32
platform = ststm32@<6.2.0
board = BigTree_SKR_Pro
platform_packages = framework-arduinoststm32@>=3.107,<4
build_flags = ${common.build_flags}
@ -687,7 +687,7 @@ debug_init_break =
# Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
#
[env:BIGTREE_GTR_V1_0]
platform = ststm32@>=5.7.0
platform = ststm32@>=5.7.0,<6.2.0
framework = arduino
platform_packages = framework-arduinoststm32@>=3.107,<4
board = BigTree_SKR_Pro
@ -799,7 +799,7 @@ debug_tool = jlink
# RUMBA32
#
[env:rumba32_f446ve]
platform = ststm32
platform = ststm32@<6.2.0
board = rumba32_f446ve
build_flags = ${common.build_flags}
-DSTM32F4xx
@ -825,7 +825,7 @@ upload_protocol = dfu
# MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
#
[env:rumba32_mks]
platform = ststm32
platform = ststm32@<6.2.0
board = rumba32_f446ve
build_flags = ${common.build_flags}
-DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""

Write Preview
Loading…
Cancel
Save