From 4a1c69960f78bc889cc9d1e7ebc5df1102c65a98 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Tue, 29 Sep 2020 22:55:20 +0300 Subject: [PATCH] Update Config --- Marlin/Configuration.h | 69 ++++++++++--------- Marlin/src/MarlinCore.cpp | 20 +++--- .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 1 - 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 23f142ebac..b3432590eb 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -121,13 +121,14 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 +#define USB_BAUDRATE 230400 // 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 @@ -426,7 +427,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 @@ -661,7 +662,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 @@ -679,15 +680,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 @@ -742,7 +743,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) @@ -762,7 +763,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) @@ -778,9 +779,9 @@ * 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 +#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -792,15 +793,15 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.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 #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 @@ -843,7 +844,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 @@ -863,7 +864,7 @@ * - normally-closed switches to GND and D32. * - 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 @@ -992,10 +993,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 @@ -1012,7 +1013,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 /** @@ -1031,7 +1032,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 @@ -1139,7 +1140,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] @@ -1150,8 +1151,8 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 255 -#define Y_BED_SIZE 210 +#define X_BED_SIZE 250 +#define Y_BED_SIZE 207 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -1416,8 +1417,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) @@ -1562,14 +1563,14 @@ EEPROM_W25Q // @section temperature // Preheat Constants -#define PREHEAT_1_LABEL "PETG" -#define PREHEAT_1_TEMP_HOTEND 235 -#define PREHEAT_1_TEMP_BED 80 +#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 "ABS" -#define PREHEAT_2_TEMP_HOTEND 250 -#define PREHEAT_2_TEMP_BED 100 +#define PREHEAT_2_LABEL "PETG" +#define PREHEAT_2_TEMP_HOTEND 235 +#define PREHEAT_2_TEMP_BED 80 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 /** @@ -1696,7 +1697,7 @@ EEPROM_W25Q * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER /** * Password @@ -2270,8 +2271,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/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 49a38aef2c..e91b3f091c 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -965,15 +965,17 @@ void setup() { #endif #endif - MYSERIAL0.begin(BAUDRATE); - uint32_t serial_connect_timeout = millis() + 1000UL; - while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } - #if HAS_MULTI_SERIAL - MYSERIAL1.begin(BAUDRATE); - serial_connect_timeout = millis() + 1000UL; - while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } - #endif - SERIAL_ECHO_MSG("start"); + #if NUM_SERIAL > 0 + MYSERIAL0.begin(USB_BAUDRATE); + uint32_t serial_connect_timeout = millis() + 1000UL; + while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } + #if HAS_MULTI_SERIAL + MYSERIAL1.begin(BAUDRATE); + serial_connect_timeout = millis() + 1000UL; + while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } + #endif + SERIAL_ECHO_MSG("start"); +#endif #if BOTH(HAS_TFT_LVGL_UI, USE_WIFI_FUNCTION) mks_esp_wifi_init(); 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 65abb7a998..3fa07f1a5d 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -188,7 +188,6 @@ https://easyeda.com/sst78rust/fb4s-led-control // Heaters / Fans // #define HEATER_0_PIN PC3 // HEATER1 -#define HEATER_1_PIN PB0 // HEATER2 #define HEATER_BED_PIN PA0 // HOT BED #if HOTENDS == 1