Merge branch 'bugfix-2.1.x' into CrealityDwin2.0_Bleeding
This commit is contained in:
InsanityAutomation
+7
-6
@@ -20,6 +20,7 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
|
||||
lib_ignore = NativeEthernet
|
||||
upload_speed = 500000
|
||||
monitor_speed = 250000
|
||||
monitor_filters = colorize, time, send_on_enter, log2file, esp32_exception_decoder
|
||||
#upload_port = marlinesp.local
|
||||
#board_build.flash_mode = qio
|
||||
|
||||
@@ -28,13 +29,13 @@ extends = env:esp32
|
||||
board_build.partitions = default_16MB.csv
|
||||
|
||||
[env:PANDA]
|
||||
extends = env:esp32
|
||||
build_flags = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
|
||||
lib_deps = ${common.lib_deps}
|
||||
SoftwareSerialEsp32
|
||||
extends = env:esp32
|
||||
build_flags = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
|
||||
lib_deps = ${common.lib_deps}
|
||||
SoftwareSerialEsp32
|
||||
board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
|
||||
upload_speed = 115200
|
||||
monitor_speed = 115200
|
||||
upload_speed = 115200
|
||||
monitor_speed = 115200
|
||||
|
||||
[env:mks_tinybee]
|
||||
extends = env:esp32
|
||||
|
||||
+1
-3
@@ -26,8 +26,6 @@ HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
|
||||
src_filter=+<src/feature/digipot>
|
||||
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
|
||||
src_filter=+<src/module/stepper/TMC26X.cpp>
|
||||
HAS_L64XX = Arduino-L6470@0.8.0
|
||||
src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
|
||||
LIB_INTERNAL_MAX31865 = src_filter=+<src/libs/MAX31865.cpp>
|
||||
NEOPIXEL_LED = adafruit/Adafruit NeoPixel@~1.8.0
|
||||
src_filter=+<src/feature/leds/neopixel.cpp>
|
||||
@@ -240,5 +238,5 @@ HAS_MICROSTEPS = src_filter=+<src/gcode/control/M350_M35
|
||||
(ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer
|
||||
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
|
||||
arduinoWebSockets=links2004/WebSockets@2.3.4
|
||||
luc-github/ESP32SSDP@^1.1.1
|
||||
luc-github/ESP32SSDP@1.1.1
|
||||
lib_ignore=ESPAsyncTCP
|
||||
|
||||
+25
-9
@@ -63,20 +63,36 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
|
||||
#
|
||||
# Simulator for macOS (MacPorts)
|
||||
#
|
||||
# sudo port install gcc11 gdb glm libsdl2 libsdl2_net freetype
|
||||
# sudo port install ld64 @3_3 +ld64_xcode
|
||||
|
||||
#
|
||||
# MacPorts:
|
||||
# sudo port install gcc11 glm libsdl2 libsdl2_net
|
||||
#
|
||||
# cd /opt/local/bin
|
||||
# sudo rm -f gcc g++ cc
|
||||
# sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc
|
||||
# This step may be obsolete:
|
||||
# sudo port uninstall ld64 ld64-latest
|
||||
#
|
||||
# cd -
|
||||
# cd -
|
||||
# rehash
|
||||
#
|
||||
# Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
|
||||
# If Xcode is installed be sure to run `xcode-select --install` first.
|
||||
#
|
||||
#==================================================================================
|
||||
#
|
||||
# Homebrew:
|
||||
# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
#
|
||||
# brew install gcc@12 glm sdl2 sdl2_net
|
||||
#
|
||||
# cd /opt/homebrew/bin
|
||||
# sudo rm -f gcc g++ cc
|
||||
# sudo ln -s gcc-12 gcc ; sudo ln -s g++-12 g++ ; sudo ln -s g++ cc
|
||||
# cd -
|
||||
#
|
||||
# Use 'brew install mesa' to get a <GL/gl.h> if no Xcode is installed.
|
||||
# If Xcode is installed be sure to run `xcode-select --install` first.
|
||||
#
|
||||
|
||||
[simulator_macos]
|
||||
build_unflags = -lGL -fstack-protector-strong
|
||||
build_flags =
|
||||
@@ -110,7 +126,7 @@ custom_gcc = g++
|
||||
# pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
|
||||
#
|
||||
[env:simulator_windows]
|
||||
extends = simulator_common
|
||||
extends = simulator_common
|
||||
build_src_flags = ${simulator_common.build_src_flags} -fpermissive
|
||||
build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
|
||||
build_type = debug
|
||||
build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
|
||||
build_type = debug
|
||||
|
||||
@@ -28,17 +28,6 @@ board = armed_v1
|
||||
build_flags = ${common_stm32.build_flags}
|
||||
-O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
|
||||
|
||||
#
|
||||
# STM32F401VE
|
||||
# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
|
||||
#
|
||||
[env:STM32F401VE_STEVAL]
|
||||
extends = stm32_variant
|
||||
board = marlin_STEVAL_STM32F401VE
|
||||
build_flags = ${stm32_variant.build_flags}
|
||||
-DSTM32F401xE -DDISABLE_GENERIC_SERIALUSB
|
||||
-DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
|
||||
|
||||
#
|
||||
# STM32F401RC
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user