diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 98a6c8b2c960..24a474acb153 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -97,7 +97,8 @@ //#define AddonFilSensor //Adds a filamnt runout sensor to the CR20 or Ender 4 //#define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock //#define DualFilSensors //Using dual filament sensors on XMax and YMAX -#define FilamentEncoder //Using filamet jam sensor such as the Bigtreetech Encoder wheel +//#define FilamentEncoder //Using filamet jam sensor such as the Bigtreetech Encoder wheel + // Advanced options - Not for most users @@ -131,8 +132,11 @@ //#define Melzi_To_SBoardUpgrade // Upgrade Melzi board to 10S board //#define CrealitySilentBoard // Creality board with TMC2208 Standalone drivers. Disables Linear Advance //#define SKR13 // 32 bit board - assumes 2208 drivers -//#define SKR13_2209 -//#define SKR13_UART // Configure SKR board with drivers in UART mode +#define SKRPRO11 +//#define I2C_EEPROM // use I2C EEPROM on SRK PRO v1.1 e.g AT24C256 + +#define SKR_2209 +#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. /* @@ -312,7 +316,7 @@ #define Z_STOP_PIN 19 #endif -#if ANY(MachineEnder2, MachineEnder3, MachineEnder5, MachineCR10) && NONE(Melzi_To_SBoardUpgrade, SKR13) +#if ANY(MachineEnder2, MachineEnder3, MachineEnder5, MachineCR10) && NONE(Melzi_To_SBoardUpgrade, SKR13, SKRPRO11) #define MachineCR10Orig #endif @@ -369,6 +373,13 @@ #define SolidBedMounts #endif +#if ENABLED(SKRPRO11) + #define FIL_RUNOUT_PIN PE15 + #if DISABLED(I2C_EEPROM) + #define FLASH_EEPROM_EMULATION + #endif +#endif + //Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION ** #if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus) || ENABLED(GraphicLCD) @@ -387,7 +398,7 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ -#if ENABLED(SKR13) +#if ANY(SKR13, SKRPRO11) #define SERIAL_PORT -1 #else #define SERIAL_PORT 0 @@ -402,6 +413,8 @@ */ #if ENABLED(SKR13) #define SERIAL_PORT_2 0 +#elif ENABLED(SKRPRO11) && NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max) && DISABLED(GraphicLCD) + #define SERIAL_PORT_2 1 #endif /** * This setting determines the communication speed of the printer. @@ -421,6 +434,8 @@ #ifndef MOTHERBOARD #if ENABLED(SKR13) #define MOTHERBOARD BOARD_BIGTREE_SKR_V1_3 + #elif ENABLED(SKRPRO11) + #define MOTHERBOARD BOARD_BIGTREE_SKR_PRO_V1_1 #elif (ENABLED(MachineCR10Orig) && DISABLED(Melzi_To_SBoardUpgrade)) #define MOTHERBOARD BOARD_MELZI_CREALITY #else @@ -1068,8 +1083,8 @@ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', '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, MachineCR10SV2, CrealitySilentBoard, MachineCR10SPro, MachineCR10SProV2, MachineCR10Max) && DISABLED(SKR13_UART) - #if ENABLED(SKR13_2209) +#if ANY(SKR13, 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 #define Z_DRIVER_TYPE TMC2209_STANDALONE @@ -1082,8 +1097,8 @@ #define E0_DRIVER_TYPE TMC2208_STANDALONE #define E1_DRIVER_TYPE TMC2208_STANDALONE #endif -#elif ENABLED(SKR13, SKR13_UART) - #if ENABLED(SKR13_2209) +#elif ANY(SKR13, SKRPRO11) && ENABLED(SKR_UART) + #if ENABLED(SKR_2209) #define X_DRIVER_TYPE TMC2209 #define Y_DRIVER_TYPE TMC2209 #define Z_DRIVER_TYPE TMC2209 @@ -1394,7 +1409,7 @@ #define PROBING_FANS_OFF // Turn fans off when probing #endif - #if ENABLED(MachineEnder4) && DISABLED(SKR13) + #if ENABLED(MachineEnder4) && DISABLED(SKR13, SKRPRO11) #define SOLENOID_PROBE PIN_15 #endif #endif @@ -1843,8 +1858,10 @@ #define FILAMENT_RUNOUT_SENSOR #endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #if ENABLED(DualFilSensors) && DISABLED(SKR13) - #define NUM_RUNOUT_SENSORS 2 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. + #if ENABLED(DualFilSensors) + #if DISABLED(SKR13,SKRPRO11) + #define NUM_RUNOUT_SENSORS 2 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. + #endif #define FIL_RUNOUT2_PIN 15 #else #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 50a4e070d673..1285771e425b 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1284,7 +1284,7 @@ #define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash) //#define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu - #if ENABLED(SKR13) + #if ENABLED(SKR13, SKRPRO11) // Frivolous Game Options #define MARLIN_BRICKOUT #define MARLIN_INVADERS @@ -1467,7 +1467,7 @@ * See http://marlinfw.org/docs/features/lin_advance.html for full instructions. * Mention @Sebastianv650 on GitHub to alert the author of any issues. */ -#if NONE(MachineCR10Orig, LowMemoryBoard, MachineCR10SPro, MachineCR10Max, SKR13, MachineCR10SV2, CrealitySilentBoard) || ENABLED(OrigLA) || ENABLED(SKR13, SKR13_UART) +#if NONE(MachineCR10Orig, LowMemoryBoard, MachineCR10SPro, MachineCR10Max, SKR13, MachineCR10SV2, CrealitySilentBoard) || ENABLED(OrigLA) || ENABLED(SKR13, SKR_UART) || ENABLED(SKRPRO11, SKR_UART) #define LIN_ADVANCE #endif #if ENABLED(LIN_ADVANCE) @@ -1604,7 +1604,7 @@ * * Override the default value based on the driver type set in Configuration.h. */ -#if ENABLED(SKR13) +#if ENABLED(SKR13, SKRPRO11) #define MINIMUM_STEPPER_PULSE 1 #endif /** @@ -1692,7 +1692,9 @@ // enter the serial receive buffer, so they cannot be blocked. // Currently handles M108, M112, M410 // Does not work on boards using AT90USB (USBCON) processors! -#define EMERGENCY_PARSER +#if DISABLED(SKRPRO11) + #define EMERGENCY_PARSER +#endif // Bad Serial-connections can miss a received command by sending an 'ok' // Therefore some clients abort after 30 seconds in a timeout. @@ -1737,7 +1739,7 @@ * Note that M207 / M208 / M209 settings are saved to EEPROM. * */ - #if ENABLED(SKR13) + #if ENABLED(SKR13, SKRPRO11) #define FWRETRACT #endif #if ENABLED(FWRETRACT) @@ -1967,7 +1969,7 @@ #define INTERPOLATE true // Interpolate X/Y/Z_MICROSTEPS to 256 #if AXIS_IS_TMC(X) - #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. + #define X_CURRENT 730 // (mA) RMS current. Multiply by 1.414 for peak current. #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing #define X_MICROSTEPS 16 // 0..256 #define X_RSENSE 0.11 @@ -1983,7 +1985,7 @@ #endif #if AXIS_IS_TMC(Y) - #define Y_CURRENT 800 + #define Y_CURRENT 730 #define Y_CURRENT_HOME Y_CURRENT #define Y_MICROSTEPS 16 #define Y_RSENSE 0.11 @@ -1999,7 +2001,7 @@ #endif #if AXIS_IS_TMC(Z) - #define Z_CURRENT 800 + #define Z_CURRENT 850 #define Z_CURRENT_HOME Z_CURRENT #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 @@ -2023,7 +2025,7 @@ #endif #if AXIS_IS_TMC(E0) - #define E0_CURRENT 800 + #define E0_CURRENT 730 #define E0_MICROSTEPS 16 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 @@ -2133,7 +2135,7 @@ */ #define STEALTHCHOP_XY #define STEALTHCHOP_Z - #define STEALTHCHOP_E + //#define STEALTHCHOP_E /** * Optimize spreadCycle chopper parameters by using predefined parameter sets @@ -2162,7 +2164,9 @@ * M912 - Clear stepper driver overtemperature pre-warn condition flag. * M122 - Report driver parameters (Requires TMC_DEBUG) */ - //#define MONITOR_DRIVER_STATUS + #if ENABLED(SKR_UART) + #define MONITOR_DRIVER_STATUS + #endif #if ENABLED(MONITOR_DRIVER_STATUS) #define CURRENT_STEP_DOWN 50 // [mA] @@ -2179,14 +2183,14 @@ */ #define HYBRID_THRESHOLD - #define X_HYBRID_THRESHOLD 100 // [mm/s] + #define X_HYBRID_THRESHOLD 150 // [mm/s] #define X2_HYBRID_THRESHOLD 100 - #define Y_HYBRID_THRESHOLD 100 + #define Y_HYBRID_THRESHOLD 150 #define Y2_HYBRID_THRESHOLD 100 - #define Z_HYBRID_THRESHOLD 3 - #define Z2_HYBRID_THRESHOLD 3 + #define Z_HYBRID_THRESHOLD 10 + #define Z2_HYBRID_THRESHOLD 10 #define Z3_HYBRID_THRESHOLD 3 - #define E0_HYBRID_THRESHOLD 30 + #define E0_HYBRID_THRESHOLD 50 #define E1_HYBRID_THRESHOLD 30 #define E2_HYBRID_THRESHOLD 30 #define E3_HYBRID_THRESHOLD 30 @@ -2243,13 +2247,15 @@ * Beta feature! * Create a 50/50 square wave step pulse optimal for stepper drivers. */ - //#define SQUARE_WAVE_STEPPING + #define SQUARE_WAVE_STEPPING /** * Enable M122 debugging command for TMC stepper drivers. * M122 S0/1 will enable continous reporting. */ - //#define TMC_DEBUG + #if ENABLED(SKR_UART) + #define TMC_DEBUG + #endif /** * You can set your own advanced settings by filling in predefined functions. diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.h b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.h index 04f303ad15ff..f0e4dea288ec 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.h +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.h @@ -92,6 +92,8 @@ namespace ExtUI { #if ENABLED(SKR13) #define DWIN_SERIAL MSerial +#elif ENABLED(SKRPRO11) + #define DWIN_SERIAL Serial1 #else #define DWIN_SERIAL Serial2 #endif @@ -187,4 +189,4 @@ float targetPos; #ifndef USER_GCODE_1 #define USER_GCODE_1 "G28" #endif -#endif \ No newline at end of file +#endif diff --git a/platformio.ini b/platformio.ini index 2ad1bb9a3a8b..846d975e5230 100644 --- a/platformio.ini +++ b/platformio.ini @@ -577,7 +577,7 @@ lib_deps = U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip LiquidCrystal TMCStepper@>=0.5.2,<1.0.0 - Adafruit NeoPixel + #Adafruit NeoPixel LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip lib_ignore = SoftwareSerial, SoftwareSerialM