Merge upstream changes from Marlin 2.1.2
This commit is contained in:
@@ -37,7 +37,7 @@ USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
|
||||
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
|
||||
HAS_LCDPRINT = src_filter=+<src/lcd/lcdprint.cpp>
|
||||
HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780>
|
||||
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.5.2
|
||||
HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@~0.5.2
|
||||
src_filter=+<src/lcd/dogm>
|
||||
HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
|
||||
HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
|
||||
@@ -119,7 +119,7 @@ EMERGENCY_PARSER = src_filter=+<src/feature/e_parser.cpp>
|
||||
EASYTHREED_UI = src_filter=+<src/feature/easythreed_ui.cpp>
|
||||
I2C_POSITION_ENCODERS = src_filter=+<src/feature/encoder_i2c.cpp>
|
||||
IIC_BL24CXX_EEPROM = src_filter=+<src/libs/BL24CXX.cpp>
|
||||
HAS_SPI_FLASH = src_filter=+<src/libs/W25Qxx.cpp>
|
||||
SPI_FLASH = src_filter=+<src/libs/W25Qxx.cpp>
|
||||
HAS_ETHERNET = src_filter=+<src/feature/ethernet.cpp> +<src/gcode/feature/network/M552-M554.cpp>
|
||||
HAS_FANCHECK = src_filter=+<src/feature/fancheck.cpp> +<src/gcode/temp/M123.cpp>
|
||||
HAS_FANMUX = src_filter=+<src/feature/fanmux.cpp>
|
||||
@@ -187,6 +187,7 @@ HAS_DUPLICATION_MODE = src_filter=+<src/gcode/control/M605.cpp
|
||||
LIN_ADVANCE = src_filter=+<src/gcode/feature/advance>
|
||||
PHOTO_GCODE = src_filter=+<src/gcode/feature/camera>
|
||||
CONTROLLER_FAN_EDITABLE = src_filter=+<src/gcode/feature/controllerfan>
|
||||
HAS_SHAPING = src_filter=+<src/gcode/feature/input_shaping>
|
||||
GCODE_MACROS = src_filter=+<src/gcode/feature/macro>
|
||||
GRADIENT_MIX = src_filter=+<src/gcode/feature/mixing/M166.cpp>
|
||||
HAS_SAVED_POSITIONS = src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
|
||||
@@ -201,7 +202,7 @@ AUTO_REPORT_POSITION = src_filter=+<src/gcode/host/M154.cpp>
|
||||
REPETIER_GCODE_M360 = src_filter=+<src/gcode/host/M360.cpp>
|
||||
HAS_GCODE_M876 = src_filter=+<src/gcode/host/M876.cpp>
|
||||
HAS_RESUME_CONTINUE = src_filter=+<src/gcode/lcd/M0_M1.cpp>
|
||||
LCD_SET_PROGRESS_MANUALLY = src_filter=+<src/gcode/lcd/M73.cpp>
|
||||
SET_PROGRESS_MANUALLY = src_filter=+<src/gcode/lcd/M73.cpp>
|
||||
HAS_STATUS_MESSAGE = src_filter=+<src/gcode/lcd/M117.cpp>
|
||||
HAS_LCD_CONTRAST = src_filter=+<src/gcode/lcd/M250.cpp>
|
||||
HAS_GCODE_M255 = src_filter=+<src/gcode/lcd/M255.cpp>
|
||||
|
Reference in New Issue
Block a user