Merge upstream changes from Marlin 2.1.2.2
This commit is contained in:
@@ -9,23 +9,26 @@
|
||||
# #
|
||||
#################################
|
||||
|
||||
# The order of the features matters for source-filter resolution inside of common-dependencies.py.
|
||||
|
||||
[features]
|
||||
YHCB2004 = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
|
||||
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
|
||||
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/a3ebe98bc6.zip
|
||||
build_src_filter=+<src/lcd/extui/mks_ui>
|
||||
extra_scripts=download_mks_assets.py
|
||||
MARLIN_TEST_BUILD = build_src_filter=+<src/tests>
|
||||
POSTMORTEM_DEBUGGING = build_src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
|
||||
build_flags=-funwind-tables
|
||||
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
|
||||
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/261c5a696a.zip
|
||||
HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.3
|
||||
build_src_filter=+<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
|
||||
HAS_T(RINAMIC_CONFIG|MC_SPI) = build_src_filter=+<src/feature/tmc_util.cpp>
|
||||
HAS_STEALTHCHOP = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
|
||||
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
|
||||
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/6f53c19a8a.zip
|
||||
HAS_MOTOR_CURRENT_(I2C|DAC|SPI|PWM) = build_src_filter=+<src/gcode/feature/digipot>
|
||||
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
|
||||
build_src_filter=+<src/feature/digipot>
|
||||
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
|
||||
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/0.1.2.zip
|
||||
build_src_filter=+<src/module/stepper/TMC26X.cpp>
|
||||
LIB_INTERNAL_MAX31865 = build_src_filter=+<src/libs/MAX31865.cpp>
|
||||
NEOPIXEL_LED = adafruit/Adafruit NeoPixel@~1.8.0
|
||||
@@ -37,13 +40,16 @@ USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
|
||||
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
|
||||
HAS_LCDPRINT = build_src_filter=+<src/lcd/lcdprint.cpp>
|
||||
HAS_MARLINUI_HD44780 = build_src_filter=+<src/lcd/HD44780>
|
||||
HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@~0.5.2
|
||||
HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@0.5.4
|
||||
build_src_filter=+<src/lcd/dogm>
|
||||
HAS_(FSMC|SPI|LTDC)_TFT = build_src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
|
||||
HAS_(FSMC|SPI|LTDC)_TFT = build_src_filter=+<src/lcd/tft_io>
|
||||
HAS_LTDC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_ltdc.cpp>
|
||||
HAS_FSMC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
|
||||
HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
|
||||
HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp> +<src/HAL/LPC1768/tft/tft_spi.cpp>
|
||||
HAS_TFT_XPT2046 = build_src_filter=+<src/HAL/STM32/tft/xpt2046.cpp> +<src/HAL/STM32F1/tft/xpt2046.cpp> +<src/HAL/LPC1768/tft/xpt2046.cpp>
|
||||
TFT_TOUCH_DEVICE_GT911 = build_src_filter=+<src/HAL/STM32/tft/gt911.cpp>
|
||||
I2C_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
|
||||
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
|
||||
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
|
||||
SPI_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
|
||||
HAS_DWIN_E3V2|IS_DWIN_MARLINUI = build_src_filter=+<src/lcd/e3v2/common>
|
||||
DWIN_CREALITY_LCD = build_src_filter=+<src/lcd/e3v2/creality>
|
||||
@@ -53,21 +59,21 @@ IS_DWIN_MARLINUI = build_src_filter=+<src/lcd/e3v2/marlinu
|
||||
HAS_GRAPHICAL_TFT = build_src_filter=+<src/lcd/tft>
|
||||
IS_TFTGLCD_PANEL = build_src_filter=+<src/lcd/TFTGLCD>
|
||||
HAS_TOUCH_BUTTONS = build_src_filter=+<src/lcd/touch/touch_buttons.cpp>
|
||||
HAS_MARLINUI_MENU = build_src_filter=+<src/lcd/menu>
|
||||
HAS_MARLINUI_MENU = build_src_filter=+<src/lcd/menu> -<src/lcd/menu/game>
|
||||
HAS_GAMES = build_src_filter=+<src/lcd/menu/game/game.cpp>
|
||||
MARLIN_BRICKOUT = build_src_filter=+<src/lcd/menu/game/brickout.cpp>
|
||||
MARLIN_INVADERS = build_src_filter=+<src/lcd/menu/game/invaders.cpp>
|
||||
MARLIN_MAZE = build_src_filter=+<src/lcd/menu/game/maze.cpp>
|
||||
MARLIN_SNAKE = build_src_filter=+<src/lcd/menu/game/snake.cpp>
|
||||
HAS_MENU_BACKLASH = build_src_filter=+<src/lcd/menu/menu_backlash.cpp>
|
||||
HAS_MENU_BED_CORNERS = build_src_filter=+<src/lcd/menu/menu_bed_corners.cpp>
|
||||
LCD_BED_LEVELING = build_src_filter=+<src/lcd/menu/menu_bed_leveling.cpp>
|
||||
HAS_MENU_BED_TRAMMING = build_src_filter=+<src/lcd/menu/menu_bed_tramming.cpp>
|
||||
HAS_MENU_CANCELOBJECT = build_src_filter=+<src/lcd/menu/menu_cancelobject.cpp>
|
||||
HAS_MENU_DELTA_CALIBRATE = build_src_filter=+<src/lcd/menu/menu_delta_calibrate.cpp>
|
||||
HAS_MENU_FILAMENT = build_src_filter=+<src/lcd/menu/menu_filament.cpp>
|
||||
LCD_INFO_MENU = build_src_filter=+<src/lcd/menu/menu_info.cpp>
|
||||
HAS_MENU_JOB_RECOVERY = build_src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
|
||||
HAS_MULTI_LANGUAGE = build_src_filter=+<src/lcd/menu/menu_language.cpp> +<src/gcode/lcd/M414.cpp>
|
||||
HAS_MENU_MULTI_LANGUAGE = build_src_filter=+<src/lcd/menu/menu_language.cpp>
|
||||
HAS_MENU_LED = build_src_filter=+<src/lcd/menu/menu_led.cpp>
|
||||
HAS_MENU_MEDIA = build_src_filter=+<src/lcd/menu/menu_media.cpp>
|
||||
HAS_MENU_MIXER = build_src_filter=+<src/lcd/menu/menu_mixer.cpp>
|
||||
@@ -78,8 +84,9 @@ HAS_MENU_CUTTER = build_src_filter=+<src/lcd/menu/menu_sp
|
||||
HAS_MENU_TEMPERATURE = build_src_filter=+<src/lcd/menu/menu_temperature.cpp>
|
||||
HAS_MENU_TMC = build_src_filter=+<src/lcd/menu/menu_tmc.cpp>
|
||||
HAS_MENU_TOUCH_SCREEN = build_src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
|
||||
HAS_MENU_TRAMMING = build_src_filter=+<src/lcd/menu/menu_tramming.cpp>
|
||||
HAS_MENU_TRAMMING_WIZARD = build_src_filter=+<src/lcd/menu/menu_tramming_wizard.cpp>
|
||||
HAS_MENU_UBL = build_src_filter=+<src/lcd/menu/menu_ubl.cpp>
|
||||
EXTENSIBLE_UI = build_src_filter=+<src/lcd/extui/ui_api.cpp>
|
||||
ANYCUBIC_LCD_CHIRON = build_src_filter=+<src/lcd/extui/anycubic_chiron>
|
||||
ANYCUBIC_LCD_I3MEGA = build_src_filter=+<src/lcd/extui/anycubic_i3mega>
|
||||
HAS_DGUS_LCD_CLASSIC = build_src_filter=+<src/lcd/extui/dgus>
|
||||
@@ -168,7 +175,6 @@ HAS_EXTRA_ENDSTOPS = build_src_filter=+<src/gcode/calibrate/
|
||||
SKEW_CORRECTION_GCODE = build_src_filter=+<src/gcode/calibrate/M852.cpp>
|
||||
DIRECT_PIN_CONTROL = build_src_filter=+<src/gcode/control/M42.cpp> +<src/gcode/control/M226.cpp>
|
||||
PINS_DEBUGGING = build_src_filter=+<src/gcode/config/M43.cpp>
|
||||
NO_VOLUMETRICS = build_src_filter=-<src/gcode/config/M200-M205.cpp>
|
||||
HAS_MULTI_EXTRUDER = build_src_filter=+<src/gcode/config/M217.cpp>
|
||||
HAS_HOTEND_OFFSET = build_src_filter=+<src/gcode/config/M218.cpp>
|
||||
EDITABLE_SERVO_ANGLES = build_src_filter=+<src/gcode/config/M281.cpp>
|
||||
@@ -176,6 +182,7 @@ PIDTEMP = build_src_filter=+<src/gcode/config/M30
|
||||
PREVENT_COLD_EXTRUSION = build_src_filter=+<src/gcode/config/M302.cpp>
|
||||
PIDTEMPBED = build_src_filter=+<src/gcode/config/M304.cpp>
|
||||
HAS_USER_THERMISTORS = build_src_filter=+<src/gcode/config/M305.cpp>
|
||||
PIDTEMPCHAMBER = build_src_filter=+<src/gcode/config/M309.cpp>
|
||||
SD_ABORT_ON_ENDSTOP_HIT = build_src_filter=+<src/gcode/config/M540.cpp>
|
||||
BAUD_RATE_GCODE = build_src_filter=+<src/gcode/config/M575.cpp>
|
||||
HAS_SMART_EFF_MOD = build_src_filter=+<src/gcode/config/M672.cpp>
|
||||
@@ -184,10 +191,12 @@ AIR_EVACUATION = build_src_filter=+<src/gcode/control/M1
|
||||
HAS_SOFTWARE_ENDSTOPS = build_src_filter=+<src/gcode/control/M211.cpp>
|
||||
SERVO_DETACH_GCODE = build_src_filter=+<src/gcode/control/M282.cpp>
|
||||
HAS_DUPLICATION_MODE = build_src_filter=+<src/gcode/control/M605.cpp>
|
||||
SPI_FLASH_BACKUP = build_src_filter=+<src/gcode/control/M993_M994.cpp>
|
||||
PLATFORM_M997_SUPPORT = build_src_filter=+<src/gcode/control/M997.cpp>
|
||||
LIN_ADVANCE = build_src_filter=+<src/gcode/feature/advance>
|
||||
PHOTO_GCODE = build_src_filter=+<src/gcode/feature/camera>
|
||||
CONTROLLER_FAN_EDITABLE = build_src_filter=+<src/gcode/feature/controllerfan>
|
||||
HAS_SHAPING = build_src_filter=+<src/gcode/feature/input_shaping>
|
||||
HAS_ZV_SHAPING = build_src_filter=+<src/gcode/feature/input_shaping>
|
||||
GCODE_MACROS = build_src_filter=+<src/gcode/feature/macro>
|
||||
GRADIENT_MIX = build_src_filter=+<src/gcode/feature/mixing/M166.cpp>
|
||||
HAS_SAVED_POSITIONS = build_src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
|
||||
@@ -209,6 +218,7 @@ HAS_LCD_CONTRAST = build_src_filter=+<src/gcode/lcd/M250.c
|
||||
HAS_GCODE_M255 = build_src_filter=+<src/gcode/lcd/M255.cpp>
|
||||
HAS_LCD_BRIGHTNESS = build_src_filter=+<src/gcode/lcd/M256.cpp>
|
||||
HAS_SOUND = build_src_filter=+<src/gcode/lcd/M300.cpp>
|
||||
HAS_MULTI_LANGUAGE = build_src_filter=+<src/gcode/lcd/M414.cpp>
|
||||
TOUCH_SCREEN_CALIBRATION = build_src_filter=+<src/gcode/lcd/M995.cpp>
|
||||
ARC_SUPPORT = build_src_filter=+<src/gcode/motion/G2_G3.cpp>
|
||||
GCODE_MOTION_MODES = build_src_filter=+<src/gcode/motion/G80.cpp>
|
||||
@@ -216,13 +226,18 @@ BABYSTEPPING = build_src_filter=+<src/gcode/motion/M29
|
||||
Z_PROBE_SLED = build_src_filter=+<src/gcode/probe/G31_G32.cpp>
|
||||
G38_PROBE_TARGET = build_src_filter=+<src/gcode/probe/G38.cpp>
|
||||
MAGNETIC_PARKING_EXTRUDER = build_src_filter=+<src/gcode/probe/M951.cpp>
|
||||
SDSUPPORT = build_src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
|
||||
HAS_MEDIA = build_src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
|
||||
HAS_MEDIA_SUBCALLS = build_src_filter=+<src/gcode/sd/M32.cpp>
|
||||
GCODE_REPEAT_MARKERS = build_src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
|
||||
HAS_EXTRUDERS = build_src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
|
||||
HAS_TEMP_PROBE = build_src_filter=+<src/gcode/temp/M192.cpp>
|
||||
HAS_EXTRUDERS = build_src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/config/M221.cpp>
|
||||
HAS_HOTEND = build_src_filter=+<src/gcode/temp/M104_M109.cpp>
|
||||
HAS_FAN = build_src_filter=+<src/gcode/temp/M106_M107.cpp>
|
||||
HAS_HEATED_BED = build_src_filter=+<src/gcode/temp/M140_M190.cpp>
|
||||
HAS_HEATED_CHAMBER = build_src_filter=+<src/gcode/temp/M141_M191.cpp>
|
||||
HAS_COOLER = build_src_filter=+<src/gcode/temp/M143_M193.cpp>
|
||||
AUTO_REPORT_TEMPERATURES = build_src_filter=+<src/gcode/temp/M155.cpp>
|
||||
HAS_TEMP_PROBE = build_src_filter=+<src/gcode/temp/M192.cpp>
|
||||
HAS_PID_HEATING = build_src_filter=+<src/gcode/temp/M303.cpp>
|
||||
MPCTEMP = build_src_filter=+<src/gcode/temp/M306.cpp>
|
||||
INCH_MODE_SUPPORT = build_src_filter=+<src/gcode/units/G20_G21.cpp>
|
||||
TEMPERATURE_UNITS_SUPPORT = build_src_filter=+<src/gcode/units/M149.cpp>
|
||||
@@ -240,7 +255,7 @@ HAS_SERVOS = build_src_filter=+<src/module/servo.cpp
|
||||
MORGAN_SCARA = build_src_filter=+<src/gcode/scara>
|
||||
HAS_MICROSTEPS = build_src_filter=+<src/gcode/control/M350_M351.cpp>
|
||||
(ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer
|
||||
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
|
||||
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/dc0f3d96c6.zip
|
||||
arduinoWebSockets=links2004/WebSockets@2.3.4
|
||||
luc-github/ESP32SSDP@1.1.1
|
||||
lib_ignore=ESPAsyncTCP
|
||||
|
Reference in New Issue
Block a user