Update 4.2.x

MarlinKimbra/Marlin.h

@@ -25,10 +25,6 @@
 #include "Configuration_Basic.h"
 #include "pins.h"
 
-#ifndef SANITYCHECK_H
-  #error Your Configuration.h and Configuration_adv.h files are outdated!
-#endif
-
 #include "Arduino.h"
 
 typedef unsigned long millis_t;

MarlinKimbra/Marlin_main.cpp

@@ -303,12 +303,12 @@ bool target_direction;
 
 unsigned long printer_usage_seconds;
 
-#if DISABLED(DELTA)
+#if !MECH(DELTA)
   int xy_travel_speed = XY_TRAVEL_SPEED;
   float zprobe_zoffset = 0;
 #endif
 
-#if ENABLED(Z_DUAL_ENDSTOPS) && DISABLED(DELTA)
+#if ENABLED(Z_DUAL_ENDSTOPS) && !MECH(DELTA)
   float z_endstop_adj = 0;
 #endif
 
@@ -863,7 +863,7 @@ void get_command() {
 
   if (drain_queued_commands_P()) return; // priority is given to non-serial commands
 
-  #if ENABLED(NO_TIMEOUTS)
+  #if EXIST(NO_TIMEOUTS)
     static millis_t last_command_time = 0;
     millis_t ms = millis();
 
@@ -878,7 +878,7 @@ void get_command() {
   //
   while (MYSERIAL.available() > 0 && commands_in_queue < BUFSIZE) {
 
-    #if ENABLED(NO_TIMEOUTS)
+    #if EXIST(NO_TIMEOUTS)
       last_command_time = ms;
     #endif
 
@@ -3133,7 +3133,7 @@ inline void gcode_G28() {
 
         current_position[X_AXIS] = destination[X_AXIS];
         current_position[Y_AXIS] = destination[Y_AXIS];
-        #if DISABLED(SCARA)
+        #if !MECH(SCARA)
           current_position[Z_AXIS] = destination[Z_AXIS];
         #endif
 
@@ -4887,14 +4887,14 @@ inline void gcode_M105() {
   #endif
 
   ECHO_M(" " MSG_AT);
-  #if ENABLED(HOTEND_WATTS)
+  #if EXIST(HOTEND_WATTS)
     ECHO_VM((HOTEND_WATTS * getHeaterPower(target_extruder))/127, "W");
   #else
     ECHO_V(getHeaterPower(target_extruder));
   #endif
 
   ECHO_M(" " MSG_BAT);
-  #if ENABLED(BED_WATTS)
+  #if EXIST(BED_WATTS)
     ECHO_VM((BED_WATTS * getHeaterPower(-1))/127, "W");
   #else
     ECHO_V(getHeaterPower(-1));
@@ -5156,9 +5156,9 @@ inline void gcode_M140() {
           if (code_seen('H')) {
             v = code_value_short();
             #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
-              plaPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+              plaPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP);
             #else
-              plaPreheatHotendTemp = constrain(v, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+              plaPreheatHotendTemp = constrain(v, HEATER_0_MINTEMP, HEATER_0_MAXTEMP);
             #endif
           }
           if (code_seen('F')) {
@@ -5168,7 +5168,7 @@ inline void gcode_M140() {
           #if TEMP_SENSOR_BED != 0
             if (code_seen('B')) {
               v = code_value_short();
-              plaPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+              plaPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP);
             }
           #endif
           break;
@@ -5176,9 +5176,9 @@ inline void gcode_M140() {
           if (code_seen('H')) {
             v = code_value_short();
             #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
-              absPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+              absPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP);
             #else
-              absPreheatHotendTemp = constrain(v, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+              absPreheatHotendTemp = constrain(v, HEATER_0_MINTEMP, HEATER_0_MAXTEMP);
             #endif
           }
           if (code_seen('F')) {
@@ -5188,7 +5188,7 @@ inline void gcode_M140() {
           #if TEMP_SENSOR_BED != 0
             if (code_seen('B')) {
               v = code_value_short();
-              absPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+              absPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP);
             }
           #endif
           break;
@@ -5196,9 +5196,9 @@ inline void gcode_M140() {
           if (code_seen('H')) {
             v = code_value_short();
             #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
-              gumPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+              gumPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP);
             #else
-              gumPreheatHotendTemp = constrain(v, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+              gumPreheatHotendTemp = constrain(v, HEATER_0_MINTEMP, HEATER_0_MAXTEMP);
             #endif
           }
           if (code_seen('F')) {
@@ -5208,7 +5208,7 @@ inline void gcode_M140() {
           #if TEMP_SENSOR_BED != 0
             if (code_seen('B')) {
               v = code_value_short();
-              gumPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+              gumPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP);
             }
           #endif
           break;
@@ -6062,7 +6062,7 @@ inline void gcode_M503() {
 
     //retract by E
     if (code_seen('E')) destination[E_AXIS] += code_value();
-    #if ENABLED(FILAMENTCHANGE_FIRSTRETRACT)
+    #if EXIST(FILAMENTCHANGE_FIRSTRETRACT)
       else destination[E_AXIS] += FILAMENTCHANGE_FIRSTRETRACT;
     #endif
 
@@ -6070,7 +6070,7 @@ inline void gcode_M503() {
 
     //lift Z
     if (code_seen('Z')) destination[Z_AXIS] += code_value();
-    #if ENABLED(FILAMENTCHANGE_ZADD)
+    #if EXIST(FILAMENTCHANGE_ZADD)
       else destination[Z_AXIS] += FILAMENTCHANGE_ZADD;
     #endif
 
@@ -6078,19 +6078,19 @@ inline void gcode_M503() {
 
     //move xy
     if (code_seen('X')) destination[X_AXIS] = code_value();
-    #if ENABLED(FILAMENTCHANGE_XPOS)
+    #if EXIST(FILAMENTCHANGE_XPOS)
       else destination[X_AXIS] = FILAMENTCHANGE_XPOS;
     #endif
 
     if (code_seen('Y')) destination[Y_AXIS] = code_value();
-    #if ENABLED(FILAMENTCHANGE_YPOS)
+    #if EXIST(FILAMENTCHANGE_YPOS)
       else destination[Y_AXIS] = FILAMENTCHANGE_YPOS;
     #endif
 
     RUNPLAN
 
     if (code_seen('L')) destination[E_AXIS] += code_value();
-    #if ENABLED(FILAMENTCHANGE_FINALRETRACT)
+    #if EXIST(FILAMENTCHANGE_FINALRETRACT)
       else destination[E_AXIS] += FILAMENTCHANGE_FINALRETRACT;
     #endif
 
@@ -6341,13 +6341,13 @@ inline void gcode_M907() {
     if (code_seen('B')) digipot_current(4, code_value());
     if (code_seen('S')) for (int i=0; i<=4; i++) digipot_current(i, code_value());
   #endif
-  #if ENABLED(MOTOR_CURRENT_PWM_XY_PIN)
+  #if EXIST(MOTOR_CURRENT_PWM_XY_PIN)
     if (code_seen('X')) digipot_current(0, code_value());
   #endif
-  #if ENABLED(MOTOR_CURRENT_PWM_Z_PIN)
+  #if EXIST(MOTOR_CURRENT_PWM_Z_PIN)
     if (code_seen('Z')) digipot_current(1, code_value());
   #endif
-  #if ENABLED(MOTOR_CURRENT_PWM_E_PIN)
+  #if EXIST(MOTOR_CURRENT_PWM_E_PIN)
     if (code_seen('E')) digipot_current(2, code_value());
   #endif
   #if ENABLED(DIGIPOT_I2C)

MarlinKimbra/conditionals.h

@@ -108,11 +108,11 @@
   #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
   #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
 
-  #if DISABLED(ENCODER_PULSES_PER_STEP)
+  #if NOTEXIST(ENCODER_PULSES_PER_STEP)
     #define ENCODER_PULSES_PER_STEP 4
   #endif
 
-  #if DISABLED(ENCODER_STEPS_PER_MENU_ITEM)
+  #if NOTEXIST(ENCODER_STEPS_PER_MENU_ITEM)
     #define ENCODER_STEPS_PER_MENU_ITEM 1
   #endif
 
@@ -204,7 +204,7 @@
 /**
  * Default LCD contrast for dogm-like LCD displays
  */
-#if ENABLED(DOGLCD) && DISABLED(DEFAULT_LCD_CONTRAST)
+#if ENABLED(DOGLCD) && NOTEXIST(DEFAULT_LCD_CONTRAST)
   #define DEFAULT_LCD_CONTRAST 32
 #endif
 
@@ -369,7 +369,7 @@
 /**
  * Servo Leveling
  */
-#define SERVO_LEVELING (ENABLED(SERVO_ENDSTOPS) && ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE))
+//#define SERVO_LEVELING (ENABLED(SERVO_ENDSTOPS) && ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE))
 
 /**
  * Sled Options
@@ -427,7 +427,7 @@
  * Power Signal Control Definitions
  * By default use Normal definition
  */
-#if DISABLED(POWER_SUPPLY)
+#if NOTEXIST(POWER_SUPPLY)
   #define POWER_SUPPLY 0
 #endif
 #if (POWER_SUPPLY == 1)     // 1 = ATX
@@ -556,7 +556,7 @@
 #define HAS_AUTO_FAN (HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3)
 #define HAS_FAN (PIN_EXISTS(FAN))
 #define HAS_CONTROLLERFAN (ENABLED(CONTROLLERFAN) && PIN_EXISTS(CONTROLLERFAN))
-#define HAS_SERVOS (ENABLED(NUM_SERVOS) && NUM_SERVOS > 0)
+#define HAS_SERVOS (ENABLED(ENABLE_SERVOS) && NUM_SERVOS > 0)
 #define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
 #define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
 #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))

MarlinKimbra/configuration_basic.h

@@ -2,7 +2,7 @@
 #define CONFIGURATION_H
 
 #include "macros.h"
-#include "Default_Version.h"
+#include "default_version.h"
 
 /*
  * This configuration file contains basic settings.
@@ -255,8 +255,9 @@
 #include "Configuration_Feature.h"
 #include "Configuration_Overall.h"
 
-#include "thermistortables.h"
 #include "conditionals.h"
+#include "thermistortables.h"
+#include "language.h"
 #include "pins.h"
 #include "dependencies.h"
 #include "conflicts.h"

MarlinKimbra/configuration_feature.h

@@ -412,7 +412,7 @@
  * when the target temperature is less than IDLE_OOZING_MINTEMP and    *
  * the actual temperature is greater than IDLE_OOZING_MINTEMP.         *
  *                                                                     *
- * PS: Always remember to set your extruder target temperature to 0°C  *
+ * PS: Always remember to set your extruder target temperature to 0°C  *
  * before shoudown the printer if you enable this feature.             *
  *                                                                     *
  * Uncomment IDLE_OOZING_PREVENT to enable this feature                *
@@ -648,6 +648,7 @@
 /***********************************************************************
  **************************** R/C Servo ********************************
  **********************************************************************/
+//#define ENABLE_SERVOS
 // Number of servos
 // If you select a configuration below, this will receive a default value and does not need to be set manually
 // set it manually if you have more servos than extruders and wish to manually control some
@@ -1131,7 +1132,6 @@
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
-#define LCD_MAX_TEMP_OFFSET -15
 
 //Display Voltage Logic Selector on Alligator Board
 //#define UI_VOLTAGE_LEVEL 0 // 3.3 V

MarlinKimbra/configuration_store.cpp

@@ -158,7 +158,7 @@ void Config_StoreSettings() {
   EEPROM_WRITE_VAR(i, max_e_jerk);
   EEPROM_WRITE_VAR(i, home_offset);
 
-  #if DISABLED(DELTA)
+  #if !MECH(DELTA)
     EEPROM_WRITE_VAR(i, zprobe_zoffset);
   #endif
 
@@ -295,7 +295,7 @@ void Config_RetrieveSettings() {
     EEPROM_READ_VAR(i, max_e_jerk);
     EEPROM_READ_VAR(i, home_offset);
 
-    #if DISABLED(DELTA)
+    #if !MECH(DELTA)
       EEPROM_READ_VAR(i, zprobe_zoffset);
     #endif
 

MarlinKimbra/conficts.h → MarlinKimbra/conflicts.h

@@ -88,7 +88,7 @@
   #if NUM_SERVOS > 4
     #error CONFLICT ERROR: The maximum number of SERVOS in Marlin is 4.
   #endif
-  #if ENABLED(NUM_SERVOS) && NUM_SERVOS > 0
+  #if NUM_SERVOS > 0
     #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0
       #if X_ENDSTOP_SERVO_NR >= NUM_SERVOS
         #error CONFLICT ERROR: X_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS.
@@ -136,26 +136,26 @@
      * Require a Z Probe Pin if Z_PROBE_ENDSTOP is enabled.
      */
     #if ENABLED(Z_PROBE_ENDSTOP)
-      #if DISABLED(Z_PROBE_PIN)
+      #if NOTEXIST(Z_PROBE_PIN)
         #error CONFLICT ERROR: You must have a Z_PROBE_PIN defined in pins2tool.h file if you enable Z_PROBE_ENDSTOP.
         #erro sistema pins2tool.h
       #endif
       #if Z_PROBE_PIN == -1
         #error CONFLICT ERROR: You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP.
       #endif
-// Forcing Servo definitions can break some hall effect sensor setups. Leaving these here for further comment.
-//      #if DISABLED(NUM_SERVOS)
-//        #error CONFLICT ERROR: You must have NUM_SERVOS defined and there must be at least 1 configured to use Z_PROBE_ENDSTOP.
-//      #endif
-//      #if ENABLED(NUM_SERVOS) && NUM_SERVOS < 1
-//        #error CONFLICT ERROR: You must have at least 1 servo defined for NUM_SERVOS to use Z_PROBE_ENDSTOP.
-//      #endif
-//      #if Z_ENDSTOP_SERVO_NR < 0
-//        #error CONFLICT ERROR: You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_PROBE_ENDSTOP.
-//      #endif
-//      #if DISABLED(ERVO_ENDSTOP_ANGLES)
-//        #error CONFLICT ERROR: You must have SERVO_ENDSTOP_ANGLES defined for Z Extend and Retract to use Z_PROBE_ENDSTOP.
-//      #endif
+
+        #if DISABLED(ENABLE_SERVOS)
+          #error CONFLICT ERROR: You must enable ENABLE_SERVOS and must have NUM_SERVOS defined and there must be at least 1 configured to use Z_PROBE_ENDSTOP.
+        #endif
+        #if NUM_SERVOS < 1
+          #error CONFLICT ERROR: You must have at least 1 servo defined for NUM_SERVOS to use Z_PROBE_ENDSTOP.
+        #endif
+        #if Z_ENDSTOP_SERVO_NR < 0
+          #error CONFLICT ERROR: You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_PROBE_ENDSTOP.
+        #endif
+        #if NOTEXIST(SERVO_ENDSTOP_ANGLES)
+          #error CONFLICT ERROR: You must have SERVO_ENDSTOP_ANGLES defined for Z Extend and Retract to use Z_PROBE_ENDSTOP.
+        #endif
     #endif
     /**
      * Check if Probe_Offset * Grid Points is greater than Probing Range
@@ -210,7 +210,7 @@
    * Delta & Z_PROBE_ENDSTOP
    */
   #if MECH(DELTA) && ENABLED(Z_PROBE_ENDSTOP)
-    #if DISABLED(Z_PROBE_PIN)
+    #if NOTEXIST(Z_PROBE_PIN)
       #error CONFLICT ERROR: You must have a Z_PROBE_PIN defined in your pins2tool.h file if you enable Z_PROBE_ENDSTOP
     #endif
     #if Z_PROBE_PIN == -1
@@ -224,7 +224,7 @@
   #if ENABLED(DUAL_X_CARRIAGE)
     #if EXTRUDERS == 1 || MECH(COREXY) \
         || HASNT(X2_ENABLE) || HASNT(X2_STEP) || HASNT(X2_DIR) \
-        || DISABLED(X2_HOME_POS) || DISABLED(X2_MIN_POS) || DISABLED(X2_MAX_POS) \
+        || NOTEXIST(X2_HOME_POS) || NOTEXIST(X2_MIN_POS) || NOTEXIST(X2_MAX_POS) \
         || HASNT(X_MAX)
       #error CONFLICT ERROR: Missing or invalid definitions for DUAL_X_CARRIAGE mode.
     #endif

MarlinKimbra/firmware_test.h

@@ -28,7 +28,7 @@ void FirmwareTest()
 
     ECHO_EM(" ");
     ECHO_EM("***** ENDSTOP X *****");
-    #if ENABLED(X_MIN_PIN) && X_MIN_PIN > -1 && X_HOME_DIR == -1
+    #if EXIST(X_MIN_PIN) && X_MIN_PIN > -1 && X_HOME_DIR == -1
       if (!READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING) {
         ECHO_M("MIN ENDSTOP X: ");
         ECHO_EV(MSG_ENDSTOP_OPEN);
@@ -70,7 +70,7 @@ void FirmwareTest()
         ECHO_EV(MSG_FWTEST_ENDSTOP_ERR);
         return;
       }
-    #elif ENABLED(X_MAX_PIN) && X_MAX_PIN > -1 && X_HOME_DIR == 1
+    #elif EXIST(X_MAX_PIN) && X_MAX_PIN > -1 && X_HOME_DIR == 1
       if (!READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING) {
         ECHO_M("MAX ENDSTOP X: ");
         ECHO_EV(MSG_ENDSTOP_OPEN);
@@ -126,7 +126,7 @@ void FirmwareTest()
 
     ECHO_EM(" ");
     ECHO_EM("***** ENDSTOP Y *****");
-    #if ENABLED(Y_MIN_PIN) && Y_MIN_PIN > -1 && Y_HOME_DIR == -1
+    #if EXIST(Y_MIN_PIN) && Y_MIN_PIN > -1 && Y_HOME_DIR == -1
       if (!READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){
         ECHO_M("MIN ENDSTOP Y: ");
         ECHO_EV(MSG_ENDSTOP_OPEN);
@@ -168,7 +168,7 @@ void FirmwareTest()
         ECHO_EV(MSG_FWTEST_ENDSTOP_ERR);
         return;
       }
-    #elif ENABLED(Y_MAX_PIN) && Y_MAX_PIN > -1 && Y_HOME_DIR == 1
+    #elif EXIST(Y_MAX_PIN) && Y_MAX_PIN > -1 && Y_HOME_DIR == 1
       if (!READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){
         ECHO_M("MAX ENDSTOP Y: ");
         ECHO_EV(MSG_ENDSTOP_OPEN);
@@ -224,7 +224,7 @@ void FirmwareTest()
 
     ECHO_EM(" ");
     ECHO_EM("***** ENDSTOP Z *****");
-    #if ENABLED(Z_MIN_PIN) && Z_MIN_PIN > -1 && Z_HOME_DIR == -1
+    #if EXIST(Z_MIN_PIN) && Z_MIN_PIN > -1 && Z_HOME_DIR == -1
       if (!READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){
         ECHO_M("MIN ENDSTOP Z: ");
         ECHO_EV(MSG_ENDSTOP_OPEN);
@@ -266,7 +266,7 @@ void FirmwareTest()
         ECHO_EV(MSG_FWTEST_ENDSTOP_ERR);
         return;
       }
-    #elif ENABLED(Z_MAX_PIN) && Z_MAX_PIN > -1 && Z_HOME_DIR == 1
+    #elif EXIST(Z_MAX_PIN) && Z_MAX_PIN > -1 && Z_HOME_DIR == 1
       if (!READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){
         ECHO_M("MAX ENDSTOP Z: ");
         ECHO_EV(MSG_ENDSTOP_OPEN);

MarlinKimbra/language.h

 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#include "Configuration_Basic.h"
-
 // NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
 //
 //   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration_Basic.h"
@@ -25,11 +23,11 @@
 // 13 Basque-Euskera
 // 14 Portuguese (Brazil)
 
-#if DISABLED(LANGUAGE_CHOICE)
+#if NOTEXIST(LANGUAGE_CHOICE)
   #define LANGUAGE_CHOICE 7  // Pick your language from the list above
 #endif
 
-#include "Default_Version.h"
+#include "default_version.h"
 
 #define PROTOCOL_VERSION "1.0"
 
@@ -49,20 +47,20 @@
 #elif MB(SAV_MKI)
   #define MACHINE_NAME "SAV MkI"
   #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
-#elif DISABLED(MACHINE_NAME)
+#elif NOTEXIST(MACHINE_NAME)
   #define MACHINE_NAME "3D Printer"
 #endif
 
-#if ENABLED(CUSTOM_MACHINE_NAME)
+#if EXIST(CUSTOM_MACHINE_NAME)
   #undef MACHINE_NAME
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
 #endif
 
-#if DISABLED(SOURCE_CODE_URL)
+#if NOTEXIST(SOURCE_CODE_URL)
   #define SOURCE_CODE_URL "https://github.com/MagoKimbra/MarlinKimbra"
 #endif
 
-#if DISABLED(BUILD_VERSION)
+#if NOTEXIST(BUILD_VERSION)
   #define BUILD_VERSION "V4; MarlinKimbra for 4 extruder"
 #endif
 

MarlinKimbra/macros.h

@@ -24,6 +24,8 @@
 #define SWITCH_ENABLED_  1
 #define ENABLED(b) _CAT(SWITCH_ENABLED_, b)
 #define DISABLED(b) (!_CAT(SWITCH_ENABLED_, b))
+#define EXIST(b) defined(EXIST)
+#define NOTEXIST(b) (!defined(EXIST))
 
 #define COUNT(a) (sizeof(a)/sizeof(*a))
 

MarlinKimbra/pins.h

@@ -73,8 +73,6 @@
 #ifndef PINS_H
 #define PINS_H
 
-#include "boards.h"
-
 // Preset optional pins
 #define X_MS1_PIN     -1
 #define X_MS2_PIN     -1
@@ -188,7 +186,7 @@
     #error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu.
   #endif
   
-  #if DISABLED(GEN7_VERSION)
+  #if NOTEXIST(GEN7_VERSION)
     #define GEN7_VERSION   12  // v1.x
   #endif
   
@@ -263,7 +261,7 @@
     #error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu.
   #endif
   
-  #if DISABLED(GEN7_VERSION)
+  #if NOTEXIST(GEN7_VERSION)
     #define GEN7_VERSION   13  // v1.x
   #endif
   
@@ -504,7 +502,7 @@
     #error Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu.
   #endif
   
-  #if DISABLED(GEN7_VERSION)
+  #if NOTEXIST(GEN7_VERSION)
   #define GEN7_VERSION 12 // v1.x
   #endif
   
@@ -2122,21 +2120,18 @@
 
 
 
-  #if ENABLED(NUM_SERVOS)
+  #if NUM_SERVOS > 0
     #define SERVO0_PIN           5
-
     #if NUM_SERVOS > 1
       #define SERVO1_PIN         6
-    #endif
-
       #if NUM_SERVOS > 2
         #define SERVO2_PIN      39
-    #endif
-
         #if NUM_SERVOS > 3
           #define SERVO3_PIN    40
         #endif
       #endif
+    #endif
+  #endif
 
 
 #if ENABLED(ULTRA_LCD)
@@ -2262,22 +2257,17 @@
 #define ORIG_TEMP_3_PIN              -1   // ANALOG NUMBERING
 #define TEMP_4_PIN                   -1   // ANALOG NUMBERING
 
-
-
-#if ENABLED(NUM_SERVOS)
+#if NUM_SERVOS > 0
   #define SERVO0_PIN                 11
-
   #if NUM_SERVOS > 1
     #define SERVO1_PIN                6
-  #endif
-
     #if NUM_SERVOS > 2
       #define SERVO2_PIN              5
-  #endif
-
       #if NUM_SERVOS > 3
         #define SERVO3_PIN            4
       #endif
+    #endif
+  #endif
 #endif
 
 #if ENABLED(ULTRA_LCD)
@@ -2577,21 +2567,18 @@
      
 #endif //REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 
-  #if ENABLED(NUM_SERVOS)
+#if NUM_SERVOS > 0
   #define SERVO0_PIN          36
-
   #if NUM_SERVOS > 1
     #define SERVO1_PIN        40
-    #endif
-
     #if NUM_SERVOS > 2
       #define SERVO2_PIN      41
-    #endif
-
       #if NUM_SERVOS > 3
         #define SERVO3_PIN    -1
       #endif
     #endif
+  #endif
+#endif
 
 #endif //ALLIGATOR
 /****************************************************************************************/
@@ -2670,18 +2657,15 @@
 
 #if NUM_SERVOS > 0
   #define SERVO0_PIN            -1
-#endif
-
-#if NUM_SERVOS > 1
+  #if NUM_SERVOS > 1
     #define SERVO1_PIN          -1
-#endif
-
-#if NUM_SERVOS > 2
+    #if NUM_SERVOS > 2
       #define SERVO2_PIN        -1
-#endif
-
-#if NUM_SERVOS > 3
+      #if NUM_SERVOS > 3
         #define SERVO3_PIN      -1
+      #endif
+    #endif
+  #endif
 #endif
 
 #define PS_ON_PIN          -1
@@ -2867,16 +2851,17 @@
   #define SERVO0_PIN            11
 #endif
 
-#if NUM_SERVOS > 1
+#if NUM_SERVOS > 0
+  #define SERVO0_PIN            11
+  #if NUM_SERVOS > 1
     #define SERVO1_PIN           6
-#endif
-
-#if NUM_SERVOS > 2
+    #if NUM_SERVOS > 2
       #define SERVO2_PIN         5
-#endif
-
-#if NUM_SERVOS > 3
+      #if NUM_SERVOS > 3
         #define SERVO3_PIN       4
+      #endif
+    #endif
+  #endif
 #endif
 
 #if ENABLED(TEMP_STAT_LEDS)
@@ -3069,7 +3054,7 @@
 
 #define ORIG_TEMP_BED_PIN       14   // ANALOG NUMBERING
 
-#if ENABLED(NUM_SERVOS)
+#if NUM_SERVOS > 0
   #define SERVO0_PIN            47
   #if NUM_SERVOS > 1
     #define SERVO1_PIN          -1
@@ -3983,18 +3968,15 @@
 
 #if NUM_SERVOS > 0
   #define SERVO0_PIN             11
-#endif
-
-#if NUM_SERVOS > 1
+  #if NUM_SERVOS > 1
     #define SERVO1_PIN            6
-#endif
-
-#if NUM_SERVOS > 2
+    #if NUM_SERVOS > 2
       #define SERVO2_PIN          5
-#endif
-
-#if NUM_SERVOS > 3
+      #if NUM_SERVOS > 3
         #define SERVO3_PIN        4
+      #endif
+    #endif
+  #endif
 #endif
 
 #define BEEPER_PIN               33
@@ -4109,18 +4091,15 @@
 
 #if NUM_SERVOS > 0
   #define SERVO0_PIN             11
-#endif
-
-#if NUM_SERVOS > 1
+  #if NUM_SERVOS > 1
     #define SERVO1_PIN            6
-#endif
-
-#if NUM_SERVOS > 2
+    #if NUM_SERVOS > 2
       #define SERVO2_PIN          5
-#endif
-
-#if NUM_SERVOS > 3
+      #if NUM_SERVOS > 3
         #define SERVO3_PIN        4
+      #endif
+    #endif
+  #endif
 #endif
 
 #define BEEPER_PIN                   33
@@ -4525,7 +4504,7 @@
 #define KILL_PIN           42 // A2 = 42 - teensy = 40
 #define HOME_PIN          -1 // A4 = marlin 44 - teensy = 42
 
-#if ENABLED(NUM_SERVOS)
+#if NUM_SERVOS > 0
   #define SERVO0_PIN       41 // In teensy's pin definition for pinMode (in Servo.cpp)
 #endif
 
@@ -5112,9 +5091,6 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 ********************************* END MOTHERBOARD ***************************************
 /****************************************************************************************/
 
-#if DISABLED(KNOWN_BOARD)
-  #error Unknown MOTHERBOARD value in configuration.h
-#endif
 
 #ifndef ORIG_HEATER_1_PIN
   #define ORIG_HEATER_1_PIN -1

MarlinKimbra/stepper.cpp

@@ -673,7 +673,7 @@ ISR(TIMER1_COMPA_vect) {
         STEP_START(e,E);
       #endif
 
-      #if ENABLED(STEPPER_HIGH_LOW_DELAY) && STEPPER_HIGH_LOW_DELAY > 0
+      #if EXIST(STEPPER_HIGH_LOW_DELAY) && STEPPER_HIGH_LOW_DELAY > 0
         delayMicroseconds(STEPPER_HIGH_LOW_DELAY);
       #endif
 
@@ -1187,7 +1187,7 @@ void quickStop() {
 
       case Z_AXIS: {
 
-        #if DISABLED(DELTA)
+        #if !MECH(DELTA)
 
           BABYSTEP_AXIS(z, Z, BABYSTEP_INVERT_Z);
 

MarlinKimbra/temperature.cpp

@@ -154,10 +154,10 @@ static int minttemp_raw[HOTENDS] = ARRAY_BY_HOTENDS( HEATER_0_RAW_LO_TEMP , HEAT
 static int maxttemp_raw[HOTENDS] = ARRAY_BY_HOTENDS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP);
 static int minttemp[HOTENDS] = { 0 };
 static int maxttemp[HOTENDS] = ARRAY_BY_HOTENDS1( 16383 );
-#if ENABLED(BED_MINTEMP)
+#if EXIST(BED_MINTEMP)
   static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP;
 #endif
-#if ENABLED(BED_MAXTEMP)
+#if EXIST(BED_MAXTEMP)
   static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP;
 #endif
 

MarlinKimbra/thermistortables.h

@@ -1080,7 +1080,7 @@ const short temptable_1047[][2] PROGMEM = {
 #endif
 
 
-#define _TT_NAME(_N) temptable_ # #_N
+#define _TT_NAME(_N) temptable_ ## _N
 #define TT_NAME(_N) _TT_NAME(_N)
 
 #if ENABLED(THERMISTORHEATER_0)

MarlinKimbra/ultralcd.cpp

@@ -12,7 +12,7 @@ int8_t encoderDiff; // updated from interrupt context and added to encoderPositi
 bool encoderRateMultiplierEnabled;
 int32_t lastEncoderMovementMillis;
 
-#if DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+#if !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
   int  pageShowInfo = 0;
   void set_pageShowInfo(int value){ pageShowInfo = value; }
 #endif
@@ -84,7 +84,7 @@ static void lcd_status_screen();
   
   #if MECH(DELTA)
     static void lcd_delta_calibrate_menu();
-  #elif DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+  #elif !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
     static void lcd_level_bed();
     static void config_lcd_level_bed();
   #endif // DELTA
@@ -118,17 +118,17 @@ static void lcd_status_screen();
   #define ENCODER_FEEDRATE_DEADZONE 10
 
   #if DISABLED(LCD_I2C_VIKI)
-    #if DISABLED(ENCODER_STEPS_PER_MENU_ITEM)
+    #if NOTEXIST(ENCODER_STEPS_PER_MENU_ITEM)
       #define ENCODER_STEPS_PER_MENU_ITEM 5
     #endif
-    #if DISABLED(ENCODER_PULSES_PER_STEP)
+    #if NOTEXIST(ENCODER_PULSES_PER_STEP)
       #define ENCODER_PULSES_PER_STEP 1
     #endif
   #else
-    #if DISABLED(ENCODER_STEPS_PER_MENU_ITEM)
+    #if NOTEXIST(ENCODER_STEPS_PER_MENU_ITEM)
       #define ENCODER_STEPS_PER_MENU_ITEM 2 // VIKI LCD rotary encoder uses a different number of steps per rotation
     #endif
-    #if DISABLED(ENCODER_PULSES_PER_STEP)
+    #if NOTEXIST(ENCODER_PULSES_PER_STEP)
       #define ENCODER_PULSES_PER_STEP 1
     #endif
   #endif
@@ -547,19 +547,19 @@ static void lcd_tune_menu() {
   MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
   MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
   #if TEMP_SENSOR_0 != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 0", &target_temperature[0], 0, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 0", &target_temperature[0], 0, HEATER_0_MAXTEMP);
   #endif
   #if TEMP_SENSOR_1 != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 1", &target_temperature[1], 0, HEATER_1_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 1", &target_temperature[1], 0, HEATER_1_MAXTEMP);
   #endif
   #if TEMP_SENSOR_2 != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[2], 0, HEATER_2_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[2], 0, HEATER_2_MAXTEMP);
   #endif
   #if TEMP_SENSOR_3 != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[3], 0, HEATER_3_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[3], 0, HEATER_3_MAXTEMP);
   #endif
   #if TEMP_SENSOR_BED != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP);
   #endif
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
   MENU_ITEM_EDIT(int3, MSG_FLOW " 0", &extruder_multiplier[0], 10, 999);
@@ -775,7 +775,7 @@ static void lcd_prepare_motion_menu() {
   #if ENABLED(AUTO_BED_LEVELING_FEATURE)
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS])
       MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G29"));
-  #elif DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+  #elif !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
     MENU_ITEM(submenu, MSG_MBL_SETTING, config_lcd_level_bed);
   #endif
 
@@ -843,14 +843,14 @@ static void lcd_prepare_temperature_menu() {
   // Nozzle, Nozzle 2, Nozzle 3, Nozzle 4
   //
   #if TEMP_SENSOR_0 != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 0", &target_temperature[0], 0, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 0", &target_temperature[0], 0, HEATER_0_MAXTEMP);
   #endif
   #if HOTENDS > 1 && TEMP_SENSOR_1 != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 1", &target_temperature[1], 0, HEATER_1_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 1", &target_temperature[1], 0, HEATER_1_MAXTEMP);
     #if HOTENDS > 2 && TEMP_SENSOR_2 != 0
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[2], 0, HEATER_2_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[2], 0, HEATER_2_MAXTEMP);
       #if HOTENDS > 3 && TEMP_SENSOR_3 != 0
-        MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[3], 0, HEATER_3_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+        MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[3], 0, HEATER_3_MAXTEMP);
       #endif // HOTENDS > 3
     #endif // HOTENDS > 2
   #endif // HOTENDS > 1
@@ -859,7 +859,7 @@ static void lcd_prepare_temperature_menu() {
   // Bed
   //
   #if TEMP_SENSOR_BED != 0
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP);
   #endif
 
   //
@@ -1119,8 +1119,8 @@ static void lcd_control_temperature_menu() {
   //
   #if ENABLED(AUTOTEMP) && (TEMP_SENSOR_0 != 0)
     MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled);
-    MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
-    MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP);
+    MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP);
     MENU_ITEM_EDIT(float32, MSG_FACTOR, &autotemp_factor, 0.0, 1.0);
   #endif
 
@@ -1198,10 +1198,10 @@ static void lcd_control_temperature_preheat_pla_settings_menu() {
   MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
   MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &plaPreheatFanSpeed, 0, 255);
   #if TEMP_SENSOR_0 != 0
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP);
   #endif
   #if TEMP_SENSOR_BED != 0
-    MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP);
   #endif
   #if ENABLED(EEPROM_SETTINGS)
     MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
@@ -1219,10 +1219,10 @@ static void lcd_control_temperature_preheat_abs_settings_menu() {
   MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
   MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &absPreheatFanSpeed, 0, 255);
   #if TEMP_SENSOR_0 != 0
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP);
   #endif
   #if TEMP_SENSOR_BED != 0
-    MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP);
   #endif
   #if ENABLED(EEPROM_SETTINGS)
     MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
@@ -1240,10 +1240,10 @@ static void lcd_control_temperature_preheat_gum_settings_menu() {
   MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
   MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &gumPreheatFanSpeed, 0, 255);
   #if TEMP_SENSOR_0 != 0
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE, &gumPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE, &gumPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP);
   #endif
   #if TEMP_SENSOR_BED != 0
-    MENU_ITEM_EDIT(int3, MSG_BED, &gumPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP + LCD_MAX_TEMP_OFFSET);
+    MENU_ITEM_EDIT(int3, MSG_BED, &gumPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP);
   #endif
   #if ENABLED(EEPROM_SETTINGS)
     MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
@@ -1837,7 +1837,7 @@ void lcd_update() {
 
       // Return to Status Screen after a timeout
       if (currentMenu != lcd_status_screen &&
-        #if DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+        #if !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
           currentMenu != lcd_level_bed &&
         #endif
         millis() > return_to_status_ms
@@ -2303,7 +2303,7 @@ char *ftostr52(const float &x) {
   return conv;
 }
 
-#if DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+#if !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
 
   static void lcd_level_bed() {
 

MarlinKimbra/ultralcd.h

@@ -29,7 +29,7 @@
     void lcd_setcontrast(uint8_t value);
   #endif
 
-  #if DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+  #if !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
     void set_pageShowInfo(int value);
   #endif