From 77dc0a9792d852f3067ee73e16cf40e2ef07fe50 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 16 Jul 2020 14:52:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=202.0.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Version.h | 4 +- Marlin/src/inc/Version.h | 4 +- Marlin/src/module/temperature.cpp | 4 +- platformio.ini | 107 +++++++++++++++--------------- 4 files changed, 59 insertions(+), 60 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index b4e51841b3..1f65f4d49c 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -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. diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index a5960c16b2..33d867acac 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -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 /** diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 4018c7586c..dfb905bc06 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -831,7 +831,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) { #if HOTENDS #if ENABLED(PID_DEBUG) - extern bool PID_Debug_Flag; + extern bool pid_debug_flag; #endif float Temperature::get_pid_output_hotend(const uint8_t E_NAME) { @@ -914,7 +914,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) { #endif // PID_OPENLOOP #if ENABLED(PID_DEBUG) - if (ee == active_extruder && PID_Debug_Flag) { + if (ee == active_extruder && pid_debug_flag) { SERIAL_ECHO_START(); SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output); #if DISABLED(PID_OPENLOOP) diff --git a/platformio.ini b/platformio.ini index d01ddb7981..597220c887 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,17 +25,16 @@ default_src_filter = + - - + extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants lib_deps = - LiquidCrystal - TMCStepper@>=0.6.2,<1.0.0 - Adafruit NeoPixel@1.4.0 - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - # Adafruit_MAX31865 has broken backward compatibility after 1.1.0 version - Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/1.1.0.zip - LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip - Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip + LiquidCrystal@1.5.0 + TMCStepper@~0.7.1 + Adafruit NeoPixel@1.5.0 + U8glib-HAL@0.4.1 + Adafruit MAX31865 library@~1.1.0 + LiquidTWI2@1.2.7 + Arduino-L6470@0.8.0 + SlowSoftI2CMaster SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip SailfishRGB_LED=https://github.com/mikeshub/SailfishRGB_LED/archive/master.zip - SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip # Globally defined properties # inherited by all environments @@ -222,10 +221,10 @@ lib_compat_mode = strict extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py src_filter = ${common.default_src_filter} + lib_deps = Servo - LiquidCrystal - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - TMCStepper@>=0.6.1,<1.0.0 - Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip + LiquidCrystal@1.0.0 + U8glib-HAL@0.4.1 + TMCStepper@~0.7.1 + Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip [env:LPC1769] @@ -240,17 +239,17 @@ lib_compat_mode = strict extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py src_filter = ${common.default_src_filter} + lib_deps = Servo - LiquidCrystal - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - TMCStepper@>=0.6.1,<1.0.0 - Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip + LiquidCrystal@1.0.0 + U8glib-HAL@0.4.1 + TMCStepper@~0.7.1 + Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip # # 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 @@ -266,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 @@ -292,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 @@ -307,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 @@ -322,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 @@ -338,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 @@ -357,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 @@ -374,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 @@ -390,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 @@ -409,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 @@ -419,7 +418,7 @@ src_filter = ${common.default_src_filter} + - - # 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 @@ -457,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 @@ -471,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 @@ -484,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 @@ -502,7 +501,7 @@ upload_flags = # 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 @@ -517,7 +516,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 @@ -531,7 +530,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 @@ -544,7 +543,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 @@ -558,7 +557,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 @@ -571,7 +570,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__ @@ -582,7 +581,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 @@ -596,7 +595,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} @@ -614,7 +613,7 @@ src_filter = ${common.default_src_filter} + # FLYF407ZG # [env:FLYF407ZG] -platform = ststm32 +platform = ststm32@<6.2.0 board = FLYF407ZG platform_packages = framework-arduinoststm32@>=3.107,<4 build_flags = ${common.build_flags} @@ -631,7 +630,7 @@ src_filter = ${common.default_src_filter} + # FYSETC S6 (STM32F446VET6 ARM Cortex-M4) # [env:FYSETC_S6] -platform = ststm32 +platform = ststm32@<6.2.0 board = fysetc_s6 platform_packages = tool-stm32duino @@ -654,7 +653,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} @@ -670,7 +669,7 @@ src_filter = ${common.default_src_filter} + # 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} @@ -690,7 +689,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 @@ -700,12 +699,12 @@ build_flags = ${common.build_flags} -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000 -IMarlin/src/HAL/STM32 lib_deps = - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - LiquidCrystal - TMCStepper@>=0.5.2,<1.0.0 - Adafruit NeoPixel - LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip - Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.7.0.zip + U8glib-HAL@0.4.1 + LiquidCrystal@1.5.0 + TMCStepper@~0.7.1 + Adafruit NeoPixel@1.5.0 + LiquidTWI2@1.2.7 + Arduino-L6470@0.8.0 lib_ignore = SoftwareSerial, SoftwareSerialM src_filter = ${common.default_src_filter} + monitor_speed = 250000 @@ -802,7 +801,7 @@ debug_tool = jlink # RUMBA32 # [env:rumba32_f446ve] -platform = ststm32 +platform = ststm32@<6.2.0 board = rumba32_f446ve build_flags = ${common.build_flags} -DSTM32F4xx @@ -828,7 +827,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\""