Update 4.2.3

Fix problem redefination

MarlinKimbra/Configuration_Feature.h

-#ifndef Configuration_Feature_H
-#define Configuration_Feature_H
+#ifndef CONFIGURATION_FEATURE_H
+#define CONFIGURATION_FEATURE_H
 
 /*
  * This configuration file contains all features that can be enabled.
@@ -995,7 +995,7 @@
 //#define SDEXTRASLOW                            // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
 //#define SD_CHECK_AND_RETRY                     // Use CRC checks and retries on the SD communication
 
-// Decomment thi if you are external SD without DETECT_PIN
+// Decomment this if you are external SD without DETECT_PIN
 //#define SD_DISABLED_DETECT
 // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
 // around this by connecting a push button or single throw switch to the pin defined

MarlinKimbra/Configuration_Overall.h

 /**
  * Configuration_Overall.h
  * Here you can define all your custom settings and they will overwrite configurations in the main configuration files.
+ * Decomment or comment CONFIGURATION OVERALL ON for active or deactive this file.
  */
+
+//#define CONFIGURATION_OVERALL_ON

MarlinKimbra/Configuration_Version.h

 #ifndef CONFIGURATION_VERSION_H
   #define CONFIGURATION_VERSION_H
 
-  #define BUILD_VERSION "MarlinKimbra 4.2.2 dev"
-  #define SHORT_BUILD_VERSION "4.2.2 dev"
+  #define BUILD_VERSION "MarlinKimbra 4.2.3 dev"
+  #define SHORT_BUILD_VERSION "4.2.3 dev"
   #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
   // It might also be appropriate to define a location where additional information can be found
   #define SOURCE_CODE_URL  "https://github.com/MagoKimbra/MarlinKimbra"

MarlinKimbra/Marlin_main.cpp

@@ -5916,7 +5916,7 @@ inline void gcode_M226() {
           #endif
             srv->write(servo_position);
           #if HAS(SERVO_ENDSTOPS)
-            delay(PROBE_SERVO_DEACTIVATION_DELAY);
+            delay(SERVO_DEACTIVATION_DELAY);
             srv->detach();
           #endif
         }

MarlinKimbra/base.h

@@ -29,29 +29,30 @@
 #include "mechanics.h"
 
 #include "Configuration_Version.h"
-#include "Configuration_Basic.h"
 #include "Configuration_Overall.h"
 
-#if MECH(CARTESIAN)
+#ifndef CONFIGURATION_OVERALL_ON
+  #include "Configuration_Basic.h"
+
+  #if MECH(CARTESIAN)
     #include "Configuration_Cartesian.h"
-#elif MECH(COREXY)
+  #elif MECH(COREXY)
     #include "Configuration_Core.h"
-#elif MECH(COREXZ)
+  #elif MECH(COREXZ)
     #include "Configuration_Core.h"
-#elif MECH(DELTA)
+  #elif MECH(DELTA)
     #include "Configuration_Delta.h"
-#elif MECH(SCARA)
+  #elif MECH(SCARA)
     #include "Configuration_Scara.h"
-#endif
+  #endif
 
-#include "Configuration_Feature.h"
-#include "Configuration_Overall.h"
+  #include "Configuration_Feature.h"
+#endif
 
 #include "language/language.h"
 #include "conditionals.h"
 #include "sanitycheck.h"
 #include "thermistortables.h"
-
 #include "comunication.h"
 
 typedef unsigned long millis_t;

MarlinKimbra/conditionals.h

@@ -222,13 +222,13 @@
 #endif
 
 #include "pins.h"
-#include "Configuration_Overall.h"
 
 /**
  * DONDOLO
  */
 #if ENABLED(DONDOLO)
   #undef SINGLENOZZLE
+  #undef DRIVER_EXTRUDERS
   #define DRIVER_EXTRUDERS 1
 #endif
 
@@ -236,9 +236,11 @@
  * SINGLENOZZLE
  */
 #if ENABLED(SINGLENOZZLE)
+  #undef HOTENDS
   #define HOTENDS 1
   #undef TEMP_SENSOR_1_AS_REDUNDANT
 #else
+  #undef HOTENDS
   #define HOTENDS EXTRUDERS
 #endif
 
@@ -246,6 +248,7 @@
  * DRIVER_EXTRUDERS
  */
 #if DISABLED(MKR4) && DISABLED(NPR2) && DISABLED(DONDOLO)
+  #undef DRIVER_EXTRUDERS
   #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder
 #endif
 

MarlinKimbra/language/language_ca.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preesc."
-#define MSG_CONFIG                          "Configuració
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " llit"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA Configuracio"
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " llit"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS Configuracio"
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM Configuracio"
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Refredar"
 #define MSG_SWITCH_PS_ON                    "Switch power on"

MarlinKimbra/language/language_cn.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "\xc3\xc4"
-#define MSG_CONFIG                          "\xbe\xbf"
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " \xc5\xc6"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " \xc4\xc7"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA \xbe\xbf"
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " \xc5\xc6"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " \xbe\xc6"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS \xbe\xbf"
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " \xc5\xc6"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " \xc4\xc7"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM \xbe\xbf"
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "\xc8\xc9"
 #define MSG_SWITCH_PS_ON                    "\xb9\xcb\xca\xb3"

MarlinKimbra/language/language_da.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Forvarm"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Alle"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA conf."
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Alle"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS conf."
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " Alle"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Afkøl"
 #define MSG_SWITCH_PS_ON                    "Slå strøm til"

MarlinKimbra/language/language_de.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Vorwärmen"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA conf."
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS conf."
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Abkühlen"
 #define MSG_SWITCH_PS_ON                    "Netzteil Ein"

MarlinKimbra/language/language_en.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preheat"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA conf."
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS conf."
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Cooldown"
 #define MSG_SWITCH_PS_ON                    "Switch power on"

MarlinKimbra/language/language_es.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Precalentar"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA conf."
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS conf."
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Enfriar"
 #define MSG_SWITCH_PS_ON                    "Encender"

MarlinKimbra/language/language_eu.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Berotu"
-#define MSG_CONFIG                          "Konfig"
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Guztia"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Ohea"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA Konfig"
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Guztia"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Ohea"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS Konfig"
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " Guztia"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Ohea"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM Konfig"
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Hoztu"
 #define MSG_SWITCH_PS_ON                    "Energia piztu"

MarlinKimbra/language/language_fi.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preheat"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA conf."
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS conf."
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Jäähdytä"
 #define MSG_SWITCH_PS_ON                    "Virta päälle"

MarlinKimbra/language/language_fr.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Prech."
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Tout"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Plateau"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA conf."
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Tout"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Plateau"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS conf."
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " Tout"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Plateau"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Refroidir"
 #define MSG_SWITCH_PS_ON                    "Allumer alim."

MarlinKimbra/language/language_it.h

@@ -34,7 +34,6 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.za:"
 #define MSG_PREHEAT                         "Preriscalda"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"
 #define MSG_PREHEAT_PLA_ALL                 "Prer. PLA Tutto"
 #define MSG_PREHEAT_PLA_BEDONLY             "Prer. PLA Piatto"

MarlinKimbra/language/language_kana.h

@@ -36,7 +36,6 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preheat"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     "PLA \xd6\xc8\xc2"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " \xbd\xcd\xde\xc3"                            // " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde"                        // "Bed"

MarlinKimbra/language/language_kana_utf8.h

@@ -39,7 +39,6 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preheat"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     "PLA ヨネシ"                    // "Preheat PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " スベテ"      // " All"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " ベツド"    // "Bed"
@@ -51,7 +50,7 @@
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "セネシテイシ"                    // "Cooldown"
 #define MSG_SWITCH_PS_ON                    "デンケゾ オン"                 // "Switch power on"

MarlinKimbra/language/language_nl.h

@@ -34,7 +34,6 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preheat"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
 #define MSG_PREHEAT_PLA_ALL                 "PLA voorverw. aan"
 #define MSG_PREHEAT_PLA_BEDONLY             "PLA voorverw. Bed"
@@ -46,7 +45,7 @@
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM conf."
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Afkoelen"
 #define MSG_SWITCH_PS_ON                    "Stroom aan"

MarlinKimbra/language/language_pl.h

@@ -34,7 +34,6 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Preheat"
-#define MSG_CONFIG                          "conf."
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"
 #define MSG_PREHEAT_PLA_ALL                 "Roz. PLA Wszystko"
 #define MSG_PREHEAT_PLA_BEDONLY             "Rozgrzej PLA Loze"

MarlinKimbra/language/language_pt-br.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Pre-aq."
-#define MSG_CONFIG                          "setting"
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Tudo"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Base"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA setting"
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Tudo"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Base"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS setting"
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " Tudo"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Base"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM setting"
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Esfriar"
 #define MSG_SWITCH_PS_ON                    "Switch Power On"

MarlinKimbra/language/language_pt.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Pre-aq."
-#define MSG_CONFIG                          "definicoes"
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Tudo"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Base"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA " MSG_CONFIG
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA definicoes"
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Tudo"
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Base"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS " MSG_CONFIG
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS definicoes"
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " Tudo"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Base"
-#define MSG_PREHEAT_GUM_SETTINGS            "GUM " MSG_CONFIG
+#define MSG_PREHEAT_GUM_SETTINGS            "GUM definicoes"
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Arrefecer"
 #define MSG_SWITCH_PS_ON                    "Ligar"

MarlinKimbra/language/language_ru.h

@@ -34,19 +34,18 @@
 #define MSG_ONFOR                           "On x:"
 #define MSG_PWRCONSUMED                     "P.er:"
 #define MSG_PREHEAT                         "Преднаг"
-#define MSG_CONFIG                          "Настрой."
 #define MSG_PREHEAT_PLA                     MSG_PREHEAT " PLA"
 #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " все"
 #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Кровать"
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_CONFIG " PLA"
+#define MSG_PREHEAT_PLA_SETTINGS            "Настрой. PLA"
 #define MSG_PREHEAT_ABS                     MSG_PREHEAT " ABS"
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " все "
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Кровать"
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_CONFIG " ABS"
+#define MSG_PREHEAT_ABS_SETTINGS            "Настрой. ABS"
 #define MSG_PREHEAT_GUM                     MSG_PREHEAT " GUM"
 #define MSG_PREHEAT_GUM_ALL                 MSG_PREHEAT_GUM " All"
 #define MSG_PREHEAT_GUM_BEDONLY             MSG_PREHEAT_GUM " Bed"
-#define MSG_PREHEAT_GUM_SETTINGS            MSG_CONFIG " GUM"
+#define MSG_PREHEAT_GUM_SETTINGS            "Настрой. GUM"
 #define MSG_TOO_COLD_FOR_FILAMENTCHANGE     "Hotend too cold to change filament"
 #define MSG_COOLDOWN                        "Охлаждение"
 #define MSG_SWITCH_PS_ON                    "Switch Power On"

MarlinKimbra/pins.h

@@ -5440,20 +5440,26 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 
 
 #if X_HOME_DIR > 0    // Home X to MAX
+  #undef X_MIN_PIN
   #define X_MIN_PIN -1
 #elif X_HOME_DIR < 0  // Home X to MIN
+  #undef X_MAX_PIN
   #define X_MAX_PIN -1
 #endif //X_HOME_DIR > 0
 
 #if Y_HOME_DIR > 0    // Home Y to MAX
+  #undef Y_MIN_PIN
   #define Y_MIN_PIN -1
 #elif Y_HOME_DIR < 0  // Home Y to MIN
+  #undef Y_MAX_PIN
   #define Y_MAX_PIN -1
 #endif //Y_HOME_DIR > 0
 
 #if Z_HOME_DIR > 0    // Home Z to MAX
+  #undef Z_MIN_PIN
   #define Z_MIN_PIN -1
 #elif Z_HOME_DIR < 0  // Home Z to MIN
+  #undef Z_MAX_PIN
   #define Z_MAX_PIN -1
 #endif //Z_HOME_DIR > 0
 

MarlinKimbra/sanitycheck.h

@@ -13,26 +13,37 @@
   #if DISABLED(BAUDRATE)
     #error DEPENDENCY ERROR: Missing setting BAUDRATE
   #endif
+  #if DISABLED(STRING_CONFIG_H_AUTHOR)
+    #define STRING_CONFIG_H_AUTHOR "(none, default config)"
+  #endif
   #if DISABLED(MACHINE_UUID)
     #error DEPENDENCY ERROR: Missing setting MACHINE_UUID
   #endif
 
-  //board
+  // Board
   #if DISABLED(MOTHERBOARD)
     #error DEPENDENCY ERROR: Missing setting MOTHERBOARD
   #endif
 
-  //Mechanism
+  // Mechanism
   #if DISABLED(MECHANISM)
     #error DEPENDENCY ERROR: Missing setting MECHANISM
   #endif
 
-  //Power supply
+  // Power supply
   #if DISABLED(POWER_SUPPLY)
-    #error DEPENDENCY ERROR: Missing setting POWER_SUPPLY
+    #define POWER_SUPPLY 0
   #endif
 
-  //Thermistor
+  // Extruders
+  #if DISABLED(EXTRUDERS)
+    #error DEPENDENCY ERROR: Missing setting EXTRUDERS
+  #endif
+  #if DISABLED(DRIVER_EXTRUDERS)
+    #error DEPENDENCY ERROR: Missing setting DRIVER_EXTRUDERS
+  #endif
+
+  // Thermistor
   #if DISABLED(TEMP_SENSOR_0)
     #error DEPENDENCY ERROR: Missing setting TEMP_SENSOR_0
   #endif
@@ -50,11 +61,16 @@
   #endif
   #if (THERMISTORHEATER_0 == 998) || (THERMISTORHEATER_1 == 998) || (THERMISTORHEATER_2 == 998) || (THERMISTORHEATER_3 == 998) || (THERMISTORBED == 998) //User EXIST table
     #if DISABLED(DUMMY_THERMISTOR_998_VALUE)
-      #error DEPENDENCY ERROR: Missing setting DUMMY_THERMISTOR_998_VALUE
+      #define DUMMY_THERMISTOR_998_VALUE 25
+    #endif
+  #endif
+  #if (THERMISTORHEATER_0 == 999) || (THERMISTORHEATER_1 == 999) || (THERMISTORHEATER_2 == 999) || (THERMISTORHEATER_3 == 999) || (THERMISTORBED == 999) //User EXIST table
+    #if DISABLED(DUMMY_THERMISTOR_999_VALUE)
+      #define DUMMY_THERMISTOR_999_VALUE 25
     #endif
   #endif
 
-  //Temperature
+  // Temperature
   /**
    * Temperature defines
    */
@@ -78,7 +94,7 @@
     #if DISABLED(HEATER_1_MAXTEMP)
       #error DEPENDENCY ERROR: Missing setting HEATER_1_MAXTEMP
     #endif
-    #if DISABLED(HEATER_0_MINTEMP)
+    #if DISABLED(HEATER_1_MINTEMP)
       #error DEPENDENCY ERROR: Missing setting HEATER_1_MINTEMP
     #endif
   #endif
@@ -86,7 +102,7 @@
     #if DISABLED(HEATER_2_MAXTEMP)
       #error DEPENDENCY ERROR: Missing setting HEATER_2_MAXTEMP
     #endif
-    #if DISABLED(HEATER_0_MINTEMP)
+    #if DISABLED(HEATER_2_MINTEMP)
       #error DEPENDENCY ERROR: Missing setting HEATER_2_MINTEMP
     #endif
   #endif
@@ -94,7 +110,7 @@
     #if DISABLED(HEATER_3_MAXTEMP)
       #error DEPENDENCY ERROR: Missing setting HEATER_3_MAXTEMP
     #endif
-    #if DISABLED(HEATER_0_MINTEMP)
+    #if DISABLED(HEATER_3_MINTEMP)
       #error DEPENDENCY ERROR: Missing setting HEATER_3_MINTEMP
     #endif
   #endif
@@ -102,7 +118,7 @@
     #if DISABLED(BED_MAXTEMP)
       #error DEPENDENCY ERROR: Missing setting BED_MAXTEMP
     #endif
-    #if DISABLED(HEATER_0_MINTEMP)
+    #if DISABLED(BED_MINTEMP)
       #error DEPENDENCY ERROR: Missing setting BED_MINTEMP
     #endif
   #endif
@@ -134,22 +150,14 @@
     #error DEPENDENCY ERROR: Missing setting GUM_PREHEAT_FAN_SPEED
   #endif
 
-  //extruders
-  #if DISABLED(EXTRUDERS)
-    #error DEPENDENCY ERROR: Missing setting EXTRUDERS
-  #endif
-  #if DISABLED(DRIVER_EXTRUDERS)
-    #error DEPENDENCY ERROR: Missing setting DRIVER_EXTRUDERS
-  #endif
-
-  //Language
+  // Language
   #if DISABLED(LANGUAGE_CHOICE)
     #error DEPENDENCY ERROR: Missing setting LANGUAGE_CHOICE
   #endif
 
-  ///FEATURE
+  /// FEATURE
 
-  //Temperature
+  // Temperature
   #if DISABLED(PID_MAX)
     #error DEPENDENCY ERROR: Missing setting PID_MAX
   #endif