Update Marlin_main

MarlinKimbra/Configuration.h

@@ -24,7 +24,8 @@
 #define STRING_URL "reprap.org"
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__     // build date and time
 #define STRING_CONFIG_H_AUTHOR "(none, default config)"   // Who made the changes.
-#define STRING_SPLASH "v" STRING_VERSION " - " STRING_URL // will be shown during bootup
+#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1
+//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2
 
 // SERIAL_PORT selects which serial port should be used for communication with the host.
 // This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -213,7 +214,7 @@
 // HEATER_BED_DUTY_CYCLE_DIVIDER intervals.
 //#define HEATER_BED_DUTY_CYCLE_DIVIDER 4
 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) HOTEND_WATTS
+// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all hotend) HOTEND_WATTS
 //#define HOTEND_WATTS (12.0*12.0/6.7)  //  P=I^2/R
 //#define BED_WATTS (12.0*12.0/1.1)     // P=I^2/R
 
@@ -240,8 +241,11 @@
 
 #endif // PIDTEMP
 
-//========================= Bed Temperature Control =========================
+//===========================================================================
+//============================= PID > Bed Temperature Control ===============
+//===========================================================================
 // Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis
+//
 // Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder.
 // If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz,
 // which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating.
@@ -250,16 +254,15 @@
 // shouldn't use bed PID until someone else verifies your hardware works.
 // If this is enabled, find your own PID constants below.
 //#define PIDTEMPBED
+//
 //#define BED_LIMIT_SWITCHING
 
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
 // all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis)
 // setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did,
 // so you shouldn't use it unless you are OK with PWM on your bed.  (see the comment on enabling PIDTEMPBED)
-// Limits duty cycle to bed
-#define MAX_BED_POWER 255 // 255 is full current
+#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
 
-// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
 #ifdef PIDTEMPBED
   // 120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
   // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of 0.15 (vs 0.1, 1, 10)
@@ -272,6 +275,7 @@
   //#define DEFAULT_bedKp 97.1
   //#define DEFAULT_bedKi 1.41
   //#define DEFAULT_bedKd 1675.16
+  // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
 #endif // PIDTEMPBED
 
 //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
@@ -283,7 +287,10 @@
 #define EXTRUDE_MINTEMP 170 // degC
 #define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
 
-/*================== Thermal Runaway Protection ==============================
+//===========================================================================
+//============================= Thermal Runaway Protection ==================
+//===========================================================================
+/*
 This is a feature to protect your printer from burn up in flames if it has
 a thermistor coming off place (this happened to a friend of mine recently and
 motivated me writing this feature).
@@ -318,7 +325,6 @@ your extruder heater takes 2 minutes to hit the target on heating.
 // Parameters for the bed heater
 //#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD 20 //in seconds
 //#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS 2 // in degree Celsius
-//===========================================================================
 
 
 
@@ -327,6 +333,9 @@ your extruder heater takes 2 minutes to hit the target on heating.
 //===========================================================================
 
 //============================== LCD and SD support =========================
+// Character based displays can have different extended charsets.
+//#define DISPLAY_CHARSET_HD44780_JAPAN     // "ääööüüß23°"
+//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
 //#define ULTRA_LCD  //general LCD support, also 16x2
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console

MarlinKimbra/Marlin_main.cpp

@@ -6293,7 +6293,7 @@ void pause()
 {
   #if defined(PAUSE_PIN) && PAUSE_PIN > -1
     paused=true;
-    enquecommand("M600 X0 Z+5");
+    enquecommand("M600");
     enquecommand("G4 P0");
     enquecommand("G4 P0");
     enquecommand("G4 P0");

MarlinKimbra/pins.h

@@ -4379,32 +4379,32 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 /****************************************************************************************/
 
 #ifdef MKR4
-#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS==1)     // Use this for one driver and two extruder
-#define E0E1_CHOICE_PIN    5
-#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS==2)   // Use this for two driver and 3 extruder
-#define E0E2_CHOICE_PIN    5
-#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS==2)   // Use this for two driver and 4 extruder
-#define E0E2_CHOICE_PIN    5
-#define E1E3_CHOICE_PIN    6
-#endif // END EXTRUDERS
-#endif // END MKR4
+  #if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS==1)     // Use this for one driver and two extruder
+    #define E0E1_CHOICE_PIN    5
+  #elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS==2)   // Use this for two driver and 3 extruder
+    #define E0E2_CHOICE_PIN    5
+  #elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS==2)   // Use this for two driver and 4 extruder
+    #define E0E2_CHOICE_PIN    5
+    #define E1E3_CHOICE_PIN    6
+  #endif //EXTRUDERS
+#endif //MKR4
 
 #ifdef NPR2
-#ifdef DELTA
-#define E_MIN_PIN          3  // Use pin ORIG_X_MIN_PIN
-#else  // NO DELTA
-#define ORIG_Z_MAX_PIN          -1 // Use pin ORIG_Z_MAX_PIN
-#define E_MIN_PIN          19
-#endif // END DELTA
-#endif // END NPR2
+  #ifdef DELTA
+    #define E_MIN_PIN          3  // Use pin ORIG_X_MIN_PIN
+  #else  // NO DELTA
+    #define ORIG_Z_MAX_PIN          -1 // Use pin ORIG_Z_MAX_PIN
+    #define E_MIN_PIN          19
+  #endif //DELTA
+#endif //NPR2
 
 #ifdef LASERBEAM
-#define LASER_PWR_PIN	42
-#define LASER_TTL_PIN	44
+  #define LASER_PWR_PIN	42
+  #define LASER_TTL_PIN	44
 #endif
 
 #ifdef FILAMENT_END_SWITCH
-#define PAUSE_PIN          5
+  #define PAUSE_PIN          5
 #endif
 /****************************************************************************************/
 
@@ -4465,20 +4465,20 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #endif
 
 #ifdef DISABLE_MAX_ENDSTOPS
-#define ORIG_X_MAX_PIN          -1
-#define ORIG_Y_MAX_PIN          -1
-#define ORIG_Z_MAX_PIN          -1
+  #define ORIG_X_MAX_PIN          -1
+  #define ORIG_Y_MAX_PIN          -1
+  #define ORIG_Z_MAX_PIN          -1
 #endif
 
 #ifdef DISABLE_MIN_ENDSTOPS
-#define ORIG_X_MIN_PIN          -1
-#define ORIG_Y_MIN_PIN          -1
-#define ORIG_Z_MIN_PIN          -1
+  #define ORIG_X_MIN_PIN          -1
+  #define ORIG_Y_MIN_PIN          -1
+  #define ORIG_Z_MIN_PIN          -1
 #endif
 
 #ifdef DELTA
-#define ORIG_X_MIN_PIN          -1
-#define ORIG_Y_MIN_PIN          -1
+  #define ORIG_X_MIN_PIN          -1
+  #define ORIG_Y_MIN_PIN          -1
 #endif
 
 
@@ -4507,17 +4507,17 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #define E0_ENABLE_PIN ORIG_E0_ENABLE_PIN
 
 #if DRIVER_EXTRUDERS > 1
-#define E1_STEP_PIN ORIG_E1_STEP_PIN
-#define E1_DIR_PIN ORIG_E1_DIR_PIN
-#define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN
+  #define E1_STEP_PIN ORIG_E1_STEP_PIN
+  #define E1_DIR_PIN ORIG_E1_DIR_PIN
+  #define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN
 #elif DRIVER_EXTRUDERS > 2
-#define E2_STEP_PIN ORIG_E2_STEP_PIN
-#define E2_DIR_PIN ORIG_E2_DIR_PIN
-#define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN
+  #define E2_STEP_PIN ORIG_E2_STEP_PIN
+  #define E2_DIR_PIN ORIG_E2_DIR_PIN
+  #define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN
 #elif DRIVER_EXTRUDERS > 3
-#define E3_STEP_PIN ORIG_E3_STEP_PIN
-#define E3_DIR_PIN ORIG_E3_DIR_PIN
-#define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN
+  #define E3_STEP_PIN ORIG_E3_STEP_PIN
+  #define E3_DIR_PIN ORIG_E3_DIR_PIN
+  #define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN
 #endif
 
 #define FAN_PIN ORIG_FAN_PIN