From 709b26d6f9532610024135f76d2b61ea3e59a3e5 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Tue, 22 Sep 2020 22:53:41 +0300 Subject: [PATCH 1/9] Nano2_Config --- Marlin/Configuration.h | 57 +++++++++++++++++++------------------- Marlin/Configuration_adv.h | 2 +- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ff07c4eed0..103131b15a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,13 +123,14 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 +//#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_ROBIN_NANO + #define MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 #endif // Name displayed in the LCD "Ready" message and Info menu @@ -678,7 +679,7 @@ #define X_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. +#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -696,15 +697,15 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['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'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE TMC2209 +#define Y_DRIVER_TYPE TMC2208_STANDALONE +#define Z_DRIVER_TYPE TMC2208_STANDALONE //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE TMC2209 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -759,7 +760,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 421 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.5, 80.5, 400, 415 } /** * Default Max Feed Rate (mm/s) @@ -779,7 +780,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 100, 800 } +#define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 800 } #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -795,7 +796,7 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves @@ -809,15 +810,15 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.0 + #define DEFAULT_XJERK 20.0 + #define DEFAULT_YJERK 20.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 #if ENABLED(LIMITED_JERK_EDITING) - #define MAX_JERK_EDIT_VALUES { 20, 20, 2, 20 } // ...or, set your own edit limits + #define MAX_JERK_EDIT_VALUES { 30, 30, 2, 20 } // ...or, set your own edit limits #endif #endif @@ -860,7 +861,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -881,7 +882,7 @@ * - normally-open switches to 5V and D32. * */ -#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default +//#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default /** * Probe Type @@ -1010,10 +1011,10 @@ // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -#define PROBING_MARGIN 30 +#define PROBING_MARGIN 5 // X and Y axis travel speed (mm/min) between probes -#define XY_PROBE_SPEED (1000) +#define XY_PROBE_SPEED 3000 // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2) #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z @@ -1030,7 +1031,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 5 +#define MULTIPLE_PROBING 2 //#define EXTRA_PROBING 1 /** @@ -1049,7 +1050,7 @@ */ #define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points -#define Z_CLEARANCE_MULTI_PROBE 1 // Z Clearance between multiple probes +#define Z_CLEARANCE_MULTI_PROBE 3 // Z Clearance between multiple probes #define Z_AFTER_PROBING 5 // Z position after probing is done #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping @@ -1157,7 +1158,7 @@ #define Z_HOMING_HEIGHT 2 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z +//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1168,7 +1169,7 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 255 +#define X_BED_SIZE 250 #define Y_BED_SIZE 210 // Travel limits (mm) after homing, corresponding to endstop positions. @@ -1434,8 +1435,8 @@ #define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT (0) // X point for Z homing when homing all axes (G28). - #define Z_SAFE_HOMING_Y_POINT (0) // Y point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). #endif // Homing speeds (mm/m) @@ -1580,9 +1581,9 @@ EEPROM_W25Q // @section temperature // Preheat Constants -#define PREHEAT_1_LABEL "ABS" -#define PREHEAT_1_TEMP_HOTEND 250 -#define PREHEAT_1_TEMP_BED 100 +#define PREHEAT_1_LABEL "PLA" +#define PREHEAT_1_TEMP_HOTEND 190 +#define PREHEAT_1_TEMP_BED 50 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 #define PREHEAT_2_LABEL "PETG" @@ -1715,7 +1716,7 @@ EEPROM_W25Q * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER /** * Password @@ -2279,8 +2280,8 @@ EEPROM_W25Q // //#define TFT_320x240 //#define TFT_320x240_SPI -#define TFT_480x320 -//#define TFT_480x320_SPI +//#define TFT_480x320 +#define TFT_480x320_SPI // // Skip autodetect and force specific TFT driver diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index b27932bb8e..748f5d8bff 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -479,7 +479,7 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE +#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN LED_CASE_PIN // Override the default pin if needed #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW From 91ccf7ba7c7cbddec968a2b480db21782e3e89af Mon Sep 17 00:00:00 2001 From: X-Dron Date: Tue, 22 Sep 2020 23:15:52 +0300 Subject: [PATCH 2/9] Update Configuration_adv.h LIGHT_NO_BRIGHTNESS --- Marlin/Configuration_adv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 748f5d8bff..c4219b2015 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -487,7 +487,7 @@ #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 // Set default power-up brightness (0-255, requires PWM pin) #define CASE_LIGHT_MAX_PWM 255 // Limit pwm #define CASE_LIGHT_MENU // Add Case Light options to the LCD menu - //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. + #define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED. #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White } From d87fdcd63da52df47973b4876ea7c06dc392a9af Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 25 Sep 2020 09:25:01 +0300 Subject: [PATCH 3/9] USB_BAUDRATE 230400 --- Marlin/Configuration.h | 4 ++-- Marlin/src/MarlinCore.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 103131b15a..6d714798e3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,7 +123,7 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 -//#define BAUDRATE 250000 +#define USB_BAUDRATE 230400 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH @@ -428,7 +428,7 @@ #define TEMP_SENSOR_7 0 #define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_PROBE 0 -#define TEMP_SENSOR_CHAMBER 0 +#define TEMP_SENSOR_CHAMBER 1 // Dummy thermistor constant temperature readings, for use with 998 and 999 #define DUMMY_THERMISTOR_998_VALUE 25 diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 29f2783b28..cd87a3b33f 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -909,7 +909,7 @@ void setup() { #endif #if NUM_SERIAL > 0 - MYSERIAL0.begin(BAUDRATE); + MYSERIAL0.begin(USB_BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL From 1e27eaa3323cfd378eea7fe71a89a45804d1d696 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 25 Sep 2020 09:27:59 +0300 Subject: [PATCH 4/9] AutoFan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс AutoFan, датчик температуры в корпусе, фикс русских коментариев --- .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index a4d1dcb13a..518c140092 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -42,8 +42,8 @@ #define DISABLE_DEBUG /* - - En +Управление подсветкой платой в разъеме второго экструдера +Управление ногой En https://easyeda.com/sst78rust/fb4s-led-control */ #define CASE_LED_INSTEAD_E1 @@ -185,14 +185,27 @@ https://easyeda.com/sst78rust/fb4s-led-control #define TEMP_0_PIN PC1 // TH1 #define TEMP_1_PIN PC2 // TH2 #define TEMP_BED_PIN PC0 // TB1 +//Дополнительный термистор на корпусе +#if TEMP_SENSOR_CHAMBER > 0 + #define TEMP_CHAMBER_PIN PC2 +#endif // // Heaters / Fans // #define HEATER_0_PIN PC3 // HEATER1 -#define HEATER_1_PIN PB0 // HEATER2 #define HEATER_BED_PIN PA0 // HOT BED +#if HOTENDS == 1 + #ifndef FAN1_PIN + #define FAN1_PIN PB0 + #endif +#else + #ifndef HEATER_1_PIN + #define HEATER_1_PIN PB0 + #endif +#endif + #define FAN_PIN PB1 // FAN // @@ -402,7 +415,7 @@ https://easyeda.com/sst78rust/fb4s-led-control #endif /* - MKS WIFI +Модуль MKS WIFI */ #define MKS_WIFI #ifdef MKS_WIFI From 09c13d5b08087e43165fab3ee775b222d541d407 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:32:34 +0300 Subject: [PATCH 5/9] Update Configuration.h --- Marlin/Configuration.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6d714798e3..0af5674df9 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -798,7 +798,7 @@ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) #define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -810,8 +810,8 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 20.0 - #define DEFAULT_YJERK 20.0 + #define DEFAULT_XJERK 17.0 + #define DEFAULT_YJERK 17.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves @@ -1170,7 +1170,7 @@ // The size of the print bed #define X_BED_SIZE 250 -#define Y_BED_SIZE 210 +#define Y_BED_SIZE 207 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 From 676c8733c4b773766d283cca9a19332fedf236c3 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:32:45 +0300 Subject: [PATCH 6/9] Revert "USB_BAUDRATE 230400" This reverts commit d87fdcd63da52df47973b4876ea7c06dc392a9af. --- Marlin/Configuration.h | 4 ++-- Marlin/src/MarlinCore.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 0af5674df9..8aa51b49d2 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,7 +123,7 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 -#define USB_BAUDRATE 230400 +//#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH @@ -428,7 +428,7 @@ #define TEMP_SENSOR_7 0 #define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_PROBE 0 -#define TEMP_SENSOR_CHAMBER 1 +#define TEMP_SENSOR_CHAMBER 0 // Dummy thermistor constant temperature readings, for use with 998 and 999 #define DUMMY_THERMISTOR_998_VALUE 25 diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index cd87a3b33f..29f2783b28 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -909,7 +909,7 @@ void setup() { #endif #if NUM_SERIAL > 0 - MYSERIAL0.begin(USB_BAUDRATE); + MYSERIAL0.begin(BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL From 2bd939d8f57b2373704ca628cb0d7385b8d19b02 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:32:55 +0300 Subject: [PATCH 7/9] Revert "Update Configuration.h" This reverts commit 09c13d5b08087e43165fab3ee775b222d541d407. --- Marlin/Configuration.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8aa51b49d2..103131b15a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -798,7 +798,7 @@ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) #define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -810,8 +810,8 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 17.0 - #define DEFAULT_YJERK 17.0 + #define DEFAULT_XJERK 20.0 + #define DEFAULT_YJERK 20.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves @@ -1170,7 +1170,7 @@ // The size of the print bed #define X_BED_SIZE 250 -#define Y_BED_SIZE 207 +#define Y_BED_SIZE 210 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 From bd2cea18a2a15d5988aee7c837dfb7bd79c03ee8 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:33:11 +0300 Subject: [PATCH 8/9] Revert "Nano2_Config" This reverts commit 709b26d6f9532610024135f76d2b61ea3e59a3e5. --- Marlin/Configuration.h | 57 +++++++++++++++++++------------------- Marlin/Configuration_adv.h | 2 +- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 103131b15a..ff07c4eed0 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,14 +123,13 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 -//#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 + #define MOTHERBOARD BOARD_MKS_ROBIN_NANO #endif // Name displayed in the LCD "Ready" message and Info menu @@ -679,7 +678,7 @@ #define X_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. +#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -697,15 +696,15 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['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'] */ -#define X_DRIVER_TYPE TMC2209 -#define Y_DRIVER_TYPE TMC2208_STANDALONE -#define Z_DRIVER_TYPE TMC2208_STANDALONE +#define X_DRIVER_TYPE A4988 +#define Y_DRIVER_TYPE A4988 +#define Z_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE TMC2209 +#define E0_DRIVER_TYPE A4988 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -760,7 +759,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.5, 80.5, 400, 415 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 421 } /** * Default Max Feed Rate (mm/s) @@ -780,7 +779,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 800 } +#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 100, 800 } #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -796,7 +795,7 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves @@ -810,15 +809,15 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 20.0 - #define DEFAULT_YJERK 20.0 + #define DEFAULT_XJERK 10.0 + #define DEFAULT_YJERK 10.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 #if ENABLED(LIMITED_JERK_EDITING) - #define MAX_JERK_EDIT_VALUES { 30, 30, 2, 20 } // ...or, set your own edit limits + #define MAX_JERK_EDIT_VALUES { 20, 20, 2, 20 } // ...or, set your own edit limits #endif #endif @@ -861,7 +860,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -882,7 +881,7 @@ * - normally-open switches to 5V and D32. * */ -//#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default +#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default /** * Probe Type @@ -1011,10 +1010,10 @@ // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -#define PROBING_MARGIN 5 +#define PROBING_MARGIN 30 // X and Y axis travel speed (mm/min) between probes -#define XY_PROBE_SPEED 3000 +#define XY_PROBE_SPEED (1000) // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2) #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z @@ -1031,7 +1030,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 2 +#define MULTIPLE_PROBING 5 //#define EXTRA_PROBING 1 /** @@ -1050,7 +1049,7 @@ */ #define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points -#define Z_CLEARANCE_MULTI_PROBE 3 // Z Clearance between multiple probes +#define Z_CLEARANCE_MULTI_PROBE 1 // Z Clearance between multiple probes #define Z_AFTER_PROBING 5 // Z position after probing is done #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping @@ -1158,7 +1157,7 @@ #define Z_HOMING_HEIGHT 2 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z +#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1169,7 +1168,7 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 250 +#define X_BED_SIZE 255 #define Y_BED_SIZE 210 // Travel limits (mm) after homing, corresponding to endstop positions. @@ -1435,8 +1434,8 @@ #define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). - #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_X_POINT (0) // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT (0) // Y point for Z homing when homing all axes (G28). #endif // Homing speeds (mm/m) @@ -1581,9 +1580,9 @@ EEPROM_W25Q // @section temperature // Preheat Constants -#define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 190 -#define PREHEAT_1_TEMP_BED 50 +#define PREHEAT_1_LABEL "ABS" +#define PREHEAT_1_TEMP_HOTEND 250 +#define PREHEAT_1_TEMP_BED 100 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 #define PREHEAT_2_LABEL "PETG" @@ -1716,7 +1715,7 @@ EEPROM_W25Q * * View the current statistics with M78. */ -#define PRINTCOUNTER +//#define PRINTCOUNTER /** * Password @@ -2280,8 +2279,8 @@ EEPROM_W25Q // //#define TFT_320x240 //#define TFT_320x240_SPI -//#define TFT_480x320 -#define TFT_480x320_SPI +#define TFT_480x320 +//#define TFT_480x320_SPI // // Skip autodetect and force specific TFT driver diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index c4219b2015..a6f65368cf 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -479,7 +479,7 @@ /** * M355 Case Light on-off / brightness */ -#define CASE_LIGHT_ENABLE +//#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN LED_CASE_PIN // Override the default pin if needed #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW From c0704a1c9754cdc4e9f4e0cba2520732a7a465a3 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:33:33 +0300 Subject: [PATCH 9/9] Revert "Update Configuration_adv.h" This reverts commit 91ccf7ba7c7cbddec968a2b480db21782e3e89af. --- Marlin/Configuration_adv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index a6f65368cf..b27932bb8e 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -487,7 +487,7 @@ #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 // Set default power-up brightness (0-255, requires PWM pin) #define CASE_LIGHT_MAX_PWM 255 // Limit pwm #define CASE_LIGHT_MENU // Add Case Light options to the LCD menu - #define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. + //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED. #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }