From 80fa195db34a92ae3fafd7536e7c0f4b3e951511 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sat, 6 Jun 2020 11:21:59 -0400 Subject: [PATCH] Rebase and catchup --- Marlin/Configuration.h | 83 ++--- Marlin/Configuration_adv.h | 54 ++-- Marlin/src/lcd/extui/lib/Creality_DWIN.cpp | 3 + platformio.ini | 356 +-------------------- 4 files changed, 53 insertions(+), 443 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 46ed331ffd..3bcef7fa36 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -65,7 +65,6 @@ //#define E3DTitan //#define E3DHemera //#define CrealityTitan - //#define DDXExtruderKit //#define MicroswissDirectDrive //#define DirectDrive // Any direct drive extruder, reduces filament change lengths @@ -150,18 +149,12 @@ //#define SKR14Turbo //#define SKRPRO11 -// This board is NOT recommended and is HIGHLY advised against utilizing the expanded builds for. -// The MCU is rated for 256kb and stability problems, including hangs with heaters on, have been reported. - -//#define SKRMiniE3V2 - //#define I2C_EEPROM // use I2C EEPROM on SRK PRO v1.1 e.g AT24C256 //#define SKR14_PowerLossKit // Bigtreetech power loss kit for SKR14 //#define SKR_2209 -//#define SKR_2130 -//#define SKR_UART // Configure SKR board with drivers in UART mode or SPI for TMC2130 -//#define SKR_ReverseSteppers // Some users reported directions backwards than others on SKR with various drivers. +//#define SKR_UART // Configure SKR board with drivers in UART mode +//#define SKR13_ReverseSteppers // Some users reported directions backwards than others on SKR with various drivers. //#define DualZ // Uses 5th driver on CRX or SKR boards as Z2 /* @@ -301,12 +294,8 @@ #endif #endif -#if ENABLED(SKRMiniE3V2) - #define SKR_2209 - #define SKR_UART -#endif - #if ENABLED(CrealityTitan) + #define DirectDrive #define E3DTitan #endif @@ -314,14 +303,10 @@ #define SD_DETECT_PIN -1 #endif -#if ANY(MicroswissDirectDrive, DDXExtruderKit, CrealityTitan) +#if ENABLED(MicroswissDirectDrive) #define DirectDrive #endif -#if ENABLED(DDXExtruderKit) - #define Bondtech -#endif - #if ENABLED(MachineCR10SPro) #define MachineCR10Std #if DISABLED(ABL_BLTOUCH, ABL_EZABL, ABL_TOUCH_MI) @@ -377,7 +362,7 @@ #define Z_STOP_PIN 19 #endif -#if ANY(MachineEnder2, MachineEnder3, MachineEnder5, MachineCR10, MachineMini) && NONE(Melzi_To_SBoardUpgrade, SKR13, SKRPRO11, SKRMiniE3V2) +#if ANY(MachineEnder2, MachineEnder3, MachineEnder5, MachineCR10, MachineMini) && NONE(Melzi_To_SBoardUpgrade, SKR13, SKRPRO11) #define MachineCR10Orig #endif @@ -470,7 +455,7 @@ #undef SolidBedMounts #endif -#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus, SKRMiniE3V2) || ENABLED(GraphicLCD) +#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus) || ENABLED(GraphicLCD) #define SHOW_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup. @@ -487,7 +472,7 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ -#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRMiniE3V2) +#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) #define SERIAL_PORT -1 #else #define SERIAL_PORT 0 @@ -500,8 +485,6 @@ #if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) && (NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max) || (ENABLED(GraphicLCD) && NONE(Force10SProDisplay, ForceCRXDisplay))) #define SERIAL_PORT_2 0 -#elif ENABLED(SKRMiniE3V2) - #define SERIAL_PORT_2 2 #elif ANY(SKR13, SKR14, SKR14Turbo) #define DGUS_SERIAL_PORT 0 #endif @@ -530,8 +513,6 @@ #define MOTHERBOARD BOARD_BTT_SKR_V1_3 #elif ENABLED(SKRPRO11) #define MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 - #elif ENABLED(SKRMiniE3V2) - #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V2_0 #elif (ENABLED(MachineCR10Orig) && DISABLED(Melzi_To_SBoardUpgrade)) #define MOTHERBOARD BOARD_MELZI_CREALITY #else @@ -1013,7 +994,7 @@ * heater. If your configuration is significantly different than this and you don't understand * the issues involved, don't use bed PID until someone else verifies that your hardware works. */ -#if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) || ENABLED(MelziHostOnly) +#if NONE(MachineCR10Orig, LowMemoryBoard) || ENABLED(MelziHostOnly) #define PIDTEMPBED #endif //#define BED_LIMIT_SWITCHING @@ -1203,7 +1184,7 @@ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, MachineCR10SV2, CrealitySilentBoard, MachineCR10SPro, MachineCR10SProV2, MachineCR10Max, SKRMiniE3V2) && DISABLED(SKR_UART) +#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, MachineCR10SV2, CrealitySilentBoard, MachineCR10SPro, MachineCR10SProV2, MachineCR10Max) && DISABLED(SKR_UART) #if ENABLED(SKR_2209) #define X_DRIVER_TYPE TMC2209_STANDALONE #define Y_DRIVER_TYPE TMC2209_STANDALONE @@ -1214,16 +1195,6 @@ #else #define E1_DRIVER_TYPE TMC2209_STANDALONE #endif - #elif ENABLED(SKR_2130) - #define X_DRIVER_TYPE TMC2130_STANDALONE - #define Y_DRIVER_TYPE TMC2130_STANDALONE - #define Z_DRIVER_TYPE TMC2130_STANDALONE - #define E0_DRIVER_TYPE TMC2130_STANDALONE - #if ENABLED(DualZ) - #define Z2_DRIVER_TYPE TMC2130_STANDALONE - #else - #define E1_DRIVER_TYPE TMC2130_STANDALONE - #endif #else #define X_DRIVER_TYPE TMC2208_STANDALONE #define Y_DRIVER_TYPE TMC2208_STANDALONE @@ -1235,7 +1206,7 @@ #define E1_DRIVER_TYPE TMC2208_STANDALONE #endif #endif -#elif ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRMiniE3V2) && ENABLED(SKR_UART) +#elif ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) && ENABLED(SKR_UART) #if ENABLED(SKR_2209) #define X_DRIVER_TYPE TMC2209 #define Y_DRIVER_TYPE TMC2209 @@ -1246,16 +1217,6 @@ #else #define E1_DRIVER_TYPE TMC2209 #endif - #elif ENABLED(SKR_2130) - #define X_DRIVER_TYPE TMC2130 - #define Y_DRIVER_TYPE TMC2130 - #define Z_DRIVER_TYPE TMC2130 - #define E0_DRIVER_TYPE TMC2130 - #if ENABLED(DualZ) - #define Z2_DRIVER_TYPE TMC2130 - #else - #define E1_DRIVER_TYPE TMC2130 - #endif #else #define X_DRIVER_TYPE TMC2208 #define Y_DRIVER_TYPE TMC2208 @@ -1483,7 +1444,7 @@ * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ -#if NONE(MachineCR10Orig, SKRMiniE3V2) || ENABLED(MelziHostOnly) +#if DISABLED(MachineCR10Orig) || ENABLED(MelziHostOnly) #define S_CURVE_ACCELERATION #endif @@ -1752,7 +1713,7 @@ #define Z_PROBE_OFFSET_RANGE_MAX 9 // Enable the M48 repeatability test to test probe accuracy -#if ANY(ABL_EZABL, ABL_BLTOUCH, ABL_NCSW, ABL_TOUCH_MI) && NONE(MachineCR10Orig, SKRMiniE3V2) +#if ANY(ABL_EZABL, ABL_BLTOUCH, ABL_NCSW, ABL_TOUCH_MI) && DISABLED(MachineCR10Orig) #define Z_MIN_PROBE_REPEATABILITY_TEST #endif @@ -1816,7 +1777,7 @@ #define INVERT_E0_DIR true #define INVERT_E1_DIR false #endif -#elif ANY(MachineCR10Orig, SKR13, SKR14, SKR14Turbo, SKRMiniE3V2) && DISABLED(SKR_ReverseSteppers) +#elif ANY(MachineCR10Orig, SKR13, SKR14, SKR14Turbo) && DISABLED(SKR13_ReverseSteppers) #define INVERT_X_DIR true #define INVERT_Y_DIR true #define INVERT_Z_DIR false @@ -2167,7 +2128,7 @@ // Gradually reduce leveling correction until a set height is reached, // at which point movement will be level to the machine's XY plane. // The height can be set with M420 Z - #if DISABLED(MachineCR10Orig, SKRMiniE3V2) + #if DISABLED(MachineCR10Orig) #define ENABLE_LEVELING_FADE_HEIGHT #endif @@ -2182,7 +2143,7 @@ /** * Enable the G26 Mesh Validation Pattern tool. */ -#if NONE(MachineCR10Orig, SKRMiniE3V2) +#if(DISABLED(MachineCR10Orig)) #define G26_MESH_VALIDATION // Enable G26 mesh validation #endif #if ENABLED(G26_MESH_VALIDATION) @@ -2277,8 +2238,8 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI, SKRMiniE3V2) && (DISABLED(MachineCRX) || ENABLED(GraphicLCD)) - #define LCD_BED_LEVELING +#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI) && (DISABLED(MachineCRX) || ENABLED(GraphicLCD)) +#define LCD_BED_LEVELING #endif #if ENABLED(LCD_BED_LEVELING) @@ -2287,7 +2248,7 @@ #define MESH_EDIT_MENU // Add a menu to edit mesh points #endif -#if NONE(SolidBedMounts, SKRMiniE3V2) +#if NONE(SolidBedMounts) // Add a menu item to move between bed corners for manual bed adjustment #define LEVEL_BED_CORNERS #endif @@ -2329,8 +2290,8 @@ #endif #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT (X_BED_SIZE / 2) // X point for Z homing - #define Z_SAFE_HOMING_Y_POINT (Y_BED_SIZE / 2) // Y point for Z homing + #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing + #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing #endif // Homing speeds (mm/min) @@ -2706,7 +2667,7 @@ * Disable all menus and only display the Status Screen, or * just remove some extraneous menu items to recover space. */ -#if ANY(MachineCR10Orig, SKRMiniE3V2) && DISABLED(MelziHostOnly) && ENABLED(ABL_BI) +#if ENABLED(MachineCR10Orig) && DISABLED(MelziHostOnly) && ENABLED(ABL_BI) //#define NO_LCD_MENUS #define SLIM_LCD_MENUS #endif @@ -2773,7 +2734,7 @@ // If you have a speaker that can produce tones, enable it here. // By default Marlin assumes you have a buzzer with a fixed frequency. // -#if ENABLED(MachineCR10Orig, SKRMiniE3V2) +#if ENABLED(MachineCR10Orig) #define SPEAKER #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 72c58f81c5..8e9ad08deb 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -308,7 +308,7 @@ * Enable Autotemp Mode with M104/M109 F S B. * Disable by sending M104/M109 with no F parameter (or F0 with AUTOTEMP_PROPORTIONAL). */ -#if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) || ENABLED(MelziHostOnly) +#if NONE(MachineCR10Orig, LowMemoryBoard) || ENABLED(MelziHostOnly) #define AUTOTEMP #endif #if ENABLED(AUTOTEMP) @@ -394,9 +394,7 @@ * The fan turns on automatically whenever any driver is enabled and turns * off (or reduces to idle speed) shortly after drivers are turned off. */ -#if ENABLED(SKRMiniE3V2) - #define USE_CONTROLLER_FAN -#endif +//#define USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN) //#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan //#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered @@ -667,7 +665,7 @@ //#define HOMING_BACKOFF_POST_MM { 2, 2, 2 } // (mm) Backoff from endstops after homing -#define QUICK_HOME // If G28 contains XY do a diagonal move first +//#define QUICK_HOME // If G28 contains XY do a diagonal move first //#define HOME_Y_BEFORE_X // If G28 contains XY home Y before X //#define CODEPENDENT_XY_HOMING // If X/Y can't home without homing Y/X first @@ -717,7 +715,7 @@ * differs, a mode set eeprom write will be completed at initialization. * Use the option below to force an eeprom write to a V3.1 probe regardless. */ - #if NONE(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRMiniE3V2) + #if NONE(SKR13, SKR14, SKR14Turbo, SKRPRO11) #define BLTOUCH_SET_5V_MODE #endif /** @@ -1091,7 +1089,7 @@ #if HAS_LCD_MENU // Include a page of printer information in the LCD Main Menu - #if NONE(MachineCR10Orig, SKRMiniE3V2) + #if(DISABLED(MachineCR10Orig)) #define LCD_INFO_MENU #endif #if ENABLED(LCD_INFO_MENU) @@ -1130,7 +1128,7 @@ #endif // HAS_LCD_MENU // Scroll a longer status message into view -#if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define STATUS_MESSAGE_SCROLLING // On the Info Screen, display XY with one decimal place when possible @@ -1188,7 +1186,7 @@ // Reverse SD sort to show "more recent" files first, according to the card's FAT. // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended. - #if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) + #if NONE(MachineCR10Orig, LowMemoryBoard) #define SDCARD_RATHERRECENTFIRST #define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing @@ -1267,7 +1265,7 @@ #endif // Enable this option to scroll long filenames in the SD card menu - #if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) + #if NONE(MachineCR10Orig, LowMemoryBoard) // This allows hosts to request long names for files and folders with M33 #define LONG_FILENAME_HOST_SUPPORT #define SCROLL_LONG_FILENAMES @@ -1438,7 +1436,7 @@ //#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones //#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends) #define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM) - #if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) + #if NONE(MachineCR10Orig, LowMemoryBoard) #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating #endif @@ -1664,7 +1662,7 @@ #endif #if ENABLED(BABYSTEP_ZPROBE_OFFSET) //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets - #if NONE(MachineCR10Orig, LowMemoryBoard, EXTENSIBLE_UI, SKRMiniE3V2) && (DISABLED(MachineEnder4) || ENABLED(GraphicLCD)) + #if NONE(MachineCR10Orig, LowMemoryBoard, EXTENSIBLE_UI) && (DISABLED(MachineEnder4) || ENABLED(GraphicLCD)) #define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor #endif #endif @@ -1687,7 +1685,7 @@ * * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. */ -#if NONE(MachineCR10Orig, SKRMiniE3V2, LowMemoryBoard, MachineCR10SPro, MachineCR10Max, SKR13, SKR14, SKR14Turbo, MachineCR10SV2, CrealitySilentBoard) || ENABLED(OrigLA) || (ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) && ENABLED(SKR_UART)) +#if NONE(MachineCR10Orig, LowMemoryBoard, MachineCR10SPro, MachineCR10Max, SKR13, SKR14, SKR14Turbo, MachineCR10SV2, CrealitySilentBoard) || ENABLED(OrigLA) || (ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) && ENABLED(SKR_UART)) #define LIN_ADVANCE #endif #if ENABLED(LIN_ADVANCE) @@ -1750,7 +1748,7 @@ * Repeatedly attempt G29 leveling until it succeeds. * Stop after G29_MAX_RETRIES attempts. */ -#if ENABLED(ABL_BI) && NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) +#if ENABLED(ABL_BI) && NONE(MachineCR10Orig, LowMemoryBoard) #define G29_RETRY_AND_RECOVER #endif #if ENABLED(G29_RETRY_AND_RECOVER) @@ -1832,7 +1830,7 @@ // // G2/G3 Arc Support // -#if NONE(MachineCR10Orig, SKRMiniE3V2) +#if DISABLED(MachineCR10Orig) #define ARC_SUPPORT // Disable this feature to save ~3226 bytes #endif #if ENABLED(ARC_SUPPORT) @@ -1930,7 +1928,7 @@ // The number of linear moves that can be in the planner at once. // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g. 8, 16, 32) -#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, SKRMiniE3V2) || DISABLED(EXTENSIBLE_UI) +#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) || DISABLED(EXTENSIBLE_UI) #define BLOCK_BUFFER_SIZE 16 #else #define BLOCK_BUFFER_SIZE 8 @@ -1940,7 +1938,7 @@ // The ASCII buffer for serial input #define MAX_CMD_SIZE 96 -#if ANY(MachineCR10Orig, SKRMiniE3V2) //melzi has more ram than a 2560 +#if ENABLED(MachineCR10Orig) //melzi has more ram than a 2560 #define BUFSIZE 16 #elif ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11) #define BUFSIZE 8 @@ -1993,9 +1991,7 @@ * Currently handles M108, M112, M410, M876 * NOTE: Not yet implemented for all platforms. */ -#if NONE(SKRPRO11, SKRMiniE3V2) - #define EMERGENCY_PARSER -#endif +//#define EMERGENCY_PARSER // Bad Serial-connections can miss a received command by sending an 'ok' // Therefore some clients abort after 30 seconds in a timeout. @@ -2006,7 +2002,7 @@ #endif // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) || ENABLED(MelziHostOnly) +#if NONE(MachineCR10Orig, LowMemoryBoard) || ENABLED(MelziHostOnly) #define ADVANCED_OK #endif @@ -2147,7 +2143,7 @@ * Requires NOZZLE_PARK_FEATURE. * This feature is required for the default FILAMENT_RUNOUT_SCRIPT. */ -#if DISABLED(MachineCR10Orig) && ((ENABLED(SKRMiniE3V2) && DISABLED(POWER_LOSS_RECOVERY)) || DISABLED(SKRMiniE3V2)) +#if DISABLED(MachineCR10Orig) #define ADVANCED_PAUSE_FEATURE #endif #if ENABLED(ADVANCED_PAUSE_FEATURE) @@ -2210,7 +2206,7 @@ #define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change. #define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change - #if NONE(MachineCR10Orig, MachineEnder4, SKRMiniE3V2) + #if NONE(MachineCR10Orig, MachineEnder4) #define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. #define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) #endif @@ -2492,9 +2488,7 @@ * The default SW SPI pins are defined the respective pins files, * but you can override or define them here. */ - #if ENABLED(SKR_2130) - #define TMC_USE_SW_SPI - #endif + //#define TMC_USE_SW_SPI //#define TMC_SW_MOSI -1 //#define TMC_SW_MISO -1 //#define TMC_SW_SCK -1 @@ -2573,7 +2567,7 @@ * M912 - Clear stepper driver overtemperature pre-warn condition flag. * M122 - Report driver parameters (Requires TMC_DEBUG) */ - #if ENABLED(SKR_UART) && DISABLED(SKRMiniE3V2) + #if ENABLED(SKR_UART) #define MONITOR_DRIVER_STATUS #endif @@ -2669,7 +2663,7 @@ * Enable M122 debugging command for TMC stepper drivers. * M122 S0/1 will enable continous reporting. */ - #if ENABLED(SKR_UART) && DISABLED(SKRMiniE3V2) + #if ENABLED(SKR_UART) #define TMC_DEBUG #endif @@ -3253,8 +3247,6 @@ //#define M114_REALTIME // Real current position based on forward kinematics //#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed. -//#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others) - /** * Set the number of proportional font spaces required to fill up a typical character space. * This can help to better align the output of commands like `G29 O` Mesh Output. @@ -3386,7 +3378,7 @@ * * Implement M486 to allow Marlin to skip objects */ -#if NONE(MachineCR10Orig, LowMemoryBoard, EXTENSIBLE_UI, SKRMiniE3V2) +#if NONE(MachineCR10Orig, LowMemoryBoard, EXTENSIBLE_UI) #define CANCEL_OBJECTS #endif diff --git a/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp index 79694cbc95..5c684882cb 100644 --- a/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp @@ -1511,9 +1511,12 @@ SERIAL_ECHOLN(PSTR("BeginSwitch")); if (recdat.data[0] == 1) //Filament is out, resume / resume selected on screen { if( +<<<<<<< HEAD #if (FIL_RUNOUT_STATE == LOW) #define FIL_RUNOUT_INVERTING true #endif +======= +>>>>>>> Rebase and catchup #if DISABLED(FILAMENT_RUNOUT_SENSOR) || ENABLED(FILAMENT_MOTION_SENSOR) true #elif NUM_RUNOUT_SENSORS > 1 diff --git a/platformio.ini b/platformio.ini index 2096ae54db..b2412db3bb 100644 --- a/platformio.ini +++ b/platformio.ini @@ -276,40 +276,6 @@ default_envs = S5_AC_ME_NF S5_BLT_AC_ME_NF S5_BLT_AC_UBL_ME_NF - CR20_LR - CR20_BLT_LR - CR20_BLT_UBL_LR - CR20_Pro_LR - CR20_Pro_UBL_LR - CR10S_LR - CR10S_BLT_LR - S4_LR - S4_BLT_UBL_LR - S4_BLT_LR - S4_AC_LR - S4_BLT_AC_LR - S4_BLT_AC_UBL_LR - S5_LR - S5_BLT_LR - S5_BLT_UBL_LR - S5_AC_LR - S5_BLT_AC_LR - S5_BLT_AC_UBL_LR - CR10S_NF_LR - CR10S_BLT_NF_LR - CR10S_BLT_UBL_NF_LR - S4_NF_LR - S4_BLT_UBL_NF_LR - S4_BLT_NF_LR - S4_AC_NF_LR - S4_BLT_AC_NF_LR - S4_BLT_AC_UBL_NF_LR - S5_NF_LR - S5_BLT_NF_LR - S5_BLT_UBL_NF_LR - S5_AC_NF_LR - S5_BLT_AC_NF_LR - S5_BLT_AC_UBL_NF_LR [common] default_src_filter = + - - + @@ -318,14 +284,14 @@ build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants lib_deps = LiquidCrystal TMCStepper@>=0.6.2,<1.0.0 - ;Adafruit NeoPixel + 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 + 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 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 + SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip [env] framework = arduino @@ -2766,318 +2732,6 @@ extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DHotendMosquito -DHotendE3D -DCableExtensionNoiseFilter src_filter = ${common.default_src_filter} + - - -[env:CR20_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR20 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR20_BLT_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR20 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR20_BLT_UBL_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR20 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DABL_UBL -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR20_Pro_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR20Pro -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR20_Pro_UBL_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR20Pro -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DABL_UBL -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR10S_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR10S -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR10S_BLT_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR10S -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - - -[env:S4_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_UBL_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_AC_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_AC_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_AC_UBL_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_UBL_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_AC_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_AC_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_AC_UBL_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR10S_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR10S -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:CR10S_BLT_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR10S -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - - -[env:CR10S_BLT_UBL_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineCR10S -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - - -[env:S4_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_UBL_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_AC_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_AC_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S4_BLT_AC_UBL_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS4 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshFine -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedDC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_UBL_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedDC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_AC_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DHotendAllMetal -DBedAC -DPOWER_LOSS_RECOVERY -DMeshFine -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_AC_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - -[env:S5_BLT_AC_UBL_NF_LR] -platform = atmelavr -board = megaatmega2560 -board_build.f_cpu = 16000000L -lib_deps = ${common.lib_deps} -extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py -build_flags = ${common.build_flags} -DMachineS5 -DBedAC -DPOWER_LOSS_RECOVERY -DABL_BLTOUCH -DMeshExtreme -DABL_UBL -DCableExtensionNoiseFilter -DlerdgeFilSensor -src_filter = ${common.default_src_filter} + - - [env:mega1280] platform = atmelavr board = megaatmega1280