From 1fc6fc2e56ad4984f1c2d6f23b17544c21267e69 Mon Sep 17 00:00:00 2001 From: Eryone Date: Mon, 29 Nov 2021 14:03:35 +0800 Subject: [PATCH] Firmware update New feature and improvements: 1. Enabled the PID-TUNE feature User can use this feature to calibrate the hotend temperature 2. Added the "Calibrate Gantry" custom gcode on LCD menu 3. Added a faster ery sensor homing speed config to switch 4. Improvement the ery sensor Auto bed leveling multi-probe disabled. Increase 25 points to 36 points. --- Marlin-2.0.8/Marlin/Configuration.h | 25 ++++++++++++------------- Marlin-2.0.8/Marlin/Configuration_adv.h | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Marlin-2.0.8/Marlin/Configuration.h b/Marlin-2.0.8/Marlin/Configuration.h index 286df66..05f7ab7 100644 --- a/Marlin-2.0.8/Marlin/Configuration.h +++ b/Marlin-2.0.8/Marlin/Configuration.h @@ -511,9 +511,9 @@ #define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current #define PID_K1 0.95 // Smoothing factor within any PID loop -//#if ENABLED(PIDTEMP) - //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) - //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) +#if ENABLED(PIDTEMP) + #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) // Set/get with gcode: M301 E[extruder number, 0-2] @@ -528,7 +528,7 @@ // #define DEFAULT_Ki 2.01 // #define DEFAULT_Kd 85.00 // #endif -//#endif // PIDTEMP +#endif // PIDTEMP #ifdef ER20_E3D #define DEFAULT_Kp 21.73 //26.11 @@ -1102,7 +1102,7 @@ #ifdef ER20_Direct #define Z_PROBE_FEEDRATE_FAST (3*60) #else - #define Z_PROBE_FEEDRATE_FAST (4*60) + #define Z_PROBE_FEEDRATE_FAST (25*60) #endif // Feedrate (mm/min) for the "accurate" probe of each point @@ -1144,7 +1144,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 2 //#define EXTRA_PROBING 1 /** @@ -1188,7 +1188,7 @@ * These options are most useful for the BLTouch probe, but may also improve * readings with inductive probes and piezo sensors. */ -//#define PROBING_HEATERS_OFF // Turn heaters off when probing +#define PROBING_HEATERS_OFF // Turn heaters off when probing #if ENABLED(PROBING_HEATERS_OFF) //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy) //#define WAIT_FOR_HOTEND // Wait for hotend to heat back up between probes (to improve accuracy & prevent cold extrude) @@ -1279,7 +1279,7 @@ #define Z_MIN_POS 0 #define X_MAX_POS 250 #define Y_MAX_POS 225 -#define Z_MAX_POS 200 +#define Z_MAX_POS 230//200 /** * Software Endstops @@ -1399,9 +1399,8 @@ */ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR -//#define AUTO_BED_LEVELING_BILINEAR -//#define AUTO_BED_LEVELING_UBL #define AUTO_BED_LEVELING_BILINEAR +//#define AUTO_BED_LEVELING_UBL //#define MESH_BED_LEVELING @@ -1468,7 +1467,7 @@ #if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) // Set the number of grid points per dimension. - #define GRID_MAX_POINTS_X 5 //3 + #define GRID_MAX_POINTS_X 6 //3 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X // Probe along the Y axis, advancing X after each column @@ -1484,7 +1483,7 @@ // Experimental Subdivision of the grid by Catmull-Rom method. // Synthesizes intermediate points to produce a more detailed mesh. // - //#define ABL_BILINEAR_SUBDIVISION + #define ABL_BILINEAR_SUBDIVISION #if ENABLED(ABL_BILINEAR_SUBDIVISION) // Number of subdivisions between probe points #define BILINEAR_SUBDIVISIONS 3 @@ -1607,7 +1606,7 @@ #endif // Homing speeds (mm/min) -#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) } +#define HOMING_FEEDRATE_MM_M { (100*60), (100*60), (25*60) } // Validate that endstops are triggered on homing moves #define VALIDATE_HOMING_ENDSTOPS diff --git a/Marlin-2.0.8/Marlin/Configuration_adv.h b/Marlin-2.0.8/Marlin/Configuration_adv.h index f28ccbe..c04f1d7 100644 --- a/Marlin-2.0.8/Marlin/Configuration_adv.h +++ b/Marlin-2.0.8/Marlin/Configuration_adv.h @@ -3580,24 +3580,24 @@ */ // Custom Menu: Main Menu -//#define CUSTOM_MENU_MAIN +#define CUSTOM_MENU_MAIN #if ENABLED(CUSTOM_MENU_MAIN) - //#define CUSTOM_MENU_MAIN_TITLE "Custom Commands" - #define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 User Script Done" + #define CUSTOM_MENU_MAIN_TITLE "Calibrate Printer" + #define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 Calibrate Done!" #define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK - //#define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script + #define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script #define CUSTOM_MENU_MAIN_ONLY_IDLE // Only show custom menu when the machine is idle - #define MAIN_MENU_ITEM_1_DESC "Home & UBL Info" - #define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W" + #define MAIN_MENU_ITEM_1_DESC "Calibrate Gantry" + #define MAIN_MENU_ITEM_1_GCODE "G28\nG1 Z100 F800\nG1 X130 Y110 F8000\nM117 Move to safe point\nG4 P2000\nM117 Set Z current to 350\nM906 Z350\nG4 P2000\nM117 Calibrate start\nG4 P2000\nG0 Z230\nM117 Bang bang bang\nG4 P2000\nG0 Z200\nG4 P2000\nM117 Set Z current to 600\nG4 P1000\nM906 Z600\nG4 P200\nM117 Home All\nG4 P2000\nG28\nG4 P1000\nM117 Calibrate Done!" //#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action - #define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL - #define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) + #define MAIN_MENU_ITEM_2_DESC "ABL Sensor Turbo" + #define MAIN_MENU_ITEM_2_GCODE "M203 Z25\nM117 Turbo now...\nM201 Z300\nG4 P1000\nM500\nM117 Done!" //#define MAIN_MENU_ITEM_2_CONFIRM - //#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL - //#define MAIN_MENU_ITEM_3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) + #define MAIN_MENU_ITEM_3_DESC "ABL Sensor Stock" + #define MAIN_MENU_ITEM_3_GCODE "M203 Z5\nM117 Roll Back now...\nM201 Z25\nG4 P1000\nM500\nM117 Done!" //#define MAIN_MENU_ITEM_3_CONFIRM //#define MAIN_MENU_ITEM_4_DESC "Heat Bed/Home/Level"