Merge branch 'master' into 12864-full

Marlin/AnycubicTFT.cpp

@@ -144,127 +144,81 @@ void AnycubicTFTClass::KillTFT()
 }
 
 
-void AnycubicTFTClass::StartPrint() {
-  // which kind of starting behaviour is needed?
-  switch (ai3m_pause_state) {
-    case 0:
-      // no pause, just a regular start
-      starttime=millis();
-      card.startFileprint();
-      TFTstate=ANYCUBIC_TFT_STATE_SDPRINT;
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-        SERIAL_EOL();
-        SERIAL_ECHOLNPGM("DEBUG: Regular Start");
-      #endif
-      break;
-    case 1:
-      // regular sd pause
+void AnycubicTFTClass::StartPrint(){
+  // are we resuming from a pause?
+  if (TFTstate==ANYCUBIC_TFT_STATE_SDPAUSE) {
+    // was that a regular pause?
+    if((!PausedByRunout) && (!PausedByFilamentChange) && (!PausedByNozzleTimeout)) {
       enqueue_and_echo_commands_P(PSTR("M24")); // unpark nozzle
       #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-        SERIAL_EOL();
         SERIAL_ECHOLNPGM("DEBUG: M24 Resume from regular pause");
       #endif
       IsParked=false; // remove parked flag
-      starttime=millis();
-      card.startFileprint(); // resume regularly
-      TFTstate=ANYCUBIC_TFT_STATE_SDPRINT;
-      ai3m_pause_state = 0;
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-        SERIAL_EOL();
-      #endif
-      break;
-    case 2:
-      // paused by M600
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-        SERIAL_EOL();
-        SERIAL_ECHOLNPGM("DEBUG: Start M108 routine");
-      #endif
-      FilamentChangeResume(); // enter display M108 routine
-      ai3m_pause_state = 0; // clear flag
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOLNPGM("DEBUG: Filament Change Flag cleared");
-      #endif
-      break;
-    case 3:
-      // paused by filament runout
+    }
+  }
+  starttime=millis();
+  #ifdef SDSUPPORT
+    // was that a regular pause or are we starting a print?
+    if((!PausedByRunout) && (!PausedByFilamentChange) && (!PausedByNozzleTimeout)) {
+      card.startFileprint(); // start or resume regularly
+    }
+    // resuming from a pause that was caused by filament runout
+    else if((PausedByRunout) && (!PausedByFilamentChange) && (!PausedByNozzleTimeout)) {
       enqueue_and_echo_commands_P(PSTR("M24")); // unpark nozzle and resume
       #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: M24 Resume from Filament Runout");
       #endif
-      IsParked = false; // clear flags
-      ai3m_pause_state = 0;
+      PausedByRunout = IsParked = false; // clear flags
       #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: Filament Pause Flag cleared");
       #endif
-      break;
-    case 4:
-      // nozzle was timed out before (M600), do not enter printing state yet
-      TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
+    }
+    // was M600 called and the nozzle is not timed out?
+    else if((!PausedByRunout) && (PausedByFilamentChange) && (!PausedByNozzleTimeout)) {
       #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOLNPGM("DEBUG: Set Pause again because of timeout");
+        SERIAL_ECHOLNPGM("DEBUG: Start M108 routine");
       #endif
+      FilamentChangeResume(); // enter display M108 routine
+      PausedByFilamentChange=false; // clear flag
+      #ifdef ANYCUBIC_TFT_DEBUG
+        SERIAL_ECHOLNPGM("DEBUG: Filament Change Flag cleared");
+      #endif
+    }
+  #endif
+  if (PausedByNozzleTimeout) {
+    // nozzle was timed out before, do not enter printing state yet
+    TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
+    #ifdef ANYCUBIC_TFT_DEBUG
+      SERIAL_ECHOLNPGM("DEBUG: Set Pause again because of timeout");
+    #endif
 
-      // clear the timeout flag to ensure the print continues on the
-      // next push of CONTINUE
-      ai3m_pause_state = 2;
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOLNPGM("DEBUG: Nozzle timeout flag cleared");
-      #endif
-      break;
-    case 5:
-      // nozzle was timed out before (runout), do not enter printing state yet
-      TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOLNPGM("DEBUG: Set Pause again because of timeout");
-      #endif
-
-      // clear the timeout flag to ensure the print continues on the
-      // next push of CONTINUE
-      ai3m_pause_state = 3;
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOLNPGM("DEBUG: Nozzle timeout flag cleared");
-      #endif
-      break;
-    default:
-      break;
+    // clear the timeout flag to ensure the print continues on the
+    // next push of CONTINUE
+    PausedByNozzleTimeout=false;
+    #ifdef ANYCUBIC_TFT_DEBUG
+      SERIAL_ECHOLNPGM("DEBUG: Nozzle timeout flag cleared");
+    #endif
+  } else {
+    // regular resume/start or all specific resume routines are done,
+    // set printing state again
+    TFTstate=ANYCUBIC_TFT_STATE_SDPRINT;
   }
 }
 
-void AnycubicTFTClass::PausePrint() {
+void AnycubicTFTClass::PausePrint(){
   #ifdef SDSUPPORT
-    if(ai3m_pause_state < 2) { // is this a regular pause?
+    if((!PausedByRunout)) { // is this a regular pause?
       card.pauseSDPrint(); // pause print regularly
       #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-        SERIAL_EOL();
         SERIAL_ECHOLNPGM("DEBUG: Regular Pause");
       #endif
     } else { // pause caused by filament runout
       #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: Filament Runout Pause");
       #endif
-      // filament runout, retract and beep
-      enqueue_and_echo_commands_P(PSTR("G91")); // relative mode
-      enqueue_and_echo_commands_P(PSTR("G1 E-3 F1800")); // retract 3mm
-      enqueue_and_echo_commands_P(PSTR("G90")); // absolute mode
-      buzzer.tone(200, 1567);
-      buzzer.tone(200, 1174);
-      buzzer.tone(200, 1567);
-      buzzer.tone(200, 1174);
-      buzzer.tone(2000, 1567);
-      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOLNPGM("DEBUG: Filament runout - Retract, beep and park.");
-      #endif
       enqueue_and_echo_commands_P(PSTR("M25")); // pause print and park nozzle
-      ai3m_pause_state = 3;
       #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: M25 sent, parking nozzle");
-        SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-        SERIAL_EOL();
       #endif
       IsParked = true;
       // show filament runout prompt on screen
@@ -276,6 +230,24 @@ void AnycubicTFTClass::PausePrint() {
     }
   #endif
   TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
+  #ifdef ANYCUBIC_FILAMENT_RUNOUT_SENSOR
+    // regular pause
+    if(FilamentTestStatus) {
+      ANYCUBIC_SERIAL_PROTOCOLPGM("J05");
+      ANYCUBIC_SERIAL_ENTER();
+      #ifdef ANYCUBIC_TFT_DEBUG
+        SERIAL_ECHOLNPGM("TFT Serial Debug: SD print paused... J05");
+      #endif
+    // pause because of filament sensor
+    } else {
+      // show filament runout prompt on screen
+      ANYCUBIC_SERIAL_PROTOCOLPGM("J23");
+      ANYCUBIC_SERIAL_ENTER();
+      #ifdef ANYCUBIC_TFT_DEBUG
+        SERIAL_ECHOLNPGM("TFT Serial Debug: Filament runout while printing... J23");
+      #endif
+    }
+  #endif
 }
 
 void AnycubicTFTClass::StopPrint(){
@@ -287,18 +259,12 @@ void AnycubicTFTClass::StopPrint(){
   #endif
   print_job_timer.stop();
   thermalManager.disable_all_heaters();
-  // we are not parked yet, do it in the display state routine
-  IsParked = false;
+  IsParked = false;  // we are not parked yet, do it in the display state routine
   // turn off fan, cancel any heatups and set display state
   #if FAN_COUNT > 0
     for (uint8_t i = 0; i < FAN_COUNT; i++) fanSpeeds[i] = 0;
   #endif
   wait_for_heatup=false;
-  ai3m_pause_state = 0;
-  #ifdef ANYCUBIC_TFT_DEBUG
-    SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-    SERIAL_EOL();
-  #endif
   TFTstate=ANYCUBIC_TFT_STATE_SDSTOP_REQ;
 }
 
@@ -323,11 +289,7 @@ void AnycubicTFTClass::FilamentChangeResume(){
 void AnycubicTFTClass::FilamentChangePause(){
   // set filament change flag to ensure the M108 routine
   // gets used when the user hits CONTINUE
-  ai3m_pause_state = 2;
-  #ifdef ANYCUBIC_TFT_DEBUG
-    SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-    SERIAL_EOL();
-  #endif
+  PausedByFilamentChange=true;
 
   // call M600 and set display state to paused
   enqueue_and_echo_commands_P(PSTR("M600"));
@@ -351,19 +313,11 @@ void AnycubicTFTClass::ReheatNozzle(){
   #ifdef ANYCUBIC_TFT_DEBUG
     SERIAL_ECHOLNPGM("DEBUG: Clear flags");
   #endif
+  nozzle_timed_out = false;
 
   // clear waiting flags
-  nozzle_timed_out = false;
   wait_for_user = false;
   wait_for_heatup = false;
-  // lower the pause flag by two to restore initial pause condition
-  if (ai3m_pause_state > 3) {
-  ai3m_pause_state -= 2;
-  #ifdef ANYCUBIC_TFT_DEBUG
-    SERIAL_ECHOPAIR(" DEBUG: NTO done, AI3M Pause State: ", ai3m_pause_state);
-    SERIAL_EOL();
-  #endif
-  }
 
   // set pause state to show CONTINUE button again
   TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
@@ -385,11 +339,6 @@ void AnycubicTFTClass::ParkAfterStop(){
   }
   enqueue_and_echo_commands_P(PSTR("M84")); // disable stepper motors
   enqueue_and_echo_commands_P(PSTR("M27")); // force report of SD status
-  ai3m_pause_state = 0;
-  #ifdef ANYCUBIC_TFT_DEBUG
-    SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-    SERIAL_EOL();
-  #endif
 }
 
 float AnycubicTFTClass::CodeValue()
@@ -409,7 +358,7 @@ void AnycubicTFTClass::HandleSpecialMenu()
     SpecialMenu=true;
   } else if (strcmp(SelectedDirectory, "<auto tune hotend pid>")==0) {
     SERIAL_PROTOCOLLNPGM("Special Menu: Auto Tune Hotend PID");
-    enqueue_and_echo_commands_P(PSTR("M106 S204\nM303 E0 S210 C15 U1"));
+    enqueue_and_echo_commands_P(PSTR("M106 S204\nM303 E0 S210 C6 U1"));
   } else if (strcmp(SelectedDirectory, "<auto tune hotbed pid>")==0) {
     SERIAL_PROTOCOLLNPGM("Special Menu: Auto Tune Hotbed Pid");
     enqueue_and_echo_commands_P(PSTR("M303 E-1 S60 C6 U1"));
@@ -634,7 +583,7 @@ void AnycubicTFTClass::StateHandler()
           if (card.isFileOpen()) {
             // File is still open --> paused
             TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE;
-          } else if ((!card.isFileOpen()) && (ai3m_pause_state == 0)) {
+          } else {
             // File is closed --> stopped
             TFTstate=ANYCUBIC_TFT_STATE_IDLE;
             ANYCUBIC_SERIAL_PROTOCOLPGM("J14");// J14 print done
@@ -642,11 +591,6 @@ void AnycubicTFTClass::StateHandler()
             #ifdef ANYCUBIC_TFT_DEBUG
               SERIAL_ECHOLNPGM("TFT Serial Debug: SD print done... J14");
             #endif
-            ai3m_pause_state = 0;
-            #ifdef ANYCUBIC_TFT_DEBUG
-              SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-              SERIAL_EOL();
-            #endif
           }
         }
       #endif
@@ -667,13 +611,9 @@ void AnycubicTFTClass::StateHandler()
       #ifdef SDSUPPORT
         if((!card.sdprinting) && (!planner.movesplanned())) {
           // We have to wait until the sd card printing has been settled
-          if(ai3m_pause_state < 2) {
-
+          if((!PausedByRunout) && (!PausedByFilamentChange) && (!PausedByNozzleTimeout)) {
             // no flags, this is a regular pause.
-            ai3m_pause_state = 1;
             #ifdef ANYCUBIC_TFT_DEBUG
-              SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-              SERIAL_EOL();
               SERIAL_ECHOLNPGM("DEBUG: Regular Pause requested");
             #endif
             if(!IsParked) {
@@ -681,6 +621,19 @@ void AnycubicTFTClass::StateHandler()
               enqueue_and_echo_commands_P(PSTR("M125 L2"));
               IsParked = true;
             }
+          } else if((PausedByRunout)) {
+            // filament runout, retract and beep
+            enqueue_and_echo_commands_P(PSTR("G91")); // relative mode
+            enqueue_and_echo_commands_P(PSTR("G1 E-3 F1800")); // retract 3mm
+            enqueue_and_echo_commands_P(PSTR("G90")); // absolute mode
+            buzzer.tone(200, 1567);
+            buzzer.tone(200, 1174);
+            buzzer.tone(200, 1567);
+            buzzer.tone(200, 1174);
+            buzzer.tone(2000, 1567);
+            #ifdef ANYCUBIC_TFT_DEBUG
+              SERIAL_ECHOLNPGM("DEBUG: Filament runout - Retract, beep and park.");
+            #endif
           }
           #ifdef ANYCUBIC_FILAMENT_RUNOUT_SENSOR
             if(FilamentTestStatus) {
@@ -706,11 +659,6 @@ void AnycubicTFTClass::StateHandler()
           #ifdef ANYCUBIC_TFT_DEBUG
             SERIAL_ECHOLNPGM("TFT Serial Debug: SD print stopped... J16");
           #endif
-          ai3m_pause_state = 0;
-          #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-            SERIAL_EOL();
-          #endif
         }
         // did we park the hotend already?
         if((!IsParked) && (!card.sdprinting) && (!planner.movesplanned())) {
@@ -754,10 +702,9 @@ void AnycubicTFTClass::FilamentRunout()
             SERIAL_ECHOLNPGM("DEBUG: 3000ms delay done");
           #endif
           if((card.sdprinting==true)) {
-            ai3m_pause_state = 3; // set runout pause flag
+            PausedByRunout=true; // set runout pause flag
             #ifdef ANYCUBIC_TFT_DEBUG
-              SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-              SERIAL_EOL();
+              SERIAL_ECHOLNPGM("DEBUG: Filament Pause Flag set");
             #endif
             PausePrint();
           } else if((card.sdprinting==false)) {
@@ -930,11 +877,6 @@ void AnycubicTFTClass::GetCommandFromTFT()
               }
               else
               {
-                ai3m_pause_state = 0;
-                #ifdef ANYCUBIC_TFT_DEBUG
-                  SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-                  SERIAL_EOL();
-                #endif
                 StopPrint();
               }
             #endif
@@ -964,11 +906,6 @@ void AnycubicTFTClass::GetCommandFromTFT()
                 ANYCUBIC_SERIAL_PROTOCOLPGM("J16");
                 ANYCUBIC_SERIAL_ENTER();
                 TFTstate=ANYCUBIC_TFT_STATE_IDLE;
-                ai3m_pause_state = 0;
-                #ifdef ANYCUBIC_TFT_DEBUG
-                  SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-                  SERIAL_EOL();
-                #endif
               }
               #endif
             break;
@@ -1012,11 +949,6 @@ void AnycubicTFTClass::GetCommandFromTFT()
             #ifdef SDSUPPORT
               if((!planner.movesplanned()) && (TFTstate!=ANYCUBIC_TFT_STATE_SDPAUSE) && (TFTstate!=ANYCUBIC_TFT_STATE_SDOUTAGE) && (card.isFileOpen()))
               {
-                ai3m_pause_state = 0;
-                #ifdef ANYCUBIC_TFT_DEBUG
-                  SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
-                  SERIAL_EOL();
-                #endif
                 StartPrint();
                 IsParked = false;
                 ANYCUBIC_SERIAL_PROTOCOLPGM("J04"); // J04 Starting Print

Marlin/AnycubicTFT.h

@@ -56,18 +56,9 @@ public:
   void FilamentRunout();
   void KillTFT();
   char TFTstate=ANYCUBIC_TFT_STATE_IDLE;
-
-  /**
-  * Anycubic TFT pause states:
-  *
-  * 0 - printing / stopped
-  * 1 - regular pause
-  * 2 - M600 pause
-  * 3 - filament runout pause
-  * 4 - nozzle timeout on M600
-  * 5 - nozzle timeout on filament runout
-  */
-  uint8_t ai3m_pause_state = 0;
+  bool PausedByRunout=false;
+  bool PausedByFilamentChange=false;
+  bool PausedByNozzleTimeout=false;
 
 private:
   char TFTcmdbuffer[TFTBUFSIZE][TFT_MAX_CMD_SIZE];

Marlin/Conditionals_post.h

@@ -190,17 +190,11 @@
  * Safe Homing Options
  */
 #if ENABLED(Z_SAFE_HOMING)
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    // Home close to center so grid points have z heights very close to 0
-    #define _SAFE_POINT(A) (((GRID_MAX_POINTS_##A) / 2) * (A##_BED_SIZE - 2 * (MESH_INSET)) / (GRID_MAX_POINTS_##A - 1) + MESH_INSET)
-  #else
-    #define _SAFE_POINT(A) A##_CENTER
-  #endif
   #ifndef Z_SAFE_HOMING_X_POINT
-    #define Z_SAFE_HOMING_X_POINT _SAFE_POINT(X)
+    #define Z_SAFE_HOMING_X_POINT X_CENTER
   #endif
   #ifndef Z_SAFE_HOMING_Y_POINT
-    #define Z_SAFE_HOMING_Y_POINT _SAFE_POINT(Y)
+    #define Z_SAFE_HOMING_Y_POINT Y_CENTER
   #endif
   #define X_TILT_FULCRUM Z_SAFE_HOMING_X_POINT
   #define Y_TILT_FULCRUM Z_SAFE_HOMING_Y_POINT

Marlin/Configuration.h

@@ -1,3 +1,5 @@
+#include <U8glib.h>
+
 /**
  * Marlin 3D Printer Firmware
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
@@ -238,7 +240,7 @@
  *
  * :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' }
  */
-#define POWER_SUPPLY 0
+//#define POWER_SUPPLY 1
 
 #if POWER_SUPPLY > 0
   // Enable this option to leave the PSU off at startup.
@@ -380,9 +382,9 @@
   // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
 
   // i3 Mega stock v5 hotend, 40W heater cartridge (3.6Ω @ 22°C)
-  #define  DEFAULT_Kp 15.94
-  #define  DEFAULT_Ki 1.17
-  #define  DEFAULT_Kd 54.19
+  #define  DEFAULT_Kp 18.58
+  #define  DEFAULT_Ki 1.38
+  #define  DEFAULT_Kd 62.40
 
   // Ultimaker
   //#define  DEFAULT_Kp 22.2
@@ -437,9 +439,9 @@
   //#define PID_BED_DEBUG // Sends debug data to the serial port.
 
   //Anycubic i3 Mega Ultrabase (0.9Ω @ 22°C)
-  #define DEFAULT_bedKp 251.78
-  #define DEFAULT_bedKi 49.57
-  #define DEFAULT_bedKd 319.73
+  #define DEFAULT_bedKp 187.45
+  #define DEFAULT_bedKi 35.75
+  #define DEFAULT_bedKd 245.71
 
   //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
   //from pidautotune
@@ -629,7 +631,7 @@
  * Override with M201
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
  */
-#define DEFAULT_MAX_ACCELERATION      { 3000, 2000,  60, 10000 }
+#define DEFAULT_MAX_ACCELERATION      { 2000, 1200,  60, 10000 }
 
 /**
  * Default Acceleration (change/s) change = mm/s
@@ -639,9 +641,9 @@
  *   M204 R    Retract Acceleration
  *   M204 T    Travel Acceleration
  */
-#define DEFAULT_ACCELERATION          1500    // X, Y, Z and E acceleration for printing moves
+#define DEFAULT_ACCELERATION          1200    // 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   1500    // X, Y, Z acceleration for travel (non printing) moves
 
 /**
  * Default Jerk (mm/s)
@@ -651,8 +653,8 @@
  * When changing speed and direction, if the difference is less than the
  * value set here, it may happen instantaneously.
  */
-#define DEFAULT_XJERK                 10.0
-#define DEFAULT_YJERK                 10.0
+#define DEFAULT_XJERK                 8.0
+#define DEFAULT_YJERK                 8.0
 #define DEFAULT_ZJERK                  0.4
 #define DEFAULT_EJERK                  5.0
 
@@ -1108,7 +1110,7 @@
  * Add a bed leveling sub-menu for ABL or MBL.
  * Include a guided procedure if manual probing is enabled.
  */
-//#define LCD_BED_LEVELING
+#define LCD_BED_LEVELING
 
 #if ENABLED(LCD_BED_LEVELING)
   #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
@@ -1245,7 +1247,7 @@
 //
 #define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
 #define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
-#define BUSY_WHILE_HEATING            // Some hosts require "busy" messages even during heating
+//#define BUSY_WHILE_HEATING          // Some hosts require "busy" messages even during heating
 
 //
 // M100 Free Memory Watcher
@@ -1403,7 +1405,7 @@
  *
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'es_utf8':'Spanish (UTF8)', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', 'test':'TEST' }
  */
-//#define LCD_LANGUAGE en
+#define LCD_LANGUAGE en
 
 /**
  * LCD Character Set
@@ -1470,13 +1472,13 @@
 // This option overrides the default number of encoder pulses needed to
 // produce one step. Should be increased for high-resolution encoders.
 //
-//#define ENCODER_PULSES_PER_STEP 4
+#define ENCODER_PULSES_PER_STEP 4
 
 //
 // Use this option to override the number of step signals required to
 // move between next/prev menu items.
 //
-//#define ENCODER_STEPS_PER_MENU_ITEM 1
+#define ENCODER_STEPS_PER_MENU_ITEM 1
 
 /**
  * Encoder Direction Options
@@ -1681,7 +1683,7 @@
 // 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
 
 //
 // ReprapWorld Graphical LCD
@@ -1834,13 +1836,13 @@
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
 // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
 // is too low, you should also increment SOFT_PWM_SCALE.
-//#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM
 
 // Incrementing this by 1 will double the software PWM frequency,
 // affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
 // However, control resolution will be halved for each increment;
 // at zero value, there are 128 effective control positions.
-#define SOFT_PWM_SCALE 0
+#define SOFT_PWM_SCALE 2
 
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
 // be used to mitigate the associated resolution loss. If enabled,
@@ -1949,20 +1951,6 @@
 // Only power servos during movement, otherwise leave off to prevent jitter
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
 
-/**
- * Select your version of the Trigorilla (RAMPS1.4) board here.
- *
- * 0 = Default Trigorilla
- * 1 = Newer Trigorilla v1.1 (first seen late 2018)
- *
- * The only major difference is a slight change on the servo pin mapping.
- * This setting only is relevant if you want to use BLtouch or similar
- * mods to be used via servo pins.
- * The new version is to be identified by a "TRIGORILLA1.1" lettering
- * on the upper left of the PCB silkscreen.
- */
-#define TRIGORILLA_VERSION 0
-
 // Enable Anycubic TFT
 #define ANYCUBIC_TFT_MODEL
 #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR

Marlin/Configuration_adv.h

@@ -1,4 +1,4 @@
-/**
+/**
  * Marlin 3D Printer Firmware
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
@@ -431,7 +431,7 @@
 // @section extras
 
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
-#define DEFAULT_MINSEGMENTTIME        20000
+#define DEFAULT_MINSEGMENTTIME        50000
 
 // If defined the movements slow down when the look ahead buffer is only half full
 #define SLOWDOWN
@@ -524,13 +524,13 @@
 // @section lcd
 
 // Include a page of printer information in the LCD Main Menu
-//#define LCD_INFO_MENU
+#define LCD_INFO_MENU
 
 // Scroll a longer status message into view
 //#define STATUS_MESSAGE_SCROLLING
 
 // On the Info Screen, display XY with one decimal place when possible
-//#define LCD_DECIMAL_SMALL_XY
+#define LCD_DECIMAL_SMALL_XY
 
 // The timeout (in ms) to return to the status screen from sub-menus
 //#define LCD_TIMEOUT_TO_STATUS 15000
@@ -879,8 +879,8 @@
 // @section serial
 
 // The ASCII buffer for serial input
-#define MAX_CMD_SIZE 128
-#define BUFSIZE 8
+#define MAX_CMD_SIZE 96
+#define BUFSIZE 4
 
 // Transmission to Host Buffer Size
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
@@ -889,13 +889,13 @@
 // For debug-echo: 128 bytes for the optimal speed.
 // Other output doesn't need to be that speedy.
 // :[0, 2, 4, 8, 16, 32, 64, 128, 256]
-#define TX_BUFFER_SIZE 4
+#define TX_BUFFER_SIZE 0
 
 // Host Receive Buffer Size
 // Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
 // To use flow control, set this buffer size to at least 1024 bytes.
 // :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048]
-#define RX_BUFFER_SIZE 256
+//#define RX_BUFFER_SIZE 32
 
 #if RX_BUFFER_SIZE >= 1024
   // Enable to have the controller send XON/XOFF control characters to

Marlin/Marlin_main.cpp

@@ -609,7 +609,13 @@ uint8_t target_extruder;
 #endif
 
 #if HAS_POWER_SWITCH
-  bool powersupply_on;
+  bool powersupply_on = (
+    #if ENABLED(PS_DEFAULT_OFF)
+      false
+    #else
+      true
+    #endif
+  );
   #if ENABLED(AUTO_POWER_CONTROL)
     #define PSU_ON()  powerManager.power_on()
     #define PSU_OFF() powerManager.power_off()
@@ -945,9 +951,9 @@ void setup_powerhold() {
   #endif
   #if HAS_POWER_SWITCH
     #if ENABLED(PS_DEFAULT_OFF)
-      powersupply_on = true;  PSU_OFF();
+      PSU_OFF();
     #else
-      powersupply_on = false; PSU_ON();
+      PSU_ON();
     #endif
   #endif
 }
@@ -7212,6 +7218,10 @@ inline void gcode_M17() {
    */
   static void wait_for_filament_reload(const int8_t max_beep_count=0) {
     nozzle_timed_out = false;
+    nozzle_timed_out = false;
+    #ifdef ANYCUBIC_TFT_MODEL
+      AnycubicTFT.PausedByNozzleTimeout = false;
+    #endif
 
     #if ENABLED(ULTIPANEL)
       lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INSERT);
@@ -7246,13 +7256,7 @@ inline void gcode_M17() {
       if (nozzle_timed_out) {
 
         #ifdef ANYCUBIC_TFT_MODEL
-          if (AnycubicTFT.ai3m_pause_state < 3) {
-            AnycubicTFT.ai3m_pause_state += 2;
-            #ifdef ANYCUBIC_TFT_DEBUG
-              SERIAL_ECHOPAIR(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTFT.ai3m_pause_state);
-              SERIAL_EOL();
-            #endif
-          }
+          AnycubicTFT.PausedByNozzleTimeout=true;
           #ifdef ANYCUBIC_TFT_DEBUG
             SERIAL_ECHOLNPGM("DEBUG: Nozzle timeout flag set");
           #endif
@@ -7299,14 +7303,8 @@ inline void gcode_M17() {
 
         wait_for_user = true; // Wait for user to load filament
         nozzle_timed_out = false;
-        #ifdef ANYCUBIC_TFT_MODEL
-          if (AnycubicTFT.ai3m_pause_state > 3) {
-            AnycubicTFT.ai3m_pause_state -= 2;
-            #ifdef ANYCUBIC_TFT_DEBUG
-              SERIAL_ECHOPAIR(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTFT.ai3m_pause_state);
-              SERIAL_EOL();
-            #endif
-          }
+        #ifdef ANYCUBIC_TFT_DEBUG
+          AnycubicTFT.PausedByNozzleTimeout = false;
         #endif
 
         #if HAS_BUZZER
@@ -7343,13 +7341,7 @@ inline void gcode_M17() {
     // Re-enable the heaters if they timed out
     nozzle_timed_out = false;
     #ifdef ANYCUBIC_TFT_MODEL
-      if (AnycubicTFT.ai3m_pause_state > 3) {
-        AnycubicTFT.ai3m_pause_state -= 2;
-        #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOPAIR(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTFT.ai3m_pause_state);
-          SERIAL_EOL();
-        #endif
-      }
+      AnycubicTFT.PausedByNozzleTimeout = false;
     #endif
 
     HOTEND_LOOP() {
@@ -8584,7 +8576,7 @@ inline void gcode_M109() {
   #endif
 
   // flush the serial buffer after heating to prevent lockup by m105
-  //SERIAL_FLUSH();
+  SERIAL_FLUSH();
 
 }
 
@@ -8739,7 +8731,7 @@ inline void gcode_M109() {
     #endif
 
      // flush the serial buffer after heating to prevent lockup by m105
-     //SERIAL_FLUSH();
+     SERIAL_FLUSH();
   }
 
 #endif // HAS_HEATED_BED
@@ -10146,7 +10138,7 @@ inline void gcode_M226() {
         NOLESS(thermalManager.lpq_len, 0);
       #endif
 
-      thermalManager.update_pid();
+      thermalManager.updatePID();
       SERIAL_ECHO_START();
       #if ENABLED(PID_PARAMS_PER_HOTEND)
         SERIAL_ECHOPAIR(" e:", e); // specify extruder in serial output
@@ -10292,7 +10284,7 @@ inline void gcode_M303() {
       KEEPALIVE_STATE(NOT_BUSY);
     #endif
 
-    thermalManager.pid_autotune(temp, e, c, u);
+    thermalManager.PID_autotune(temp, e, c, u);
 
     #if DISABLED(BUSY_WHILE_HEATING)
       KEEPALIVE_STATE(IN_HANDLER);
@@ -11026,13 +11018,6 @@ inline void gcode_M502() {
     #ifdef ANYCUBIC_TFT_MODEL
       #ifdef SDSUPPORT
         if (card.sdprinting) { // are we printing from sd?
-          if (AnycubicTFT.ai3m_pause_state < 2) {
-            AnycubicTFT.ai3m_pause_state = 2;
-            #ifdef ANYCUBIC_TFT_DEBUG
-              SERIAL_ECHOPAIR(" DEBUG: M600 - AI3M Pause State set to: ", AnycubicTFT.ai3m_pause_state);
-              SERIAL_EOL();
-            #endif
-          }
           #ifdef ANYCUBIC_TFT_DEBUG
               SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
           #endif
@@ -11040,7 +11025,10 @@ inline void gcode_M502() {
           #ifdef ANYCUBIC_TFT_DEBUG
               SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
           #endif
-          // set flag to ensure correct resume routine gets executed
+          AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
+          #ifdef ANYCUBIC_TFT_DEBUG
+              SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
+          #endif
         }
       #endif
     #endif
@@ -14753,7 +14741,7 @@ void prepare_move_to_destination() {
 
 #if ENABLED(TEMP_STAT_LEDS)
 
-  static uint8_t red_led = -1;  // Invalid value to force leds initializzation on startup
+  static bool red_led = false;
   static millis_t next_status_led_update_ms = 0;
 
   void handle_status_leds(void) {
@@ -14761,18 +14749,20 @@ void prepare_move_to_destination() {
       next_status_led_update_ms += 500; // Update every 0.5s
       float max_temp = 0.0;
       #if HAS_HEATED_BED
-        max_temp = MAX(thermalManager.degTargetBed(), thermalManager.degBed());
+        max_temp = MAX3(max_temp, thermalManager.degTargetBed(), thermalManager.degBed());
       #endif
       HOTEND_LOOP()
         max_temp = MAX3(max_temp, thermalManager.degHotend(e), thermalManager.degTargetHotend(e));
-      const uint8_t new_led = (max_temp > 55.0) ? HIGH : (max_temp < 54.0 || red_led == -1) ? LOW : red_led;
+      const bool new_led = (max_temp > 55.0) ? true : (max_temp < 54.0) ? false : red_led;
       if (new_led != red_led) {
         red_led = new_led;
         #if PIN_EXISTS(STAT_LED_RED)
-          WRITE(STAT_LED_RED_PIN, new_led);
-        #endif
-        #if PIN_EXISTS(STAT_LED_BLUE)
-          WRITE(STAT_LED_BLUE_PIN, !new_led);
+          WRITE(STAT_LED_RED_PIN, new_led ? HIGH : LOW);
+          #if PIN_EXISTS(STAT_LED_BLUE)
+            WRITE(STAT_LED_BLUE_PIN, new_led ? LOW : HIGH);
+          #endif
+        #else
+          WRITE(STAT_LED_BLUE_PIN, new_led ? HIGH : LOW);
         #endif
       }
     }
@@ -15180,6 +15170,7 @@ void stop() {
   }
 }
 
+
 /**
  * Marlin entry-point: Set up before the program loop
  *  - Set up the kill pin, filament runout, power hold
@@ -15454,6 +15445,7 @@ void setup() {
   #endif
 }
 
+
 /**
  * The main Marlin program loop
  *

Marlin/Version.h

@@ -1,4 +1,4 @@
-/**
+/**
  * Marlin 3D Printer Firmware
  * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
@@ -41,7 +41,7 @@
    * Defines the version of the Marlin-AI3M build. Not to be confused with
    * Marlin's own build number, e.g. 1.1.9.
    */
-  #define CUSTOM_BUILD_VERSION "v1.4.6"
+  #define CUSTOM_BUILD_VERSION "v1.4.5"
 
   /**
    * Verbose version identifier which should contain a reference to the location
@@ -54,7 +54,7 @@
    * here we define this default string as the date where the latest release
    * version was tagged.
    */
-  #define STRING_DISTRIBUTION_DATE "2019-04-03"
+  #define STRING_DISTRIBUTION_DATE "2019-03-24"
 
   /**
    * Required minimum Configuration.h and Configuration_adv.h file versions.

Marlin/boards.h

@@ -156,6 +156,6 @@
 #define BOARD_TEENSY2           84    // Teensy++2.0 (AT90USB1286) - CLI compile: HARDWARE_MOTHERBOARD=84  make
 #define BOARD_5DPRINT           88    // 5DPrint D8 Driver Board
 
-#define MB(board) (defined(BOARD_##board) && MOTHERBOARD==BOARD_##board)
+#define MB(board) (MOTHERBOARD==BOARD_##board)
 
 #endif // __BOARDS_H

Marlin/configuration_store.cpp

@@ -308,7 +308,7 @@ void MarlinSettings::postprocess() {
   #endif
 
   #if ENABLED(PIDTEMP)
-    thermalManager.update_pid();
+    thermalManager.updatePID();
   #endif
 
   #if DISABLED(NO_VOLUMETRICS)

Marlin/language_de.h

@@ -41,34 +41,33 @@
 #define MSG_SD_INSERTED                     _UxGT("SD-Karte erkannt")
 #define MSG_SD_REMOVED                      _UxGT("SD-Karte entfernt")
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstopp") // Max length 8 characters
-#define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Soft-Endstopp")
 #define MSG_MAIN                            _UxGT("Hauptmenü")
 #define MSG_AUTOSTART                       _UxGT("Autostart")
 #define MSG_DISABLE_STEPPERS                _UxGT("Motoren deaktivieren") // M84
-#define MSG_DEBUG_MENU                      _UxGT("Debug-Menü")
-#define MSG_PROGRESS_BAR_TEST               _UxGT("Statusbalken-Test")
-#define MSG_AUTO_HOME                       _UxGT("Home XYZ") // G28
+#define MSG_DEBUG_MENU                      _UxGT("Debug Menü")
+#define MSG_PROGRESS_BAR_TEST               _UxGT("Fortschrittsb. Test")
+#define MSG_AUTO_HOME                       _UxGT("Home") // G28
 #define MSG_AUTO_HOME_X                     _UxGT("Home X")
 #define MSG_AUTO_HOME_Y                     _UxGT("Home Y")
 #define MSG_AUTO_HOME_Z                     _UxGT("Home Z")
 #define MSG_TMC_Z_CALIBRATION               _UxGT("Kalibriere Z")
 #define MSG_LEVEL_BED_HOMING                _UxGT("Home XYZ")
-#define MSG_LEVEL_BED_WAITING               _UxGT("Klick zum Starten")
+#define MSG_LEVEL_BED_WAITING               _UxGT("Klick für Start")
 #define MSG_LEVEL_BED_NEXT_POINT            _UxGT("Nächste Koordinate")
-#define MSG_LEVEL_BED_DONE                  _UxGT("Nivellieren fertig!")
+#define MSG_LEVEL_BED_DONE                  _UxGT("Fertig")
 #define MSG_Z_FADE_HEIGHT                   _UxGT("Ausblendhöhe")
 #define MSG_SET_HOME_OFFSETS                _UxGT("Setze Homeversatz")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Homeversatz aktiv")
-#define MSG_SET_ORIGIN                      _UxGT("Setze Nullpunkte") //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
+#define MSG_SET_ORIGIN                      _UxGT("Setze Nullpunkt") //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
 #define MSG_PREHEAT_1                       _UxGT("Vorwärmen PLA")
 #define MSG_PREHEAT_1_N                     _UxGT("Vorwärmen PLA ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Vorw. PLA Alles")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Vorw. PLA Alle")
 #define MSG_PREHEAT_1_END                   _UxGT("Vorw. PLA Extr.")
 #define MSG_PREHEAT_1_BEDONLY               _UxGT("Vorw. PLA Bett")
 #define MSG_PREHEAT_1_SETTINGS              _UxGT("Vorw. PLA Einst.")
 #define MSG_PREHEAT_2                       _UxGT("Vorwärmen ABS")
 #define MSG_PREHEAT_2_N                     _UxGT("Vorwärmen ABS ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Vorw. ABS Alles")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Vorw. ABS Alle")
 #define MSG_PREHEAT_2_END                   _UxGT("Vorw. ABS Extr.")
 #define MSG_PREHEAT_2_BEDONLY               _UxGT("Vorw. ABS Bett")
 #define MSG_PREHEAT_2_SETTINGS              _UxGT("Vorw. ABS Einst.")
@@ -76,102 +75,20 @@
 #define MSG_SWITCH_PS_ON                    _UxGT("Netzteil ein")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Netzteil aus")
 #define MSG_EXTRUDE                         _UxGT("Extrudieren")
-#define MSG_RETRACT                         _UxGT("Rückzug")
-#define MSG_MOVE_AXIS                       _UxGT("Achse Bewegen")
-#define MSG_BED_LEVELING                    _UxGT("Bett-Nivellierung")
+#define MSG_RETRACT                         _UxGT("Retract")
+#define MSG_MOVE_AXIS                       _UxGT("Bewegen")
+#define MSG_BED_LEVELING                    _UxGT("Bett Nivellierung")
 #define MSG_LEVEL_BED                       _UxGT("Bett nivellieren")
 #define MSG_LEVEL_CORNERS                   _UxGT("Ecken nivellieren")
 #define MSG_NEXT_CORNER                     _UxGT("Nächste Ecke")
 #define MSG_EDITING_STOPPED                 _UxGT("Netzbearb. angeh.")
-#define MSG_USER_MENU                       _UxGT("Benutzer-Menü")
-#define MSG_UBL_DOING_G29                   _UxGT("G29 ausführen")
-#define MSG_UBL_UNHOMED                     _UxGT("Home XYZ zuerst")
-#define MSG_UBL_TOOLS                       _UxGT("UBL-Werkzeuge")
-#define MSG_UBL_LEVEL_BED                   _UxGT("Unified Bed Leveling")
-#define MSG_UBL_MANUAL_MESH                 _UxGT("Netz manuell erst.")
-#define MSG_UBL_BC_INSERT                   _UxGT("Unterlegen & messen")
-#define MSG_UBL_BC_INSERT2                  _UxGT("Messen")
-#define MSG_UBL_BC_REMOVE                   _UxGT("Entfernen & messen")
-#define MSG_UBL_MOVING_TO_NEXT              _UxGT("Nächster Punkt...")
-#define MSG_UBL_ACTIVATE_MESH               _UxGT("UBL aktivieren")
-#define MSG_UBL_DEACTIVATE_MESH             _UxGT("UBL deaktivieren")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Betttemperatur")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Hotend-Temp.")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
-#define MSG_UBL_MESH_EDIT                   _UxGT("Netz bearbeiten")
-#define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Eigenes Netz bearb.")
-#define MSG_UBL_FINE_TUNE_MESH              _UxGT("Feineinstellung...")
-#define MSG_UBL_DONE_EDITING_MESH           _UxGT("Bearbeitung beendet")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Eigenes Netz erst.")
-#define MSG_UBL_BUILD_MESH_MENU             _UxGT("Netz erstellen")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Netz erstellen PLA")
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Netz erstellen ABS")
-#define MSG_UBL_BUILD_COLD_MESH             _UxGT("Netz erstellen kalt")
-#define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Netzhöhe einst.")
-#define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Höhe")
-#define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Netz validieren")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Netz validieren PLA")
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Netz validieren ABS")
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Eig. Netz validieren")
-#define MSG_UBL_CONTINUE_MESH               _UxGT("Netzerst. forts.")
-#define MSG_UBL_MESH_LEVELING               _UxGT("Netz-Nivellierung")
-#define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("3-Punkt-Nivell.")
-#define MSG_UBL_GRID_MESH_LEVELING          _UxGT("Gitternetz-Nivell.")
-#define MSG_UBL_MESH_LEVEL                  _UxGT("Netz nivellieren")
-#define MSG_UBL_SIDE_POINTS                 _UxGT("Eckpunkte")
-#define MSG_UBL_MAP_TYPE                    _UxGT("Kartentyp")
-#define MSG_UBL_OUTPUT_MAP                  _UxGT("Karte ausgeben")
-#define MSG_UBL_OUTPUT_MAP_HOST             _UxGT("Ausgabe für Host")
-#define MSG_UBL_OUTPUT_MAP_CSV              _UxGT("Ausgabe für CSV")
-#define MSG_UBL_OUTPUT_MAP_BACKUP           _UxGT("Externe Sicherung")
-#define MSG_UBL_INFO_UBL                    _UxGT("UBL-Info ausgeben")
-#define MSG_UBL_EDIT_MESH_MENU             _UxGT("Netz bearbeiten")
-#define MSG_UBL_FILLIN_AMOUNT               _UxGT("Menge an Füllung")
-#define MSG_UBL_MANUAL_FILLIN               _UxGT("Manuelles Füllung")
-#define MSG_UBL_SMART_FILLIN                _UxGT("Cleveres Füllen")
-#define MSG_UBL_FILLIN_MESH                 _UxGT("Netz Füllen")
-#define MSG_UBL_INVALIDATE_ALL              _UxGT("Alles annullieren")
-#define MSG_UBL_INVALIDATE_CLOSEST          _UxGT("Nächstlieg. ann.")
-#define MSG_UBL_FINE_TUNE_ALL               _UxGT("Feineinst. Alles")
-#define MSG_UBL_FINE_TUNE_CLOSEST           _UxGT("Feineinst. Nächstl.")
-#define MSG_UBL_STORAGE_MESH_MENU           _UxGT("Netz-Speicherplatz")
-#define MSG_UBL_STORAGE_SLOT                _UxGT("Speicherort")
-#define MSG_UBL_LOAD_MESH                   _UxGT("Bettnetz laden")
-#define MSG_UBL_SAVE_MESH                   _UxGT("Bettnetz speichern")
-#define MSG_MESH_LOADED                     _UxGT("Netz %i geladen")
-#define MSG_MESH_SAVED                      _UxGT("Netz %i gespeichert")
-#define MSG_NO_STORAGE                      _UxGT("Kein Speicher")
-#define MSG_UBL_SAVE_ERROR                  _UxGT("ERR:UBL speichern")
-#define MSG_UBL_RESTORE_ERROR               _UxGT("ERR:UBL wiederherst.")
-#define MSG_UBL_Z_OFFSET_STOPPED            _UxGT("Z-Versatz angehalten")
-#define MSG_UBL_STEP_BY_STEP_MENU           _UxGT("Schrittweises UBL")
-
-#define MSG_LED_CONTROL                     _UxGT("LED-Steuerung")
-#define MSG_LEDS                            _UxGT("Licht")
-#define MSG_LED_PRESETS                     _UxGT("Licht-Einstellungen")
-#define MSG_SET_LEDS_RED                    _UxGT("Rot")
-#define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")
-#define MSG_SET_LEDS_YELLOW                 _UxGT("Gelb")
-#define MSG_SET_LEDS_GREEN                  _UxGT("Grün")
-#define MSG_SET_LEDS_BLUE                   _UxGT("Blau")
-#define MSG_SET_LEDS_INDIGO                 _UxGT("Indigo")
-#define MSG_SET_LEDS_VIOLET                 _UxGT("Violett")
-#define MSG_SET_LEDS_WHITE                  _UxGT("Weiß")
-#define MSG_SET_LEDS_DEFAULT                _UxGT("Standard")
-#define MSG_CUSTOM_LEDS                     _UxGT("Benutzerdef.")
-#define MSG_INTENSITY_R                     _UxGT("Intensität Rot")
-#define MSG_INTENSITY_G                     _UxGT("Intensität Grün")
-#define MSG_INTENSITY_B                     _UxGT("Intensität Blau")
-#define MSG_INTENSITY_W                     _UxGT("Intensität Weiß")
-#define MSG_LED_BRIGHTNESS                  _UxGT("Helligkeit")
-
+#define MSG_USER_MENU                       _UxGT("Benutzer Menü")
 #define MSG_MOVING                          _UxGT("In Bewegung...")
 #define MSG_FREE_XY                         _UxGT("Abstand XY")
-#define MSG_MOVE_X                          _UxGT("Bewege X")
-#define MSG_MOVE_Y                          _UxGT("Bewege Y")
-#define MSG_MOVE_Z                          _UxGT("Bewege Z")
-#define MSG_MOVE_E                          _UxGT("Bewege Extruder")
+#define MSG_MOVE_X                          _UxGT("X")
+#define MSG_MOVE_Y                          _UxGT("Y")
+#define MSG_MOVE_Z                          _UxGT("Z")
+#define MSG_MOVE_E                          _UxGT("Extruder ")
 #define MSG_MOVE_01MM                       _UxGT(" 0,1 mm")
 #define MSG_MOVE_1MM                        _UxGT(" 1,0 mm")
 #define MSG_MOVE_10MM                       _UxGT("10,0 mm")
@@ -180,13 +97,13 @@
 #define MSG_NOZZLE                          _UxGT("Düse")
 #define MSG_BED                             _UxGT("Bett")
 #define MSG_FAN_SPEED                       _UxGT("Lüfter")
-#define MSG_EXTRA_FAN_SPEED                 _UxGT("Geschw. Extralüfter")
+#define MSG_EXTRA_FAN_SPEED                 _UxGT("Extra Lüfter")
 #define MSG_FLOW                            _UxGT("Flussrate")
 #define MSG_CONTROL                         _UxGT("Einstellungen")
 #define MSG_MIN                             LCD_STR_THERMOMETER _UxGT(" min")
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" max")
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Faktor")
-#define MSG_AUTOTEMP                        _UxGT("Auto Temperatur")
+#define MSG_AUTOTEMP                        _UxGT("AutoTemp")
 #define MSG_ON                              _UxGT("Ein")
 #define MSG_OFF                             _UxGT("Aus")
 #define MSG_PID_P                           _UxGT("PID P")
@@ -194,7 +111,7 @@
 #define MSG_PID_D                           _UxGT("PID D")
 #define MSG_PID_C                           _UxGT("PID C")
 #define MSG_SELECT                          _UxGT("Auswählen")
-#define MSG_ACC                             _UxGT("Beschleunigung")
+#define MSG_ACC                             _UxGT("A")
 #define MSG_JERK                            _UxGT("Jerk")
 #if IS_KINEMATIC
   #define MSG_VA_JERK                       _UxGT("V A Jerk")
@@ -206,14 +123,13 @@
   #define MSG_VC_JERK                       _UxGT("V Z Jerk")
 #endif
 #define MSG_VE_JERK                         _UxGT("V E Jerk")
-#define MSG_JUNCTION_DEVIATION              _UxGT("Junction Dev")
 #define MSG_VELOCITY                        _UxGT("Geschwindigkeit")
-#define MSG_VMAX                            _UxGT("V max ") // space intentional
+#define MSG_VMAX                            _UxGT("V max ") // space by purpose
 #define MSG_VMIN                            _UxGT("V min")
 #define MSG_VTRAV_MIN                       _UxGT("V min Leerfahrt")
 #define MSG_ACCELERATION                    _UxGT("Beschleunigung")
-#define MSG_AMAX                            _UxGT("A max ") // space intentional
-#define MSG_A_RETRACT                       _UxGT("A Rückzug")
+#define MSG_AMAX                            _UxGT("A max ") // space by purpose
+#define MSG_A_RETRACT                       _UxGT("A Retract")
 #define MSG_A_TRAVEL                        _UxGT("A Leerfahrt")
 #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
 #if IS_KINEMATIC
@@ -235,11 +151,11 @@
 #define MSG_MOTION                          _UxGT("Bewegung")
 #define MSG_FILAMENT                        _UxGT("Filament")
 #define MSG_VOLUMETRIC_ENABLED              _UxGT("E in mm³")
-#define MSG_FILAMENT_DIAM                   _UxGT("Durchm. Filament")
+#define MSG_FILAMENT_DIAM                   _UxGT("D Fil.")
 #define MSG_FILAMENT_UNLOAD                 _UxGT("Entladen mm")
 #define MSG_FILAMENT_LOAD                   _UxGT("Laden mm")
-#define MSG_ADVANCE_K                       _UxGT("Vorschubfaktor")
-#define MSG_CONTRAST                        _UxGT("LCD-Kontrast")
+#define MSG_ADVANCE_K                       _UxGT("Advance Faktor")
+#define MSG_CONTRAST                        _UxGT("LCD Kontrast")
 #define MSG_STORE_EEPROM                    _UxGT("Konfig. speichern")
 #define MSG_LOAD_EEPROM                     _UxGT("Konfig. laden")
 #define MSG_RESTORE_FAILSAFE                _UxGT("Standardwerte laden")
@@ -248,52 +164,49 @@
 #define MSG_WATCH                           _UxGT("Info")
 #define MSG_PREPARE                         _UxGT("Vorbereitung")
 #define MSG_TUNE                            _UxGT("Justierung")
-#define MSG_PAUSE_PRINT                     _UxGT("SD-Druck pausieren")
-#define MSG_RESUME_PRINT                    _UxGT("SD-Druck fortsetzen")
-#define MSG_STOP_PRINT                      _UxGT("SD-Druck abbrechen")
-#define MSG_POWER_LOSS_RECOVERY             _UxGT("Wiederh. n. Stroma.")
-#define MSG_CARD_MENU                       _UxGT("Druck v. SD-Karte")
+#define MSG_PAUSE_PRINT                     _UxGT("SD-Druck Pause")
+#define MSG_RESUME_PRINT                    _UxGT("SD-Druck Fortsetzung")
+#define MSG_STOP_PRINT                      _UxGT("SD-Druck Abbruch")
+#define MSG_CARD_MENU                       _UxGT("SD-Karte")
 #define MSG_NO_CARD                         _UxGT("Keine SD-Karte")
 #define MSG_DWELL                           _UxGT("Warten...")
-#define MSG_USERWAIT                        _UxGT("Klick zum Fortsetzen")
-#define MSG_PRINT_PAUSED                    _UxGT("Druck pausiert...")
-#define MSG_PRINTING                        _UxGT("Druckt...")
+#define MSG_USERWAIT                        _UxGT("Warte auf Nutzer")
+#define MSG_PRINT_PAUSED                    _UxGT("Druck pausiert")
 #define MSG_PRINT_ABORTED                   _UxGT("Druck abgebrochen")
-#define MSG_NO_MOVE                         _UxGT("Motoren angeschaltet")
+#define MSG_NO_MOVE                         _UxGT("Motoren eingeschaltet")
 #define MSG_KILLED                          _UxGT("ABGEBROCHEN")
 #define MSG_STOPPED                         _UxGT("ANGEHALTEN")
-#define MSG_CONTROL_RETRACT                 _UxGT("Rückzug mm")
-#define MSG_CONTROL_RETRACT_SWAP            _UxGT("Wechs. Rückzug mm")
-#define MSG_CONTROL_RETRACTF                _UxGT("Rückzug  V")
-#define MSG_CONTROL_RETRACT_ZLIFT           _UxGT("Z-Sprung mm")
+#define MSG_CONTROL_RETRACT                 _UxGT("Retract mm")
+#define MSG_CONTROL_RETRACT_SWAP            _UxGT("Wechs. Retract mm")
+#define MSG_CONTROL_RETRACTF                _UxGT("Retract  V")
+#define MSG_CONTROL_RETRACT_ZLIFT           _UxGT("Z-Hop mm")
 #define MSG_CONTROL_RETRACT_RECOVER         _UxGT("UnRet mm")
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    _UxGT("Wechs. UnRet mm")
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
 #define MSG_CONTROL_RETRACT_RECOVER_SWAPF   _UxGT("S UnRet V")
-#define MSG_AUTORETRACT                     _UxGT("Autom. Rückzug")
+#define MSG_AUTORETRACT                     _UxGT("Autom. Retract")
 #define MSG_FILAMENTCHANGE                  _UxGT("Filament wechseln")
 #define MSG_FILAMENTLOAD                    _UxGT("Filament laden")
 #define MSG_FILAMENTUNLOAD                  _UxGT("Filament entladen")
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Alles entladen")
-#define MSG_INIT_SDCARD                     _UxGT("SD-Karte initialisi.")  // Manually initialize the SD-card via user interface
+#define MSG_INIT_SDCARD                     _UxGT("SD-Karte erkennen")  // Manually initialize the SD-card via user interface
 #define MSG_CNG_SDCARD                      _UxGT("SD-Karte getauscht") // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
-#define MSG_ZPROBE_OUT                      _UxGT("Z-Sonde außerhalb")
-#define MSG_SKEW_FACTOR                     _UxGT("Korrekturfaktor")
+#define MSG_ZPROBE_OUT                      _UxGT("Sensor ausserhalb")
+#define MSG_SKEW_FACTOR                     _UxGT("Skew Faktor")
 #define MSG_BLTOUCH                         _UxGT("BLTouch")
-#define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Selbsttest")
-#define MSG_BLTOUCH_RESET                   _UxGT("BLTouch zurücks.")
+#define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Test")
+#define MSG_BLTOUCH_RESET                   _UxGT("BLTouch Reset")
 #define MSG_BLTOUCH_DEPLOY                  _UxGT("BLTouch ausfahren")
 #define MSG_BLTOUCH_STOW                    _UxGT("BLTouch einfahren")
-#define MSG_HOME                            _UxGT("Vorher") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_HOME                            _UxGT("Vorher")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
 #define MSG_FIRST                           _UxGT("homen")
-#define MSG_ZPROBE_ZOFFSET                  _UxGT("Sondenversatz Z")
+#define MSG_ZPROBE_ZOFFSET                  _UxGT("Z Versatz")
 #define MSG_BABYSTEP_X                      _UxGT("Babystep X")
 #define MSG_BABYSTEP_Y                      _UxGT("Babystep Y")
 #define MSG_BABYSTEP_Z                      _UxGT("Babystep Z")
-#define MSG_ENDSTOP_ABORT                   _UxGT("Endstopp Abbr.")
-#define MSG_HEATING_FAILED_LCD              _UxGT("HEIZEN ERFOLGLOS")
-#define MSG_HEATING_FAILED_LCD_BED          _UxGT("Bett heizen fehlge.")
-#define MSG_ERR_REDUNDANT_TEMP              _UxGT("REDUND. TEMP-ABWEI.")
+#define MSG_ENDSTOP_ABORT                   _UxGT("Endstopp-Abbr.")
+#define MSG_HEATING_FAILED_LCD              _UxGT("HEIZEN FEHLGESCHLAGEN")
+#define MSG_ERR_REDUNDANT_TEMP              _UxGT("REDUND. TEMPERATURABWEICHUNG")
 #define MSG_THERMAL_RUNAWAY                 LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT")
 #define MSG_THERMAL_RUNAWAY_BED             _UxGT("BETT") MSG_THERMAL_RUNAWAY
 #define MSG_ERR_MAXTEMP                     LCD_STR_THERMOMETER _UxGT(" ÜBERSCHRITTEN")
@@ -302,14 +215,12 @@
 #define MSG_ERR_MINTEMP_BED                 _UxGT("BETT ") LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN")
 #define MSG_ERR_Z_HOMING                    MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
 #define MSG_HALTED                          _UxGT("DRUCKER STOPP")
-#define MSG_PLEASE_RESET                    _UxGT("Bitte neustarten")
+#define MSG_PLEASE_RESET                    _UxGT("Bitte Resetten")
 #define MSG_SHORT_DAY                       _UxGT("t") // One character only
 #define MSG_SHORT_HOUR                      _UxGT("h") // One character only
 #define MSG_SHORT_MINUTE                    _UxGT("m") // One character only
 #define MSG_HEATING                         _UxGT("Extr. heizt...")
-#define MSG_COOLING                         _UxGT("Extr. kühlt...")
 #define MSG_BED_HEATING                     _UxGT("Bett heizt...")
-#define MSG_BED_COOLING                     _UxGT("Bett kühlt...")
 #define MSG_DELTA_CALIBRATE                 _UxGT("Delta kalibrieren")
 #define MSG_DELTA_CALIBRATE_X               _UxGT("Kalibriere X")
 #define MSG_DELTA_CALIBRATE_Y               _UxGT("Kalibriere Y")
@@ -318,94 +229,171 @@
 #define MSG_DELTA_SETTINGS                  _UxGT("Delta Einst. anzeig.")
 #define MSG_DELTA_AUTO_CALIBRATE            _UxGT("Autom. Kalibrierung")
 #define MSG_DELTA_HEIGHT_CALIBRATE          _UxGT("Delta Höhe setzen")
-#define MSG_DELTA_Z_OFFSET_CALIBRATE        _UxGT("Sondenversatz Z")
 #define MSG_DELTA_DIAG_ROD                  _UxGT("Diag Rod")
 #define MSG_DELTA_HEIGHT                    _UxGT("Höhe")
 #define MSG_DELTA_RADIUS                    _UxGT("Radius")
 #define MSG_INFO_MENU                       _UxGT("Über den Drucker")
-#define MSG_INFO_PRINTER_MENU               _UxGT("Drucker-Info")
-#define MSG_3POINT_LEVELING                 _UxGT("3-Punkt-Nivellierung")
+#define MSG_INFO_PRINTER_MENU               _UxGT("Drucker Info")
+#define MSG_3POINT_LEVELING                 _UxGT("3-Punkt Nivellierung")
 #define MSG_LINEAR_LEVELING                 _UxGT("Lineare Nivellierung")
 #define MSG_BILINEAR_LEVELING               _UxGT("Bilineare Nivell.")
 #define MSG_UBL_LEVELING                    _UxGT("Unified Bed Leveling")
-#define MSG_MESH_LEVELING                   _UxGT("Netz-Nivellierung")
-#define MSG_INFO_STATS_MENU                 _UxGT("Drucker-Statistik")
-#define MSG_INFO_BOARD_MENU                 _UxGT("Board-Info")
+#define MSG_MESH_LEVELING                   _UxGT("Netz Nivellierung")
+#define MSG_INFO_STATS_MENU                 _UxGT("Drucker Statistik")
+#define MSG_INFO_BOARD_MENU                 _UxGT("Board Info")
 #define MSG_INFO_THERMISTOR_MENU            _UxGT("Thermistoren")
 #define MSG_INFO_EXTRUDERS                  _UxGT("Extruder")
-#define MSG_INFO_BAUDRATE                   _UxGT("Baudrate")
+#define MSG_INFO_BAUDRATE                   _UxGT("Baud")
 #define MSG_INFO_PROTOCOL                   _UxGT("Protokoll")
 #define MSG_CASE_LIGHT                      _UxGT("Beleuchtung")
 #define MSG_CASE_LIGHT_BRIGHTNESS           _UxGT("Helligkeit")
 
+#define MSG_UBL_DOING_G29                 _UxGT("G29 UBL läuft!")
+#define MSG_UBL_UNHOMED                   _UxGT("Erst XYZ homen")
+#define MSG_UBL_TOOLS                     _UxGT("UBL Werkzeuge")
+#define MSG_UBL_LEVEL_BED                 _UxGT("Unified Bed Leveling")
+#define MSG_UBL_MANUAL_MESH               _UxGT("Netz manuell erst.")
+#define MSG_UBL_BC_INSERT                 _UxGT("Unterlegen & messen")
+#define MSG_UBL_BC_INSERT2                _UxGT("Messen")
+#define MSG_UBL_BC_REMOVE                 _UxGT("Entfernen & messen")
+#define MSG_UBL_MOVING_TO_NEXT            _UxGT("Nächster Punkt...")
+#define MSG_UBL_ACTIVATE_MESH             _UxGT("UBL aktivieren")
+#define MSG_UBL_DEACTIVATE_MESH           _UxGT("UBL deaktivieren")
+#define MSG_UBL_SET_BED_TEMP              _UxGT("Bett Temp.")
+#define MSG_UBL_CUSTOM_BED_TEMP           MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_SET_HOTEND_TEMP           _UxGT("Hotend Temp.")
+#define MSG_UBL_CUSTOM_HOTEND_TEMP        MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_MESH_EDIT                 _UxGT("Netz bearbeiten")
+#define MSG_UBL_EDIT_CUSTOM_MESH          _UxGT("Eigenes Netz bearb.")
+#define MSG_UBL_FINE_TUNE_MESH            _UxGT("Feineinstellung...")
+#define MSG_UBL_DONE_EDITING_MESH         _UxGT("Bearbeitung beendet")
+#define MSG_UBL_BUILD_CUSTOM_MESH         _UxGT("Eigenes Netz erst.")
+#define MSG_UBL_BUILD_MESH_MENU           _UxGT("Netz erstellen")
+#define MSG_UBL_BUILD_PLA_MESH            _UxGT("Netz erstellen PLA")
+#define MSG_UBL_BUILD_ABS_MESH            _UxGT("Netz erstellen ABS")
+#define MSG_UBL_BUILD_COLD_MESH           _UxGT("Netz erstellen kalt")
+#define MSG_UBL_MESH_HEIGHT_ADJUST        _UxGT("Netz Höhe einst.")
+#define MSG_UBL_MESH_HEIGHT_AMOUNT        _UxGT("Höhe")
+#define MSG_UBL_VALIDATE_MESH_MENU        _UxGT("Netz validieren")
+#define MSG_UBL_VALIDATE_PLA_MESH         _UxGT("Netz validieren PLA")
+#define MSG_UBL_VALIDATE_ABS_MESH         _UxGT("Netz validieren ABS")
+#define MSG_UBL_VALIDATE_CUSTOM_MESH      _UxGT("Eig. Netz validieren")
+#define MSG_UBL_CONTINUE_MESH             _UxGT("Netzerst. forts.")
+#define MSG_UBL_MESH_LEVELING             _UxGT("Netz Nivellierung")
+#define MSG_UBL_3POINT_MESH_LEVELING      _UxGT("3-Punkt Nivellierung")
+#define MSG_UBL_GRID_MESH_LEVELING        _UxGT("Gitternetz Nivell.")
+#define MSG_UBL_MESH_LEVEL                _UxGT("Netz nivellieren")
+#define MSG_UBL_SIDE_POINTS               _UxGT("Eckpunkte")
+#define MSG_UBL_MAP_TYPE                  _UxGT("Kartentyp")
+#define MSG_UBL_OUTPUT_MAP                _UxGT("Karte ausgeben")
+#define MSG_UBL_OUTPUT_MAP_HOST           _UxGT("Ausgabe für Host")
+#define MSG_UBL_OUTPUT_MAP_CSV            _UxGT("Ausgabe für CSV")
+#define MSG_UBL_OUTPUT_MAP_BACKUP         _UxGT("Externe Sicherung")
+#define MSG_UBL_INFO_UBL                  _UxGT("UBL Info ausgeben")
+#define MSG_UBL_EDIT_MESH_MENU            _UxGT("Netz bearbeiten")
+#define MSG_UBL_FILLIN_AMOUNT             _UxGT("Menge an Fill-in")
+#define MSG_UBL_MANUAL_FILLIN             _UxGT("Manuelles Fill-in")
+#define MSG_UBL_SMART_FILLIN              _UxGT("Kluges Fill-in")
+#define MSG_UBL_FILLIN_MESH               _UxGT("Fill-in Netz")
+#define MSG_UBL_INVALIDATE_ALL            _UxGT("Alles annullieren")
+#define MSG_UBL_INVALIDATE_CLOSEST        _UxGT("Nächstlieg. ann.")
+#define MSG_UBL_FINE_TUNE_ALL             _UxGT("Feineinstellung Alle")
+#define MSG_UBL_FINE_TUNE_CLOSEST         _UxGT("Feineinst. Nächstl.")
+#define MSG_UBL_STORAGE_MESH_MENU         _UxGT("Netz Speicherplatz")
+#define MSG_UBL_STORAGE_SLOT              _UxGT("Memory Slot")
+#define MSG_UBL_LOAD_MESH                 _UxGT("Bett Netz laden")
+#define MSG_UBL_SAVE_MESH                 _UxGT("Bett Netz speichern")
+#define MSG_MESH_LOADED                   _UxGT("Netz %i geladen")
+#define MSG_MESH_SAVED                    _UxGT("Netz %i gespeichert")
+#define MSG_NO_STORAGE                    _UxGT("Kein Speicher")
+#define MSG_UBL_SAVE_ERROR                _UxGT("ERR:UBL speichern")
+#define MSG_UBL_RESTORE_ERROR             _UxGT("ERR:UBL wiederherst.")
+#define MSG_UBL_Z_OFFSET_STOPPED          _UxGT("Z-Versatz angehalten")
+#define MSG_UBL_STEP_BY_STEP_MENU         _UxGT("Schrittweises UBL")
+
+#define MSG_LED_CONTROL                     _UxGT("LED Kontrolle")
+#define MSG_LEDS                            _UxGT("Licht")
+#define MSG_LED_PRESETS                     _UxGT("Licht Einstellungen")
+#define MSG_SET_LEDS_RED                    _UxGT("Rot")
+#define MSG_SET_LEDS_ORANGE                 _UxGT("Orange")
+#define MSG_SET_LEDS_YELLOW                 _UxGT("Gelb")
+#define MSG_SET_LEDS_GREEN                  _UxGT("Grün")
+#define MSG_SET_LEDS_BLUE                   _UxGT("Blau")
+#define MSG_SET_LEDS_INDIGO                 _UxGT("Indigo")
+#define MSG_SET_LEDS_VIOLET                 _UxGT("Violett")
+#define MSG_SET_LEDS_WHITE                  _UxGT("Weiß")
+#define MSG_SET_LEDS_DEFAULT                _UxGT("Standard")
+#define MSG_CUSTOM_LEDS                     _UxGT("Benutzerdef.")
+#define MSG_INTENSITY_R                     _UxGT("Intensität Rot")
+#define MSG_INTENSITY_G                     _UxGT("Intensität Grün")
+#define MSG_INTENSITY_B                     _UxGT("Intensität Blau")
+#define MSG_INTENSITY_W                     _UxGT("Intensität Weiß")
+#define MSG_LED_BRIGHTNESS                  _UxGT("Helligkeit")
+
 #if LCD_WIDTH >= 20
   #define MSG_INFO_PRINT_COUNT              _UxGT("Gesamte Drucke")
-  #define MSG_INFO_COMPLETED_PRINTS         _UxGT("Komplette Drucke")
+  #define MSG_INFO_COMPLETED_PRINTS         _UxGT("Beendete Drucke")
   #define MSG_INFO_PRINT_TIME               _UxGT("Gesamte Druckzeit")
-  #define MSG_INFO_PRINT_LONGEST            _UxGT("Längste Druckzeit")
+  #define MSG_INFO_PRINT_LONGEST            _UxGT("Längster Druckjob")
   #define MSG_INFO_PRINT_FILAMENT           _UxGT("Gesamt Extrudiert")
 #else
   #define MSG_INFO_PRINT_COUNT              _UxGT("Drucke")
-  #define MSG_INFO_COMPLETED_PRINTS         _UxGT("Komplette")
-  #define MSG_INFO_PRINT_TIME               _UxGT("Gesamte")
-  #define MSG_INFO_PRINT_LONGEST            _UxGT("Längste")
+  #define MSG_INFO_COMPLETED_PRINTS         _UxGT("Komplett")
+  #define MSG_INFO_PRINT_TIME               _UxGT("Gesamt ")
+  #define MSG_INFO_PRINT_LONGEST            _UxGT("Längster")
   #define MSG_INFO_PRINT_FILAMENT           _UxGT("Extrud.")
 #endif
 
 #define MSG_INFO_MIN_TEMP                   _UxGT("Min Temp")
 #define MSG_INFO_MAX_TEMP                   _UxGT("Max Temp")
 #define MSG_INFO_PSU                        _UxGT("Netzteil")
-#define MSG_DRIVE_STRENGTH                  _UxGT("Motorleistung")
+
+#define MSG_DRIVE_STRENGTH                  _UxGT("Motorströme")
 #define MSG_DAC_PERCENT                     _UxGT("Treiber %")
 #define MSG_DAC_EEPROM_WRITE                _UxGT("Werte speichern")
 #define MSG_FILAMENT_CHANGE_HEADER_PAUSE    _UxGT("DRUCK PAUSIERT")
 #define MSG_FILAMENT_CHANGE_HEADER_LOAD     _UxGT("FILAMENT LADEN")
 #define MSG_FILAMENT_CHANGE_HEADER_UNLOAD   _UxGT("FILAMENT ENTLADEN")
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   _UxGT("FORTS. OPTIONEN:")
-#define MSG_FILAMENT_CHANGE_OPTION_PURGE    _UxGT("Mehr entladen")
-#define MSG_FILAMENT_CHANGE_OPTION_RESUME   _UxGT("Druck weiter")
+#define MSG_FILAMENT_CHANGE_OPTION_PURGE    _UxGT("Mehr entleeren")
+#define MSG_FILAMENT_CHANGE_OPTION_RESUME   _UxGT("Drucke weiter")
 #define MSG_FILAMENT_CHANGE_NOZZLE          _UxGT("  Düse: ")
 #define MSG_ERR_HOMING_FAILED               _UxGT("Homing gescheitert")
 #define MSG_ERR_PROBING_FAILED              _UxGT("Probing gescheitert")
-#define MSG_M600_TOO_COLD                   _UxGT("M600: zu kalt")
-
-//
-// Die Filament-Change-Bildschirme können bis zu 3 Zeilen auf einem 4-Zeilen-Display anzeigen
-//                                       ...oder 2 Zeilen auf einem 3-Zeilen-Display.
+#define MSG_M600_TOO_COLD                   _UxGT("M600: Zu kalt")
 #if LCD_HEIGHT >= 4
   // Up to 3 lines allowed
-  #define MSG_FILAMENT_CHANGE_INIT_1        _UxGT("Warte auf den")
-  #define MSG_FILAMENT_CHANGE_INIT_2        _UxGT("Start des")
-  #define MSG_FILAMENT_CHANGE_INIT_3        _UxGT("Filamentwechsels...")
-  #define MSG_FILAMENT_CHANGE_INSERT_1      _UxGT("Filament einlegen")
-  #define MSG_FILAMENT_CHANGE_INSERT_2      _UxGT("und Knopf drücken")
-  #define MSG_FILAMENT_CHANGE_INSERT_3      _UxGT("um fortzusetzen")
-  #define MSG_FILAMENT_CHANGE_HEAT_1        _UxGT("Knopf drücken um")
-  #define MSG_FILAMENT_CHANGE_HEAT_2        _UxGT("Düse aufzuheizen")
-  #define MSG_FILAMENT_CHANGE_HEATING_1     _UxGT("Düse heizt auf")
-  #define MSG_FILAMENT_CHANGE_HEATING_2     _UxGT("bitte warten...")
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1      _UxGT("Warte auf")
-  #define MSG_FILAMENT_CHANGE_UNLOAD_2      _UxGT("Herausnahme")
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3      _UxGT("des Filaments...")
-  #define MSG_FILAMENT_CHANGE_LOAD_1        _UxGT("Warte auf")
-  #define MSG_FILAMENT_CHANGE_LOAD_2        _UxGT("Laden des")
-  #define MSG_FILAMENT_CHANGE_LOAD_3        _UxGT("Filaments...")
-  #define MSG_FILAMENT_CHANGE_PURGE_1       _UxGT("Warte auf")
-  #define MSG_FILAMENT_CHANGE_PURGE_2       _UxGT("Entladen des")
-  #define MSG_FILAMENT_CHANGE_PURGE_3       _UxGT("Filaments...")
-  #define MSG_FILAMENT_CHANGE_RESUME_1      _UxGT("Warte auf")
-  #define MSG_FILAMENT_CHANGE_RESUME_2      _UxGT("Fortsetzen des")
-  #define MSG_FILAMENT_CHANGE_RESUME_3      _UxGT("Drucks...")
+  #define MSG_FILAMENT_CHANGE_INIT_1          _UxGT("Warte auf den")
+  #define MSG_FILAMENT_CHANGE_INIT_2          _UxGT("Start des")
+  #define MSG_FILAMENT_CHANGE_INIT_3          _UxGT("Filamentwechsels")
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        _UxGT("Warte auf")
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        _UxGT("Herausnahme")
+  #define MSG_FILAMENT_CHANGE_UNLOAD_3        _UxGT("des Filaments...")
+  #define MSG_FILAMENT_CHANGE_INSERT_1        _UxGT("Filament einlegen")
+  #define MSG_FILAMENT_CHANGE_INSERT_2        _UxGT("und Knopf")
+  #define MSG_FILAMENT_CHANGE_INSERT_3        _UxGT("drücken...")
+  #define MSG_FILAMENT_CHANGE_HEAT_1          _UxGT("Knopf drücken um")
+  #define MSG_FILAMENT_CHANGE_HEAT_2          _UxGT("Düse aufzuheizen.")
+  #define MSG_FILAMENT_CHANGE_HEATING_1       _UxGT("Düse heizt auf...")
+  #define MSG_FILAMENT_CHANGE_HEATING_2       _UxGT("Bitte warten...")
+  #define MSG_FILAMENT_CHANGE_LOAD_1          _UxGT("Warte auf")
+  #define MSG_FILAMENT_CHANGE_LOAD_2          _UxGT("Laden des")
+  #define MSG_FILAMENT_CHANGE_LOAD_3          _UxGT("Filaments")
+  #define MSG_FILAMENT_CHANGE_PURGE_1         _UxGT("Warte auf")
+  #define MSG_FILAMENT_CHANGE_PURGE_2         _UxGT("Entleeren des")
+  #define MSG_FILAMENT_CHANGE_PURGE_3         _UxGT("Filaments")
+  #define MSG_FILAMENT_CHANGE_RESUME_1        _UxGT("Warte auf")
+  #define MSG_FILAMENT_CHANGE_RESUME_2        _UxGT("Fortsetzung des")
+  #define MSG_FILAMENT_CHANGE_RESUME_3        _UxGT("Druckes...")
 #else // LCD_HEIGHT < 4
   // Up to 2 lines allowed
-  #define MSG_FILAMENT_CHANGE_INIT_1        _UxGT("Bitte warten...")
-  #define MSG_FILAMENT_CHANGE_INSERT_1      _UxGT("Laden und Klick")
-  #define MSG_FILAMENT_CHANGE_HEAT_1        _UxGT("Klick zum Heizen")
-  #define MSG_FILAMENT_CHANGE_HEATING_1     _UxGT("Heizen...")
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1      _UxGT("Entladen...")
-  #define MSG_FILAMENT_CHANGE_LOAD_1        _UxGT("Laden...")
-  #define MSG_FILAMENT_CHANGE_PURGE_1       _UxGT("Entladen...")
-  #define MSG_FILAMENT_CHANGE_RESUME_1      _UxGT("Fortsetzen...")
+  #define MSG_FILAMENT_CHANGE_INIT_1          _UxGT("Bitte warten...")
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        _UxGT("Auswerfen...")
+  #define MSG_FILAMENT_CHANGE_INSERT_1        _UxGT("Laden und Klick")
+  #define MSG_FILAMENT_CHANGE_HEATING_1       _UxGT("Heizen...")
+  #define MSG_FILAMENT_CHANGE_LOAD_1          _UxGT("Laden...")
+  #define MSG_FILAMENT_CHANGE_PURGE_1         _UxGT("Entleeren...")
+  #define MSG_FILAMENT_CHANGE_RESUME_1        _UxGT("Fortsetzen...")
 #endif // LCD_HEIGHT < 4
 
 #endif // LANGUAGE_DE_H

Marlin/language_el-gr.h

@@ -34,26 +34,26 @@
 #define DISPLAY_CHARSET_ISO10646_GREEK
 #define CHARSIZE 2
 
-#define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
-#define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")
-#define MSG_SD_REMOVED                      _UxGT("Αφαίρεση κάρτας")
+#define WELCOME_MSG                         MACHINE_NAME _UxGT(" πανέτοιμος.")
+#define MSG_SD_INSERTED                     _UxGT("Έχω καρτούλα")
+#define MSG_SD_REMOVED                      _UxGT("Ωχ! Δεν εχω καρτα")
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
 #define MSG_MAIN                            _UxGT("Βασική Οθόνη")
 #define MSG_AUTOSTART                       _UxGT("Αυτόματη εκκίνηση")
-#define MSG_DISABLE_STEPPERS                _UxGT("Απενεργοποίηση βηματιστή")
-#define MSG_AUTO_HOME                       _UxGT("Αυτομ. επαναφορά στο αρχικό σημείο")
-#define MSG_AUTO_HOME_X                     _UxGT("Αρχικό σημείο X")
-#define MSG_AUTO_HOME_Y                     _UxGT("Αρχικό σημείο Y")
-#define MSG_AUTO_HOME_Z                     _UxGT("Αρχικό σημείο Z")
+#define MSG_DISABLE_STEPPERS                _UxGT("Ελευθέρωσέ με")
+#define MSG_AUTO_HOME                       _UxGT("Πάω σπίτι")
+#define MSG_AUTO_HOME_X                     _UxGT("Αρχικό X")
+#define MSG_AUTO_HOME_Y                     _UxGT("Αρχικό Y")
+#define MSG_AUTO_HOME_Z                     _UxGT("Αρχικό Z")
 #define MSG_TMC_Z_CALIBRATION               _UxGT("Βαθμονόμηση Z")
 #define MSG_LEVEL_BED_HOMING                _UxGT("Επαναφορά στο αρχικό σημείο ΧΥΖ")
-#define MSG_LEVEL_BED_WAITING               _UxGT("Κάντε κλικ για να ξεκινήσετε")
-#define MSG_LEVEL_BED_NEXT_POINT            _UxGT("Επόμενο σημείο")
-#define MSG_LEVEL_BED_DONE                  _UxGT("Ολοκλήρωση επιπεδοποίησης!")
+#define MSG_LEVEL_BED_WAITING               _UxGT("Πάτα το κουμπί και ΦΥΓΑΜΕ!!!")
+#define MSG_LEVEL_BED_NEXT_POINT            _UxGT("Πιο πέρα")
+#define MSG_LEVEL_BED_DONE                  _UxGT("Τελείωσα, αδερφέ")
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ορισμός βασικών μετατοπίσεων")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Εφαρμόστηκαν οι μετατοπίσεις")
 #define MSG_SET_ORIGIN                      _UxGT("Ορισμός προέλευσης")
-#define MSG_PREHEAT_1                       _UxGT("Προθέρμανση PLA")
+#define MSG_PREHEAT_1                       _UxGT("Ζεσταίνω PLA")
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" όλα")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" κλίνη")
@@ -69,19 +69,19 @@
 #define MSG_EXTRUDE                         _UxGT("Εξώθηση")
 #define MSG_RETRACT                         _UxGT("Ανάσυρση")
 #define MSG_MOVE_AXIS                       _UxGT("Μετακίνηση άξονα")
-#define MSG_BED_LEVELING                    _UxGT("Επιπεδοποίηση κλίνης")
-#define MSG_LEVEL_BED                       _UxGT("Επιπεδοποίηση κλίνης")
+#define MSG_BED_LEVELING                    _UxGT("Σου ισιώνω κρεβάτι")
+#define MSG_LEVEL_BED                       _UxGT("Εδω το καλό κρεβάτι")
 #define MSG_MOVE_X                          _UxGT("Μετακίνηση X")
 #define MSG_MOVE_Y                          _UxGT("Μετακίνηση Y")
 #define MSG_MOVE_Z                          _UxGT("Μετακίνηση Z")
 #define MSG_MOVE_E                          _UxGT("Εξωθητήρας")
-#define MSG_MOVE_01MM                       _UxGT("Μετακίνηση 0,1 μμ")
-#define MSG_MOVE_1MM                        _UxGT("Μετακίνηση 1 μμ")
-#define MSG_MOVE_10MM                       _UxGT("Μετακίνηση 10 μμ")
+#define MSG_MOVE_01MM                       _UxGT("Μετακίνηση 0,1μμ")
+#define MSG_MOVE_1MM                        _UxGT("Μετακίνηση 1μμ")
+#define MSG_MOVE_10MM                       _UxGT("Μετακίνηση 10μμ")
 #define MSG_SPEED                           _UxGT("Ταχύτητα")
-#define MSG_BED_Z                           _UxGT("Κλίνη Z")
-#define MSG_NOZZLE                          _UxGT("Ακροφύσιο")
-#define MSG_BED                             _UxGT("Κλίνη")
+#define MSG_BED_Z                           _UxGT("Κρεβάτι Z")
+#define MSG_NOZZLE                          _UxGT("Μύτη")
+#define MSG_BED                             _UxGT("Κρεβάτι")
 #define MSG_FAN_SPEED                       _UxGT("Ταχύτητα ανεμιστήρα")
 #define MSG_FLOW                            _UxGT("Ροή")
 #define MSG_CONTROL                         _UxGT("Έλεγχος")
@@ -132,9 +132,9 @@
 #define MSG_E5STEPS                         _UxGT("Bήματα Ε5 ανά μμ")
 #define MSG_TEMPERATURE                     _UxGT("Θερμοκρασία")
 #define MSG_MOTION                          _UxGT("Κίνηση")
-#define MSG_FILAMENT                        _UxGT("Νήμα")
+#define MSG_FILAMENT                        _UxGT("Φιλαμεντ")
 #define MSG_VOLUMETRIC_ENABLED              _UxGT("Ε σε μμ3")
-#define MSG_FILAMENT_DIAM                   _UxGT("Διάμετρος νήματος")
+#define MSG_FILAMENT_DIAM                   _UxGT("Διάμετρος φιλαμεντ")
 #define MSG_CONTRAST                        _UxGT("Κοντράστ LCD")
 #define MSG_STORE_EEPROM                    _UxGT("Αποθήκευση")
 #define MSG_LOAD_EEPROM                     _UxGT("Φόρτωση")
@@ -142,15 +142,15 @@
 #define MSG_REFRESH                         _UxGT("Ανανέωση")
 #define MSG_WATCH                           _UxGT("Οθόνη πληροφόρησης")
 #define MSG_PREPARE                         _UxGT("Προετοιμασία")
-#define MSG_TUNE                            _UxGT("Συντονισμός")
-#define MSG_PAUSE_PRINT                     _UxGT("Παύση εκτύπωσης")
-#define MSG_RESUME_PRINT                    _UxGT("Συνέχιση εκτύπωσης")
-#define MSG_STOP_PRINT                      _UxGT("Διακοπή εκτύπωσης")
-#define MSG_CARD_MENU                       _UxGT("Εκτύπωση από SD")
-#define MSG_NO_CARD                         _UxGT("Δεν βρέθηκε SD")
+#define MSG_TUNE                            _UxGT("Ρύθμιση OTF")
+#define MSG_PAUSE_PRINT                     _UxGT("Διάλειμα")
+#define MSG_RESUME_PRINT                    _UxGT("Συνεχίζω")
+#define MSG_STOP_PRINT                      _UxGT("ΑΝΤΕ ΓΕΙΑ!!!")
+#define MSG_CARD_MENU                       _UxGT("φτιάχνω από κάρτα")
+#define MSG_NO_CARD                         _UxGT("Αδερφέ, δεν έχω κάρτα")
 #define MSG_DWELL                           _UxGT("Αναστολή λειτουργίας…")
 #define MSG_USERWAIT                        _UxGT("Αναμονή για χρήστη…")
-#define MSG_PRINT_ABORTED                   _UxGT("Διακόπτεται η εκτύπωση")
+#define MSG_PRINT_ABORTED                   _UxGT("Ως εδώ με έχεις φέρει!!")
 #define MSG_NO_MOVE                         _UxGT("Καμία κίνηση.")
 #define MSG_KILLED                          _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ")
 #define MSG_STOPPED                         _UxGT("ΔΙΑΚΟΠΗ. ")
@@ -174,14 +174,14 @@
 #define MSG_BABYSTEP_Z                      _UxGT("Μικρό βήμα Ζ")
 #define MSG_ENDSTOP_ABORT                   _UxGT("Ματαίωση endstop ")
 #define MSG_HEATING_FAILED_LCD              _UxGT("Ανεπιτυχής θέρμανση")
-#define MSG_ERR_REDUNDANT_TEMP              _UxGT("Λάθος: ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ")
+#define MSG_ERR_REDUNDANT_TEMP              _UxGT("Λάθος: ΘΑ ΜΕ ΚΑΨΕΙΣ ΗΛΗΘΙΕ")
 #define MSG_THERMAL_RUNAWAY                 _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΤΗΤΑΣ")
 #define MSG_ERR_MAXTEMP                     _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ")
 #define MSG_ERR_MINTEMP                     _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ")
-#define MSG_ERR_MAXTEMP_BED                 _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ")
-#define MSG_ERR_MINTEMP_BED                 _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ")
-#define MSG_HEATING                         _UxGT("Θερμαίνεται…")
-#define MSG_BED_HEATING                     _UxGT("Θέρμανση κλίνης…")
+#define MSG_ERR_MAXTEMP_BED                 _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΡΕΒΑΤΙΟΥ")
+#define MSG_ERR_MINTEMP_BED                 _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΡΕΒΑΤΙΟΥ")
+#define MSG_HEATING                         _UxGT("Ανάβω…")
+#define MSG_BED_HEATING                     _UxGT("Ανάβω το κρεβάτι…")
 #define MSG_DELTA_CALIBRATE                 _UxGT("Βαθμονόμηση Delta")
 #define MSG_DELTA_CALIBRATE_X               _UxGT("Βαθμονόμηση X")
 #define MSG_DELTA_CALIBRATE_Y               _UxGT("Βαθμονόμηση Y")

Marlin/language_es.h

@@ -251,25 +251,26 @@
 
 #define MSG_FILAMENT_CHANGE_NOZZLE          _UxGT("  Boquilla: ")
 
-#define MSG_FILAMENT_CHANGE_INIT_1          _UxGT("Esperando para")
+#define MSG_FILAMENT_CHANGE_INIT_1          _UxGT("Esperando iniciar")
 
-#define MSG_FILAMENT_CHANGE_INSERT_1        _UxGT("Inserte el filamento")
+#define MSG_FILAMENT_CHANGE_INSERT_1        _UxGT("Inserte filamento")
 #define MSG_FILAMENT_CHANGE_INSERT_2        _UxGT("y presione el boton")
 
 #if LCD_HEIGHT >= 4
   // Up to 3 lines allowed
-  #define MSG_FILAMENT_CHANGE_INIT_2        _UxGT("iniciar cambio")
-  #define MSG_FILAMENT_CHANGE_INIT_3        _UxGT("de filamento")
+  #define MSG_FILAMENT_CHANGE_INIT_2        _UxGT("del filamento")
+  #define MSG_FILAMENT_CHANGE_INIT_3        _UxGT("cambiar")
   #define MSG_FILAMENT_CHANGE_INSERT_3      _UxGT("para continuar...")
 #else // LCD_HEIGHT < 4
   // Up to 2 lines allowed
-  #define MSG_FILAMENT_CHANGE_INIT_2        _UxGT("iniciar cambio fil.")
+  #define MSG_FILAMENT_CHANGE_INIT_2        _UxGT("del fil. cambiar")
+  #define MSG_FILAMENT_CHANGE_INSERT_1      _UxGT("Inserte filamento")
 #endif // LCD_HEIGHT < 4
 
-#define MSG_FILAMENT_CHANGE_UNLOAD_1        _UxGT("Esperando para")
-#define MSG_FILAMENT_CHANGE_UNLOAD_2        _UxGT("expulsar filamento")
-#define MSG_FILAMENT_CHANGE_LOAD_1          _UxGT("Esperado para")
-#define MSG_FILAMENT_CHANGE_LOAD_2          _UxGT("cargar el filamento")
+#define MSG_FILAMENT_CHANGE_UNLOAD_1        _UxGT("Esperado por")
+#define MSG_FILAMENT_CHANGE_UNLOAD_2        _UxGT("filamento expulsado")
+#define MSG_FILAMENT_CHANGE_LOAD_1          _UxGT("Esperado por")
+#define MSG_FILAMENT_CHANGE_LOAD_2          _UxGT("Cargar filamento")
 #define MSG_FILAMENT_CHANGE_RESUME_1        _UxGT("Esperando imp.")
 #define MSG_FILAMENT_CHANGE_RESUME_2        _UxGT("para resumir")
 #define MSG_FILAMENT_CHANGE_HEAT_1          _UxGT("Oprima boton para")

Marlin/language_pt-br.h

@@ -369,7 +369,7 @@
 
   #define MSG_FILAMENT_CHANGE_RESUME_1        _UxGT("Esperando impressao")
   #define MSG_FILAMENT_CHANGE_RESUME_2        _UxGT("continuar")
-#else // LCD_HEIGHT < 4
+#else LCD_HEIGHT < 4
   #define MSG_FILAMENT_CHANGE_INIT_1          _UxGT("Aguarde...")
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        _UxGT("Ejetando...")
   #define MSG_FILAMENT_CHANGE_INSERT_1        _UxGT("Insira e Clique")

Marlin/pins_ANET_10.h

@@ -154,32 +154,31 @@
  */
 
 #if ENABLED(ULTRA_LCD)
-  #define LCD_SDSS         28
+  #define LCD_SDSS           28
   #if ENABLED(ADC_KEYPAD)
-    #define SERVO0_PIN     27   // free for BLTouch/3D-Touch
-    #ifndef LCD_I2C_TYPE_PCF8575
-      #define LCD_PINS_RS  28
-      #define LCD_PINS_ENABLE 29
-      #define LCD_PINS_D4  10
-      #define LCD_PINS_D5  11
-      #define LCD_PINS_D6  16
-      #define LCD_PINS_D7  17
-    #endif
-    #ifndef ADC_KEYPAD_PIN
-      #define ADC_KEYPAD_PIN 1   // Analog Input
-    #endif
+    #define SERVO0_PIN       27   // free for BLTouch/3D-Touch
+    #define LCD_PINS_RS      28
+    #define LCD_PINS_ENABLE  29
+    #define LCD_PINS_D4      10
+    #define LCD_PINS_D5      11
+    #define LCD_PINS_D6      16
+    #define LCD_PINS_D7      17
+    #define BTN_EN1          -1
+    #define BTN_EN2          -1
+    #define BTN_ENC          -1
+    #define ADC_KEYPAD_PIN    1
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(ANET_FULL_GRAPHICS_LCD)
     // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
     // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
     // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
-    #define SERVO0_PIN     29   // free for BLTouch/3D-Touch
-    #define BEEPER_PIN     17
-    #define LCD_PINS_RS    27
-    #define LCD_PINS_ENABLE 28
-    #define LCD_PINS_D4    30
-    #define BTN_EN1        11
-    #define BTN_EN2        10
-    #define BTN_ENC        16
+    #define SERVO0_PIN       29   // free for BLTouch/3D-Touch
+    #define BEEPER_PIN       17
+    #define LCD_PINS_RS      27
+    #define LCD_PINS_ENABLE  28
+    #define LCD_PINS_D4      30
+    #define BTN_EN1          11
+    #define BTN_EN2          10
+    #define BTN_ENC          16
     #ifndef ST7920_DELAY_1
       #define ST7920_DELAY_1 DELAY_NS(0)
     #endif
@@ -193,7 +192,7 @@
     #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
   #endif
 #else
-  #define SERVO0_PIN       27
+  #define SERVO0_PIN         27
 #endif
 
 /**

Marlin/pins_RAMPS.h

@@ -509,7 +509,7 @@
       #define BTN_ENC           35
 
       #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define KILL_PIN          64
 
     #elif ENABLED(MINIPANEL)
 

Marlin/pins_TRIGORILLA_14.h

@@ -95,39 +95,21 @@
 #define TEMP_BED_PIN       14
 
 // Servos
-#if TRIGORILLA_VERSION == 0 // Default Trigorilla
-  #ifdef NUM_SERVOS
-  	#define SERVO0_PIN      11
+#ifdef NUM_SERVOS
+	#define SERVO0_PIN      11
 
-  	#if NUM_SERVOS > 1
-  		#define SERVO1_PIN    6
-  	#endif
+	#if NUM_SERVOS > 1
+		#define SERVO1_PIN    6
+	#endif
 
-  	#if NUM_SERVOS > 2
-  		#define SERVO2_PIN    5
-  	#endif
+	#if NUM_SERVOS > 2
+		#define SERVO2_PIN    5
+	#endif
 
-  	#if NUM_SERVOS > 3
-  		#define SERVO3_PIN    4
-  	#endif
-  #endif
-#else // Trigorilla 1.1
-  #ifdef NUM_SERVOS
-    #define SERVO0_PIN 5
-
-    #if NUM_SERVOS > 1
-      #define SERVO1_PIN 4
-    #endif
-
-    #if NUM_SERVOS > 2
-      #define SERVO2_PIN 11
-    #endif
-
-    #if NUM_SERVOS > 3
-      #define SERVO3_PIN 6
-    #endif
-  #endif
-#endif // #if TRIGORILLA_VERSION
+	#if NUM_SERVOS > 3
+		#define SERVO3_PIN    4
+	#endif
+#endif
 
 #if defined(ANYCUBIC_TFT_MODEL) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER)
   #define BEEPER_PIN       31
@@ -155,8 +137,8 @@
 
 		#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
 
-			#define BTN_EN1 31
-			#define BTN_EN2 33
+			#define BTN_EN1 33
+			#define BTN_EN2 31
 			#define BTN_ENC 35
 
 			#elif defined(LCD_I2C_PANELOLU2)

Marlin/temperature.cpp

@@ -33,7 +33,6 @@
 #include "printcounter.h"
 #include "delay.h"
 #include "endstops.h"
-#include "buzzer.h"
 
 #if ENABLED(HEATER_0_USES_MAX6675)
   #include "MarlinSPI.h"
@@ -248,7 +247,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
    * Alternately heat and cool the nozzle, observing its behavior to
    * determine the best PID values to achieve a stable temperature.
    */
-  void Temperature::pid_autotune(const float &target, const int8_t hotend, const int8_t ncycles, const bool set_result/*=false*/) {
+  void Temperature::PID_autotune(const float &target, const int8_t hotend, const int8_t ncycles, const bool set_result/*=false*/) {
     float current = 0.0;
     int cycles = 0;
     bool heating = true;
@@ -309,7 +308,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
       return;
     }
 
-    if (target > GHV(BED_MAXTEMP, maxttemp[hotend]) - 15) {
+    if (target > GHV(BED_MAXTEMP, maxttemp[hotend]) - 10) {
       SERIAL_ECHOLNPGM(MSG_PID_TEMP_TOO_HIGH);
       return;
     }
@@ -328,7 +327,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
       const millis_t ms = millis();
 
       if (temp_meas_ready) { // temp sample ready
-        calculate_celsius_temperatures();
+        updateTemperaturesFromRawValues();
 
         // Get the current temperature and constrain it
         current = GHV(current_temperature_bed, current_temperature[hotend]);
@@ -337,7 +336,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
 
         #if HAS_AUTO_FAN
           if (ELAPSED(ms, next_auto_fan_check_ms)) {
-            check_extruder_auto_fans();
+            checkExtruderAutoFans();
             next_auto_fan_check_ms = ms + 2500UL;
           }
         #endif
@@ -457,8 +456,6 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
       }
 
       if (cycles > ncycles) {
-        buzzer.tone(105, 1108);
-        buzzer.tone(210, 1661);
         SERIAL_PROTOCOLLNPGM(MSG_PID_AUTOTUNE_FINISHED);
 
         #if HAS_PID_FOR_BOTH
@@ -486,7 +483,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS];
           PID_PARAM(Kp, hotend) = workKp; \
           PID_PARAM(Ki, hotend) = scalePID_i(workKi); \
           PID_PARAM(Kd, hotend) = scalePID_d(workKd); \
-          update_pid(); }while(0)
+          updatePID(); }while(0)
 
         // Use the result? (As with "M303 U1")
         if (set_result) {
@@ -527,7 +524,7 @@ int Temperature::getHeaterPower(const int heater) {
 
 #if HAS_AUTO_FAN
 
-  void Temperature::check_extruder_auto_fans() {
+  void Temperature::checkExtruderAutoFans() {
     static const pin_t fanPin[] PROGMEM = { E0_AUTO_FAN_PIN, E1_AUTO_FAN_PIN, E2_AUTO_FAN_PIN, E3_AUTO_FAN_PIN, E4_AUTO_FAN_PIN, CHAMBER_AUTO_FAN_PIN };
     static const uint8_t fanBit[] PROGMEM = {
                     0,
@@ -616,20 +613,25 @@ float Temperature::get_pid_output(const int8_t e) {
       pid_error[HOTEND_INDEX] = target_temperature[HOTEND_INDEX] - current_temperature[HOTEND_INDEX];
       dTerm[HOTEND_INDEX] = PID_K2 * PID_PARAM(Kd, HOTEND_INDEX) * (current_temperature[HOTEND_INDEX] - temp_dState[HOTEND_INDEX]) + float(PID_K1) * dTerm[HOTEND_INDEX];
       temp_dState[HOTEND_INDEX] = current_temperature[HOTEND_INDEX];
-
-      if (target_temperature[HOTEND_INDEX] == 0
-        || pid_error[HOTEND_INDEX] < -(PID_FUNCTIONAL_RANGE)
+      #if HEATER_IDLE_HANDLER
+        if (heater_idle_timeout_exceeded[HOTEND_INDEX]) {
+          pid_output = 0;
+          pid_reset[HOTEND_INDEX] = true;
+        }
+        else
+      #endif
+      if (pid_error[HOTEND_INDEX] > PID_FUNCTIONAL_RANGE) {
+        pid_output = BANG_MAX;
+        pid_reset[HOTEND_INDEX] = true;
+      }
+      else if (pid_error[HOTEND_INDEX] < -(PID_FUNCTIONAL_RANGE) || target_temperature[HOTEND_INDEX] == 0
         #if HEATER_IDLE_HANDLER
           || heater_idle_timeout_exceeded[HOTEND_INDEX]
         #endif
-      ) {
+        ) {
         pid_output = 0;
         pid_reset[HOTEND_INDEX] = true;
       }
-      else if (pid_error[HOTEND_INDEX] > PID_FUNCTIONAL_RANGE) {
-        pid_output = BANG_MAX;
-        pid_reset[HOTEND_INDEX] = true;
-      }
       else {
         if (pid_reset[HOTEND_INDEX]) {
           temp_iState[HOTEND_INDEX] = 0.0;
@@ -762,7 +764,7 @@ void Temperature::manage_heater() {
 
   if (!temp_meas_ready) return;
 
-  calculate_celsius_temperatures(); // also resets the watchdog
+  updateTemperaturesFromRawValues(); // also resets the watchdog
 
   #if ENABLED(HEATER_0_USES_MAX6675)
     if (current_temperature[0] > MIN(HEATER_0_MAXTEMP, MAX6675_TMAX - 1.0)) max_temp_error(0);
@@ -807,7 +809,7 @@ void Temperature::manage_heater() {
 
   #if HAS_AUTO_FAN
     if (ELAPSED(ms, next_auto_fan_check_ms)) { // only need to check fan state very infrequently
-      check_extruder_auto_fans();
+      checkExtruderAutoFans();
       next_auto_fan_check_ms = ms + 2500UL;
     }
   #endif
@@ -917,7 +919,7 @@ void Temperature::manage_heater() {
 
 // Derived from RepRap FiveD extruder::getTemperature()
 // For hot end temperature measurement.
-float Temperature::analog_to_celsius_hotend(const int raw, const uint8_t e) {
+float Temperature::analog2temp(const int raw, const uint8_t e) {
   #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
     if (e > HOTENDS)
   #else
@@ -989,7 +991,7 @@ float Temperature::analog_to_celsius_hotend(const int raw, const uint8_t e) {
 #if HAS_HEATED_BED
   // Derived from RepRap FiveD extruder::getTemperature()
   // For bed temperature measurement.
-  float Temperature::analog_to_celsius_bed(const int raw) {
+  float Temperature::analog2tempBed(const int raw) {
     #if ENABLED(HEATER_BED_USES_THERMISTOR)
       SCAN_THERMISTOR_TABLE(BEDTEMPTABLE, BEDTEMPTABLE_LEN);
     #elif ENABLED(HEATER_BED_USES_AD595)
@@ -1005,7 +1007,7 @@ float Temperature::analog_to_celsius_hotend(const int raw, const uint8_t e) {
 #if HAS_TEMP_CHAMBER
   // Derived from RepRap FiveD extruder::getTemperature()
   // For chamber temperature measurement.
-  float Temperature::analog_to_celsius_chamber(const int raw) {
+  float Temperature::analog2tempChamber(const int raw) {
     #if ENABLED(HEATER_CHAMBER_USES_THERMISTOR)
       SCAN_THERMISTOR_TABLE(CHAMBERTEMPTABLE, CHAMBERTEMPTABLE_LEN);
     #elif ENABLED(HEATER_CHAMBER_USES_AD595)
@@ -1024,22 +1026,22 @@ float Temperature::analog_to_celsius_hotend(const int raw, const uint8_t e) {
  * and this function is called from normal context
  * as it would block the stepper routine.
  */
-void Temperature::calculate_celsius_temperatures() {
+void Temperature::updateTemperaturesFromRawValues() {
   #if ENABLED(HEATER_0_USES_MAX6675)
     current_temperature_raw[0] = read_max6675();
   #endif
-  HOTEND_LOOP() current_temperature[e] = analog_to_celsius_hotend(current_temperature_raw[e], e);
+  HOTEND_LOOP() current_temperature[e] = Temperature::analog2temp(current_temperature_raw[e], e);
   #if HAS_HEATED_BED
-    current_temperature_bed = analog_to_celsius_bed(current_temperature_bed_raw);
+    current_temperature_bed = Temperature::analog2tempBed(current_temperature_bed_raw);
   #endif
   #if HAS_TEMP_CHAMBER
-    current_temperature_chamber = analog_to_celsius_chamber(current_temperature_chamber_raw);
+    current_temperature_chamber = Temperature::analog2tempChamber(current_temperature_chamber_raw);
   #endif
   #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-    redundant_temperature = analog_to_celsius_hotend(redundant_temperature_raw, 1);
+    redundant_temperature = Temperature::analog2temp(redundant_temperature_raw, 1);
   #endif
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    filament_width_meas = analog_to_mm_fil_width();
+    filament_width_meas = analog2widthFil();
   #endif
 
   #if ENABLED(USE_WATCHDOG)
@@ -1054,7 +1056,7 @@ void Temperature::calculate_celsius_temperatures() {
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
 
   // Convert raw Filament Width to millimeters
-  float Temperature::analog_to_mm_fil_width() {
+  float Temperature::analog2widthFil() {
     return current_raw_filwidth * 5.0f * (1.0f / 16383.0);
   }
 
@@ -1254,7 +1256,7 @@ void Temperature::init() {
 
   #define TEMP_MIN_ROUTINE(NR) \
     minttemp[NR] = HEATER_ ##NR## _MINTEMP; \
-    while (analog_to_celsius_hotend(minttemp_raw[NR], NR) < HEATER_ ##NR## _MINTEMP) { \
+    while (analog2temp(minttemp_raw[NR], NR) < HEATER_ ##NR## _MINTEMP) { \
       if (HEATER_ ##NR## _RAW_LO_TEMP < HEATER_ ##NR## _RAW_HI_TEMP) \
         minttemp_raw[NR] += OVERSAMPLENR; \
       else \
@@ -1262,7 +1264,7 @@ void Temperature::init() {
     }
   #define TEMP_MAX_ROUTINE(NR) \
     maxttemp[NR] = HEATER_ ##NR## _MAXTEMP; \
-    while (analog_to_celsius_hotend(maxttemp_raw[NR], NR) > HEATER_ ##NR## _MAXTEMP) { \
+    while (analog2temp(maxttemp_raw[NR], NR) > HEATER_ ##NR## _MAXTEMP) { \
       if (HEATER_ ##NR## _RAW_LO_TEMP < HEATER_ ##NR## _RAW_HI_TEMP) \
         maxttemp_raw[NR] -= OVERSAMPLENR; \
       else \
@@ -1310,7 +1312,7 @@ void Temperature::init() {
 
   #if HAS_HEATED_BED
     #ifdef BED_MINTEMP
-      while (analog_to_celsius_bed(bed_minttemp_raw) < BED_MINTEMP) {
+      while (analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) {
         #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
           bed_minttemp_raw += OVERSAMPLENR;
         #else
@@ -1319,7 +1321,7 @@ void Temperature::init() {
       }
     #endif // BED_MINTEMP
     #ifdef BED_MAXTEMP
-      while (analog_to_celsius_bed(bed_maxttemp_raw) > BED_MAXTEMP) {
+      while (analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
         #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
           bed_maxttemp_raw -= OVERSAMPLENR;
         #else

Marlin/temperature.h

@@ -318,13 +318,13 @@ class Temperature {
     /**
      * Static (class) methods
      */
-    static float analog_to_celsius_hotend(const int raw, const uint8_t e);
+    static float analog2temp(const int raw, const uint8_t e);
 
     #if HAS_HEATED_BED
-      static float analog_to_celsius_bed(const int raw);
+      static float analog2tempBed(const int raw);
     #endif
     #if HAS_TEMP_CHAMBER
-      static float analog_to_celsius_chamber(const int raw);
+      static float analog2tempChamber(const int raw);
     #endif
 
     /**
@@ -365,7 +365,7 @@ class Temperature {
     #endif
 
     #if ENABLED(FILAMENT_WIDTH_SENSOR)
-      static float analog_to_mm_fil_width();         // Convert raw Filament Width to millimeters
+      static float analog2widthFil();         // Convert raw Filament Width to millimeters
       static int8_t widthFil_to_size_ratio(); // Convert Filament Width (mm) to an extrusion ratio
     #endif
 
@@ -414,7 +414,7 @@ class Temperature {
       #if ENABLED(AUTO_POWER_CONTROL)
         powerManager.power_on();
       #endif
-      target_temperature[HOTEND_INDEX] = MIN(celsius, maxttemp[HOTEND_INDEX] - 15);
+      target_temperature[HOTEND_INDEX] = MIN(celsius, maxttemp[HOTEND_INDEX] - 10);
       #if WATCH_HOTENDS
         start_watching_heater(HOTEND_INDEX);
       #endif
@@ -449,7 +449,7 @@ class Temperature {
         #endif
         target_temperature_bed =
           #ifdef BED_MAXTEMP
-            MIN(celsius, BED_MAXTEMP - 15)
+            MIN(celsius, BED_MAXTEMP - 10)
           #else
             celsius
           #endif
@@ -489,13 +489,13 @@ class Temperature {
      * Perform auto-tuning for hotend or bed in response to M303
      */
     #if HAS_PID_HEATING
-      static void pid_autotune(const float &target, const int8_t hotend, const int8_t ncycles, const bool set_result=false);
+      static void PID_autotune(const float &target, const int8_t hotend, const int8_t ncycles, const bool set_result=false);
 
       /**
        * Update the temp manager when PID values change
        */
       #if ENABLED(PIDTEMP)
-        FORCE_INLINE static void update_pid() {
+        FORCE_INLINE static void updatePID() {
           #if ENABLED(PID_EXTRUSION_SCALING)
             last_e_position = 0;
           #endif
@@ -612,13 +612,13 @@ class Temperature {
 
     static void set_current_temp_raw();
 
-    static void calculate_celsius_temperatures();
+    static void updateTemperaturesFromRawValues();
 
     #if ENABLED(HEATER_0_USES_MAX6675)
       static int read_max6675();
     #endif
 
-    static void check_extruder_auto_fans();
+    static void checkExtruderAutoFans();
 
     static float get_pid_output(const int8_t e);
 

Marlin/ubl.cpp

@@ -210,11 +210,8 @@
       serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
     }
 
-    // Add XY_PROBE_OFFSET_FROM_EXTRUDER because probe_pt() subtracts these when
-    // moving to the xy position to be measured. This ensures better agreement between
-    // the current Z position after G28 and the mesh values.
-    const float current_xi = find_closest_x_index(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER),
-                current_yi = find_closest_y_index(current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER);
+    const float current_xi = get_cell_index_x(current_position[X_AXIS] + (MESH_X_DIST) / 2.0),
+                current_yi = get_cell_index_y(current_position[Y_AXIS] + (MESH_Y_DIST) / 2.0);
 
     if (!lcd) SERIAL_EOL();
     for (int8_t j = GRID_MAX_POINTS_Y - 1; j >= 0; j--) {

Marlin/ubl_G29.cpp

@@ -1287,8 +1287,8 @@
     out_mesh.distance = -99999.9f;
 
     // Get our reference position. Either the nozzle or probe location.
-    const float px = rx + (probe_as_reference == USE_PROBE_AS_REFERENCE ? X_PROBE_OFFSET_FROM_EXTRUDER : 0),
-                py = ry + (probe_as_reference == USE_PROBE_AS_REFERENCE ? Y_PROBE_OFFSET_FROM_EXTRUDER : 0);
+    const float px = rx - (probe_as_reference == USE_PROBE_AS_REFERENCE ? X_PROBE_OFFSET_FROM_EXTRUDER : 0),
+                py = ry - (probe_as_reference == USE_PROBE_AS_REFERENCE ? Y_PROBE_OFFSET_FROM_EXTRUDER : 0);
 
     float best_so_far = 99999.99f;
 

Marlin/ultralcd.cpp

@@ -3414,14 +3414,14 @@ void lcd_quick_feedback(const bool clear_buttons) {
         UNUSED(e);
       #endif
       PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
-      thermalManager.update_pid();
+      thermalManager.updatePID();
     }
     void copy_and_scalePID_d(int16_t e) {
       #if DISABLED(PID_PARAMS_PER_HOTEND) || HOTENDS == 1
         UNUSED(e);
       #endif
       PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
-      thermalManager.update_pid();
+      thermalManager.updatePID();
     }
     #define _DEFINE_PIDTEMP_BASE_FUNCS(N) \
       void copy_and_scalePID_i_E ## N() { copy_and_scalePID_i(N); } \
@@ -3524,7 +3524,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
       MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
       MENU_ITEM_EDIT(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
       MENU_ITEM_EDIT(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
-      MENU_ITEM_EDIT(float52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
+      MENU_ITEM_EDIT(float52, MSG_FACTOR, &planner.autotemp_factor, 0, 1);
     #endif
 
     //
@@ -5606,14 +5606,15 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
 
         #endif // LCD_HAS_DIRECTIONAL_BUTTONS
 
-        #if ENABLED(LCD_HAS_SLOW_BUTTONS)
-          newbutton |= slow_buttons;
-        #endif
         buttons = newbutton;
+        #if ENABLED(LCD_HAS_SLOW_BUTTONS)
+          buttons |= slow_buttons;
+        #endif
 
         #if ENABLED(ADC_KEYPAD)
 
           uint8_t newbutton_reprapworld_keypad = 0;
+          buttons = 0;
           if (buttons_reprapworld_keypad == 0) {
             newbutton_reprapworld_keypad = get_ADC_keyValue();
             if (WITHIN(newbutton_reprapworld_keypad, 1, 8))

README.md

@@ -4,6 +4,10 @@
 
 This is a custom version of the [Marlin Firmware](https://github.com/MarlinFirmware/Marlin) for the i3 Mega/Mega-S, gratefully based on [derhopp's repo](https://github.com/derhopp/Marlin-with-Anycubic-i3-Mega-TFT) with his remarkable efforts to get the Anycubic TFT screen to work with the latest versions of Marlin.
 
+## RepRapDiscount Full Graphic Smart Controller branch
+**This branch is prepared to be used with a 12864 display like the [RepRapDiscount Full Graphic Smart Controller](https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller).**
+
+
 Looking for a **BLtouch firmware**? Head [this way](https://github.com/MNieddu91/Marlin-AI3M-BLTouch)! Mounting and configuration instructions are included.
 
 #### Make sure to take a look at the [Wiki](https://github.com/davidramiro/Marlin-AI3M/wiki/), especially the [FAQ](https://github.com/davidramiro/Marlin-AI3M/wiki/Frequently-Asked-Questions).
@@ -338,7 +342,7 @@ Notable contributors include:
  - [[@paulusjacobus](https://github.com/paulusjacobus)]
  - [[@psavva](https://github.com/psavva)]
  - [[@Tannoo](https://github.com/Tannoo)]
- - [[@teemuatlut](https://github.com/teemuatlut)]
+ - [[@TheSFReader](https://github.com/TheSFReader)]
  - ...and many others
 
 ## License