Update Codebase to Marlin 2.0.5.4
This commit is contained in:
@@ -78,6 +78,7 @@
|
||||
|
||||
// Author info of this build printed to the host during boot and M115
|
||||
#define STRING_CONFIG_H_AUTHOR "(knutwurst)" // Who made the changes.
|
||||
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
|
||||
|
||||
/**
|
||||
* *** VENDORS PLEASE READ ***
|
||||
|
@@ -1522,6 +1522,7 @@
|
||||
*/
|
||||
#define LIN_ADVANCE
|
||||
#if ENABLED(LIN_ADVANCE)
|
||||
//#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
|
||||
#define LIN_ADVANCE_K 0 // Unit: mm compression per 1mm/s extruder speed
|
||||
//#define LA_DEBUG // If enabled, this will generate debug information output over USB.
|
||||
#endif
|
||||
|
@@ -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.
|
||||
|
@@ -347,14 +347,14 @@ struct XYZval {
|
||||
FI XYZval<T> operator* (const XYZEval<T> &rs) { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
|
||||
FI XYZval<T> operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
|
||||
FI XYZval<T> operator/ (const XYZEval<T> &rs) { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
|
||||
FI XYZval<T> operator* (const float &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
|
||||
FI XYZval<T> operator* (const float &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
|
||||
FI XYZval<T> operator* (const int &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
|
||||
FI XYZval<T> operator* (const int &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; }
|
||||
FI XYZval<T> operator/ (const float &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
|
||||
FI XYZval<T> operator/ (const float &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
|
||||
FI XYZval<T> operator/ (const int &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
|
||||
FI XYZval<T> operator/ (const int &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; }
|
||||
FI XYZval<T> operator* (const float &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
|
||||
FI XYZval<T> operator* (const float &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
|
||||
FI XYZval<T> operator* (const int &v) const { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
|
||||
FI XYZval<T> operator* (const int &v) { XYZval<T> ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; }
|
||||
FI XYZval<T> operator/ (const float &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
|
||||
FI XYZval<T> operator/ (const float &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
|
||||
FI XYZval<T> operator/ (const int &v) const { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
|
||||
FI XYZval<T> operator/ (const int &v) { XYZval<T> ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; }
|
||||
FI XYZval<T> operator>>(const int &v) const { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
|
||||
FI XYZval<T> operator>>(const int &v) { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
|
||||
FI XYZval<T> operator<<(const int &v) const { XYZval<T> ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; }
|
||||
|
@@ -25,23 +25,26 @@
|
||||
* 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
|
||||
|
||||
/**
|
||||
* Verbose version identifier which should contain a reference to the location
|
||||
* from where the binary was downloaded or the source code was compiled.
|
||||
*/
|
||||
/**
|
||||
* Verbose version identifier containing a unique identifier, such as the
|
||||
* vendor name, download location, GitHub account, etc.
|
||||
*/
|
||||
#ifndef DETAILED_BUILD_VERSION
|
||||
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (knutwurst, Github)"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Defines the version of the Marlin build. Not to be confused with
|
||||
* Marlin's own build number, e.g. 2.0.x.
|
||||
* The STRING_DISTRIBUTION_DATE represents when the binary file was built,
|
||||
* here we define this default string as the date where the latest release
|
||||
* version was tagged.
|
||||
*/
|
||||
#define CUSTOM_BUILD_VERSION "1.0.7-prerelese"
|
||||
|
||||
#ifndef STRING_DISTRIBUTION_DATE
|
||||
#define STRING_DISTRIBUTION_DATE "2020-03-31"
|
||||
#define STRING_DISTRIBUTION_DATE "2020-07-09"
|
||||
#endif
|
||||
|
||||
/**
|
||||
@@ -68,18 +71,21 @@
|
||||
#define PROTOCOL_VERSION "1.0"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
||||
*/
|
||||
/**
|
||||
* Define a generic printer name to be output to the LCD after booting Marlin.
|
||||
*/
|
||||
#ifndef MACHINE_NAME
|
||||
#define MACHINE_NAME "Knutwurst's Anycubic i3 MEGA"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
|
||||
* Code which is installed on the device. In most cases —unless the manufacturer
|
||||
* has a distinct Github fork— the Source Code URL should just be the main
|
||||
* Marlin repository.
|
||||
*/
|
||||
/**
|
||||
* Website where users can find Marlin source code for the binary installed on the
|
||||
* device. Override this if you provide public source code download. (GPLv3 requires
|
||||
* providing the source code to your customers.)
|
||||
*/
|
||||
#ifndef SOURCE_CODE_URL
|
||||
#define SOURCE_CODE_URL "https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Default generic printer UUID.
|
||||
|
@@ -835,7 +835,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) {
|
||||
@@ -918,7 +918,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)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
# Knutwurst's i3 MEGA S Firmware (based on Marlin 2.0.5.3)
|
||||
# Knutwurst's i3 MEGA S Firmware (based on Marlin 2.0.5.4)
|
||||
|
||||
<span style="color: red;">(BITTE GENAU DURCHLESEN! / PLEASE READ CAREFULLY!)</span>
|
||||
|
||||
|
106
platformio.ini
106
platformio.ini
@@ -25,16 +25,16 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
|
||||
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
|
||||
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
|
||||
Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.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
|
||||
@@ -221,10 +221,10 @@ lib_compat_mode = strict
|
||||
extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py
|
||||
src_filter = ${common.default_src_filter} +<src/HAL/LPC1768>
|
||||
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]
|
||||
@@ -239,17 +239,17 @@ lib_compat_mode = strict
|
||||
extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py
|
||||
src_filter = ${common.default_src_filter} +<src/HAL/LPC1768>
|
||||
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
|
||||
@@ -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
|
||||
@@ -697,12 +697,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} +<src/HAL/STM32>
|
||||
monitor_speed = 250000
|
||||
@@ -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\""
|
||||
|
Reference in New Issue
Block a user