Created
October 10, 2019 04:55
-
-
Save anttix/8d783fd5c281930df9a86e829034ec4f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Apply to bugfix-2.0.x b119c1401749037bc23352633f629268217ee5bf | |
--- | |
Marlin/Configuration.h | 80 ++++++++++++++++++++++++---------------------- | |
Marlin/Configuration_adv.h | 60 +++++++++++++++++----------------- | |
Marlin/src/inc/Version.h | 2 +- | |
3 files changed, 72 insertions(+), 70 deletions(-) | |
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h | |
index fa5d270..4bd312d 100644 | |
--- a/Marlin/Configuration.h | |
+++ b/Marlin/Configuration.h | |
@@ -71,7 +71,7 @@ | |
// @section info | |
// Author info of this build printed to the host during boot and M115 | |
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. | |
+#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 413)" // Who made the changes. | |
/** | |
* *** VENDORS PLEASE READ *** | |
@@ -88,7 +88,7 @@ | |
#define SHOW_BOOTSCREEN | |
// Show the bitmap in Marlin/_Bootscreen.h on startup. | |
-//#define SHOW_CUSTOM_BOOTSCREEN | |
+#define SHOW_CUSTOM_BOOTSCREEN | |
// Show the bitmap in Marlin/_Statusscreen.h on the status screen. | |
//#define CUSTOM_STATUS_SCREEN_IMAGE | |
@@ -133,7 +133,7 @@ | |
#endif | |
// Name displayed in the LCD "Ready" message and Info menu | |
-//#define CUSTOM_MACHINE_NAME "3D Printer" | |
+#define CUSTOM_MACHINE_NAME "V1 E CNC" | |
// Printer's unique ID, used by some programs to differentiate between machines. | |
// Choose your own or use a service like http://www.uuidgenerator.net/version4 | |
@@ -143,7 +143,7 @@ | |
// This defines the number of extruders | |
// :[1, 2, 3, 4, 5, 6] | |
-#define EXTRUDERS 1 | |
+#define EXTRUDERS 0 | |
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. | |
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 | |
@@ -403,7 +403,7 @@ | |
* | |
* :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '331':"(3.3V thermistor 1)", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '512':"100k RPW-Ultra hotend thermistor", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"Pt100 (Ultimainboard V2.x)", '201':"Pt100 (Overlord)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" } | |
*/ | |
-#define TEMP_SENSOR_0 1 | |
+#define TEMP_SENSOR_0 0 | |
#define TEMP_SENSOR_1 0 | |
#define TEMP_SENSOR_2 0 | |
#define TEMP_SENSOR_3 0 | |
@@ -473,10 +473,10 @@ | |
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it | |
- // Ultimaker | |
- #define DEFAULT_Kp 22.2 | |
- #define DEFAULT_Ki 1.08 | |
- #define DEFAULT_Kd 114 | |
+ // MPCNC MK8 | |
+ #define DEFAULT_Kp 17.98 | |
+ #define DEFAULT_Ki .98 | |
+ #define DEFAULT_Kd 83.62 | |
// MakerGear | |
//#define DEFAULT_Kp 7.0 | |
@@ -605,8 +605,8 @@ | |
#define USE_XMIN_PLUG | |
#define USE_YMIN_PLUG | |
#define USE_ZMIN_PLUG | |
-//#define USE_XMAX_PLUG | |
-//#define USE_YMAX_PLUG | |
+#define USE_XMAX_PLUG | |
+#define USE_YMAX_PLUG | |
//#define USE_ZMAX_PLUG | |
// Enable pullup for all endstops to prevent a floating state | |
@@ -638,11 +638,11 @@ | |
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). | |
#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
-#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
+#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Z_MAX_ENDSTOP_INVERTING false // 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 | |
@@ -659,14 +659,14 @@ | |
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE | |
* :['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'] | |
*/ | |
-//#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 X_DRIVER_TYPE DRV8825 | |
+#define Y_DRIVER_TYPE DRV8825 | |
+#define Z_DRIVER_TYPE DRV8825 | |
+#define X2_DRIVER_TYPE DRV8825 | |
+#define Y2_DRIVER_TYPE DRV8825 | |
+#define Z2_DRIVER_TYPE DRV8825 | |
//#define Z3_DRIVER_TYPE A4988 | |
-//#define E0_DRIVER_TYPE A4988 | |
+#define E0_DRIVER_TYPE DRV8825 | |
//#define E1_DRIVER_TYPE A4988 | |
//#define E2_DRIVER_TYPE A4988 | |
//#define E3_DRIVER_TYPE A4988 | |
@@ -716,14 +716,14 @@ | |
* Override with M92 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] | |
*/ | |
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } | |
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 200, 200, 800, 200 } | |
/** | |
* Default Max Feed Rate (mm/s) | |
* Override with M203 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] | |
*/ | |
-#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } | |
+#define DEFAULT_MAX_FEEDRATE { 120, 120, 30, 25 } | |
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 | |
#if ENABLED(LIMITED_MAX_FR_EDITING) | |
@@ -736,7 +736,7 @@ | |
* Override with M201 | |
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] | |
*/ | |
-#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } | |
+#define DEFAULT_MAX_ACCELERATION { 400, 400, 100, 2000 } | |
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 | |
#if ENABLED(LIMITED_MAX_ACCEL_EDITING) | |
@@ -751,9 +751,9 @@ | |
* M204 R Retract Acceleration | |
* M204 T Travel Acceleration | |
*/ | |
-#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves | |
+#define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves | |
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts | |
-#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves | |
+#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves | |
/** | |
* Default Jerk limits (mm/s) | |
@@ -765,9 +765,9 @@ | |
*/ | |
//#define CLASSIC_JERK | |
#if ENABLED(CLASSIC_JERK) | |
- #define DEFAULT_XJERK 10.0 | |
- #define DEFAULT_YJERK 10.0 | |
- #define DEFAULT_ZJERK 0.3 | |
+ #define DEFAULT_XJERK 3.0 | |
+ #define DEFAULT_YJERK 3.0 | |
+ #define DEFAULT_ZJERK 0.2 | |
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 | |
#if ENABLED(LIMITED_JERK_EDITING) | |
@@ -785,7 +785,7 @@ | |
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html | |
*/ | |
#if DISABLED(CLASSIC_JERK) | |
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge | |
+ #define JUNCTION_DEVIATION_MM 0.01 // (mm) Distance from real junction edge | |
#endif | |
/** | |
@@ -796,7 +796,7 @@ | |
* | |
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained | |
*/ | |
-//#define S_CURVE_ACCELERATION | |
+#define S_CURVE_ACCELERATION | |
//=========================================================================== | |
//============================= Z Probe Options ============================= | |
@@ -1075,11 +1075,11 @@ | |
#if ENABLED(MIN_SOFTWARE_ENDSTOPS) | |
#define MIN_SOFTWARE_ENDSTOP_X | |
#define MIN_SOFTWARE_ENDSTOP_Y | |
- #define MIN_SOFTWARE_ENDSTOP_Z | |
+ //#define MIN_SOFTWARE_ENDSTOP_Z | |
#endif | |
// Max software endstops constrain movement within maximum coordinate bounds | |
-#define MAX_SOFTWARE_ENDSTOPS | |
+//#define MAX_SOFTWARE_ENDSTOPS | |
#if ENABLED(MAX_SOFTWARE_ENDSTOPS) | |
#define MAX_SOFTWARE_ENDSTOP_X | |
#define MAX_SOFTWARE_ENDSTOP_Y | |
@@ -1087,7 +1087,7 @@ | |
#endif | |
#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) | |
- //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD | |
+ #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD | |
#endif | |
/** | |
@@ -1321,8 +1321,8 @@ | |
#endif | |
// Homing speeds (mm/m) | |
-#define HOMING_FEEDRATE_XY (50*60) | |
-#define HOMING_FEEDRATE_Z (4*60) | |
+#define HOMING_FEEDRATE_XY (30*60) | |
+#define HOMING_FEEDRATE_Z (3*60) | |
// Validate that endstops are triggered on homing moves | |
#define VALIDATE_HOMING_ENDSTOPS | |
@@ -1399,7 +1399,7 @@ | |
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) | |
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) | |
*/ | |
-//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
+#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! | |
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. | |
#if ENABLED(EEPROM_SETTINGS) | |
@@ -1616,7 +1616,7 @@ | |
* you must uncomment the following option or it won't work. | |
* | |
*/ | |
-//#define SDSUPPORT | |
+#define SDSUPPORT | |
/** | |
* SD CARD: SPI SPEED | |
@@ -1673,7 +1673,7 @@ | |
// | |
// Set this option if CLOCKWISE causes values to DECREASE | |
// | |
-//#define REVERSE_ENCODER_DIRECTION | |
+#define REVERSE_ENCODER_DIRECTION | |
// | |
// This option reverses the encoder direction for navigating LCD menus. | |
@@ -1867,7 +1867,9 @@ | |
// RepRapDiscount FULL GRAPHIC Smart Controller | |
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller | |
// | |
-//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER | |
+#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER | |
+#define ST7920_DELAY_2 DELAY_NS(250) | |
+#define ST7920_DELAY_3 DELAY_NS(250) | |
// | |
// ReprapWorld Graphical LCD | |
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h | |
index c4aa7ce..15009b3 100644 | |
--- a/Marlin/Configuration_adv.h | |
+++ b/Marlin/Configuration_adv.h | |
@@ -420,20 +420,20 @@ | |
* in X2. Dual endstop offsets can be set at runtime with 'M666 X<offset> Y<offset> Z<offset>'. | |
*/ | |
-//#define X_DUAL_STEPPER_DRIVERS | |
+#define X_DUAL_STEPPER_DRIVERS | |
#if ENABLED(X_DUAL_STEPPER_DRIVERS) | |
#define INVERT_X2_VS_X_DIR true // Set 'true' if X motors should rotate in opposite directions | |
- //#define X_DUAL_ENDSTOPS | |
+ #define X_DUAL_ENDSTOPS | |
#if ENABLED(X_DUAL_ENDSTOPS) | |
#define X2_USE_ENDSTOP _XMAX_ | |
#define X_DUAL_ENDSTOPS_ADJUSTMENT 0 | |
#endif | |
#endif | |
-//#define Y_DUAL_STEPPER_DRIVERS | |
+#define Y_DUAL_STEPPER_DRIVERS | |
#if ENABLED(Y_DUAL_STEPPER_DRIVERS) | |
#define INVERT_Y2_VS_Y_DIR true // Set 'true' if Y motors should rotate in opposite directions | |
- //#define Y_DUAL_ENDSTOPS | |
+ #define Y_DUAL_ENDSTOPS | |
#if ENABLED(Y_DUAL_ENDSTOPS) | |
#define Y2_USE_ENDSTOP _YMAX_ | |
#define Y_DUAL_ENDSTOPS_ADJUSTMENT 0 | |
@@ -516,10 +516,10 @@ | |
// @section homing | |
// Homing hits each endstop, retracts by these distances, then does a slower bump. | |
-#define X_HOME_BUMP_MM 5 | |
-#define Y_HOME_BUMP_MM 5 | |
-#define Z_HOME_BUMP_MM 2 | |
-#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) | |
+#define X_HOME_BUMP_MM 7 | |
+#define Y_HOME_BUMP_MM 7 | |
+#define Z_HOME_BUMP_MM 3 | |
+#define HOMING_BUMP_DIVISOR { 4, 4, 5 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) | |
//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially | |
//#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing | |
@@ -635,7 +635,7 @@ | |
// Default stepper release if idle. Set to 0 to deactivate. | |
// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true. | |
// Time can be set by M18 and M84. | |
-#define DEFAULT_STEPPER_DEACTIVE_TIME 120 | |
+#define DEFAULT_STEPPER_DEACTIVE_TIME 1200 | |
#define DISABLE_INACTIVE_X true | |
#define DISABLE_INACTIVE_Y true | |
#define DISABLE_INACTIVE_Z true // Set to false if the nozzle will fall down on your printed part when print has finished. | |
@@ -754,7 +754,7 @@ | |
* vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the | |
* lowest stepping frequencies. | |
*/ | |
-//#define ADAPTIVE_STEP_SMOOTHING | |
+#define ADAPTIVE_STEP_SMOOTHING | |
/** | |
* Custom Microstepping | |
@@ -824,7 +824,7 @@ | |
// @section lcd | |
#if EITHER(ULTIPANEL, EXTENSIBLE_UI) | |
- #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel | |
+ #define MANUAL_FEEDRATE { 30*60, 30*60, 3*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel | |
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm) | |
#if ENABLED(ULTIPANEL) | |
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" | |
@@ -883,7 +883,7 @@ | |
//#define LCD_DECIMAL_SMALL_XY | |
// The timeout (in ms) to return to the status screen from sub-menus | |
-//#define LCD_TIMEOUT_TO_STATUS 15000 | |
+#define LCD_TIMEOUT_TO_STATUS 45000 | |
// Add an 'M73' G-code to set the current percentage | |
//#define LCD_SET_PROGRESS_MANUALLY | |
@@ -908,7 +908,7 @@ | |
// Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). | |
#define SD_DETECT_INVERTED | |
- #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished | |
+ #define SD_FINISHED_STEPPERRELEASE false // Disable steppers when SD Print is finished | |
#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place. | |
// Reverse SD sort to show "more recent" files first, according to the card's FAT. | |
@@ -919,7 +919,7 @@ | |
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files | |
- #define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27") | |
+ //#define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27") | |
/** | |
* Continue after Power-Loss (Creality3D) | |
@@ -1405,11 +1405,11 @@ | |
// | |
#define ARC_SUPPORT // Disable this feature to save ~3226 bytes | |
#if ENABLED(ARC_SUPPORT) | |
- #define MM_PER_ARC_SEGMENT 1 // Length of each arc segment | |
+ #define MM_PER_ARC_SEGMENT .3 // Length of each arc segment | |
#define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle | |
#define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections | |
- //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles | |
- //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes | |
+ #define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles | |
+ #define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes | |
#endif | |
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. | |
@@ -2397,7 +2397,7 @@ | |
* Enables G53 and G54-G59.3 commands to select coordinate systems | |
* and G92.1 to reset the workspace to native machine space. | |
*/ | |
-//#define CNC_COORDINATE_SYSTEMS | |
+#define CNC_COORDINATE_SYSTEMS | |
/** | |
* Auto-report temperatures with M155 S<seconds> | |
@@ -2462,7 +2462,7 @@ | |
* High feedrates may cause ringing and harm print quality. | |
*/ | |
//#define PAREN_COMMENTS // Support for parentheses-delimited comments | |
-//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. | |
+#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. | |
// Enable and set a (default) feedrate for all G0 moves | |
//#define G0_FEEDRATE 3000 // (mm/m) | |
@@ -2494,25 +2494,25 @@ | |
*/ | |
//#define CUSTOM_USER_MENUS | |
#if ENABLED(CUSTOM_USER_MENUS) | |
- //#define CUSTOM_USER_MENU_TITLE "Custom Commands" | |
+ #define CUSTOM_USER_MENU_TITLE "Custom Commands" | |
#define USER_SCRIPT_DONE "M117 User Script Done" | |
#define USER_SCRIPT_AUDIBLE_FEEDBACK | |
//#define USER_SCRIPT_RETURN // Return to status screen after a script | |
- #define USER_DESC_1 "Home & UBL Info" | |
- #define USER_GCODE_1 "G28\nG29 W" | |
+ #define USER_DESC_1 "Reset All Coordinates" | |
+ #define USER_GCODE_1 "G92 X0 Y0 Z0" | |
- #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL | |
- #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) | |
+ #define USER_DESC_2 "Home Z Axis" | |
+ #define USER_GCODE_2 "G28 Z" | |
- #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL | |
- #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) | |
+ #define USER_DESC_3 "Home X&Y" | |
+ #define USER_GCODE_3 "G28 X Y" | |
- #define USER_DESC_4 "Heat Bed/Home/Level" | |
- #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" | |
+ //#define USER_DESC_4 "Heat Bed/Home/Level" | |
+ //#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" | |
- #define USER_DESC_5 "Home & Info" | |
- #define USER_GCODE_5 "G28\nM503" | |
+ //#define USER_DESC_5 "Home & Info" | |
+ //#define USER_GCODE_5 "G28\nM503" | |
#endif | |
/** | |
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h | |
index 678f625..73585ed 100644 | |
--- a/Marlin/src/inc/Version.h | |
+++ b/Marlin/src/inc/Version.h | |
@@ -38,7 +38,7 @@ | |
/** | |
* Marlin release version identifier | |
*/ | |
- #define SHORT_BUILD_VERSION "bugfix-2.0.x" | |
+ #define SHORT_BUILD_VERSION "413 bugfix-2.0.x" | |
/** | |
* Verbose version identifier which should contain a reference to the location | |
-- | |
2.5.5 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment