sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine
2020-02-21 08:37:02 -06:00
parent dd6a7ca197 5d16497bed
commit f9aec2685c
1040 changed files with 5748 additions and 3803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platformio.ini
View File

@@ -26,7 +26,7 @@ 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.1,<1.0.0
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
@@ -138,7 +138,6 @@ board = sanguino_atmega1284p
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
build_flags = ${common.build_flags}
lib_ignore = TMCStepper
upload_speed = 57600
@@ -151,7 +150,6 @@ board = sanguino_atmega1284p
lib_deps = ${common.lib_deps}
TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
build_flags = ${common.build_flags}
lib_ignore = TMCStepper
upload_speed = 115200
@@ -489,7 +487,7 @@ build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
build_unflags = -std=gnu++11
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
lib_deps =
lib_deps = ${common.lib_deps}
SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
lib_ignore = Adafruit NeoPixel, SPI
@@ -753,7 +751,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
# Espressif ESP32
#
[env:esp32]
platform = espressif32
platform = espressif32@1.11.2
board = esp32dev
build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
lib_deps = ${common.lib_deps}
@@ -762,7 +760,7 @@ lib_deps = ${common.lib_deps}
ESP3DLib=https://github.com/luc-github/ESP3DLib.git
arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
lib_ignore = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED
lib_ignore = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
src_filter = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
upload_speed = 115200
#upload_port = marlinesp.local
@@ -822,9 +820,9 @@ monitor_speed = 500000
upload_protocol = dfu
#
# MKS RUMBA32(add TMC2208/2209 UART interface and AUX-1)
# MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
#
[env:mks_rumba32]
[env:rumba32_mks]
platform = ststm32
board = rumba32_f446ve
build_flags = ${common.build_flags}