Update 4.2.X apha

Code clean

MarlinKimbra/Configuration_Cartesian.h

 #ifndef CONFIGURATION_MECHANISM
 #define CONFIGURATION_MECHANISM
-
+#define KNOWN_MECH 1
 /*
  * This configuration file contains mechanism settings for cartesian printer.
  *
@@ -22,8 +22,8 @@
  * - Homing feedrate
  * - Hotend offset
  *
- * Basic-settings can be found in configuration_basic.h
- * Feature-settings can be found in configuration_feature.h
+ * Basic-settings can be found in Configuration_Basic.h
+ * Feature-settings can be found in Configuration_Feature.h
  */
  
 /*****************************************************************************************

MarlinKimbra/Configuration_Core.h

 #ifndef CONFIGURATION_MECHANISM
 #define CONFIGURATION_MECHANISM
+#define KNOWN_MECH 1
 
 /*
  * This configuration file contains mechanism settings for cartesian printer.
@@ -23,8 +24,8 @@
  * - Homing feedrate
  * - Hotend offset
  *
- * Basic-settings can be found in configuration_basic.h
- * Feature-settings can be found in configuration_feature.h
+ * Basic-settings can be found in Configuration_Basic.h
+ * Feature-settings can be found in Configuration_Feature.h
  */
  
 /*****************************************************************************************

MarlinKimbra/Configuration_Delta.h

 #ifndef CONFIGURATION_MECHANISM
 #define CONFIGURATION_MECHANISM
+#define KNOWN_MECH 1
 
 /*
  * This configuration file contains mechanism settings for cartesian printer.
@@ -22,8 +23,8 @@
  * - Homing feedrate
  * - Hotend offset
  *
- * Basic-settings can be found in configuration_basic.h
- * Feature-settings can be found in configuration_feature.h
+ * Basic-settings can be found in Configuration_Basic.h
+ * Feature-settings can be found in Configuration_Feature.h
  */
  
 /*****************************************************************************************

MarlinKimbra/Configuration_Scara.h

 #ifndef CONFIGURATION_MECHANISM
 #define CONFIGURATION_MECHANISM
+#define KNOWN_MECH 1
 
 /*
  * This configuration file contains mechanism settings for cartesian printer.
@@ -23,8 +24,8 @@
  * - Homing feedrate
  * - Hotend offset
  *
- * Basic-settings can be found in configuration_basic.h
- * Feature-settings can be found in configuration_feature.h
+ * Basic-settings can be found in Configuration_Basic.h
+ * Feature-settings can be found in Configuration_Feature.h
  */
  
 /*****************************************************************************************

MarlinKimbra/M100_Free_Mem_Chk.cpp

@@ -23,7 +23,7 @@
 
 #include "Marlin.h"
 
-#ifdef M100_FREE_MEMORY_WATCHER
+#if ENABLED(M100_FREE_MEMORY_WATCHER)
   extern void *__brkval;
   extern size_t  __heap_start, __heap_end, __flp;
 
@@ -59,7 +59,7 @@
     // probably caused by bad pointers.  Any unexpected values will be flagged in
     // the right hand column to help spotting them.
     //
-    #ifdef M100_FREE_MEMORY_DUMPER      // Comment out to remove Dump sub-command
+    #if ENABLED(M100_FREE_MEMORY_DUMPER)      // Comment out to remove Dump sub-command
       if ( code_seen('D') ) {
         ptr = (unsigned char *) __brkval;
 
@@ -151,7 +151,7 @@
     // M100 C x  Corrupts x locations in the free memory pool and reports the locations of the corruption.
     // This is useful to check the correctness of the M100 D and the M100 F commands.
     //
-    #ifdef M100_FREE_MEMORY_CORRUPTOR
+    #if ENABLED(M100_FREE_MEMORY_CORRUPTOR)
       if ( code_seen('C') ) {
         int x;      // x gets the # of locations to corrupt within the memory pool
         x = code_value();

MarlinKimbra/Marlin.h

@@ -22,7 +22,7 @@
 
 #include <avr/pgmspace.h>
 #include <avr/interrupt.h>
-#include "Configuration.h"
+#include "Configuration_Basic.h"
 #include "pins.h"
 
 #ifndef SANITYCHECK_H
@@ -225,7 +225,7 @@ extern float home_offset[3];
 
 // Hotend offset
 #if HOTENDS > 1
-  #ifndef DUAL_X_CARRIAGE
+  #if DISABLED(DUAL_X_CARRIAGE)
     #define NUM_HOTEND_OFFSETS 2 // only in XY plane
   #else
     #define NUM_HOTEND_OFFSETS 3 // supports offsets in XYZ plane

MarlinKimbra/MarlinKimbra.ino

@@ -30,27 +30,27 @@
 /* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
 /* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
 
-#include "Configuration.h"
+#include "Configuration_Basic.h"
 #include "pins.h"
 
-#ifdef ULTRA_LCD
-  #if defined(LCD_I2C_TYPE_PCF8575)
+#if ENABLED(ULTRA_LCD)
+  #if ENABLED(LCD_I2C_TYPE_PCF8575)
     #include <Wire.h>
     #include <LiquidCrystal_I2C.h>
-  #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
+  #elif ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)
     #include <Wire.h>
     #include <LiquidTWI2.h>
-  #elif defined(DOGLCD)
+  #elif ENABLED(DOGLCD)
     #include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
   #else
     #include <LiquidCrystal.h> // library for character LCD
   #endif
 #endif
 
-#if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
+#if ENABLED(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
 #include <SPI.h>
 #endif
 
-#if defined(DIGIPOT_I2C)
+#if ENABLED(DIGIPOT_I2C)
   #include <Wire.h>
 #endif

MarlinKimbra/SdBaseFile.cpp

@@ -1806,7 +1806,7 @@ int16_t SdBaseFile::write(const void* buf, uint16_t nbyte) {
 }
 //------------------------------------------------------------------------------
 // suppress cpplint warnings with NOLINT comment
-#if ALLOW_DEPRECATED_FUNCTIONS && !defined(DOXYGEN)
+#if ALLOW_DEPRECATED_FUNCTIONS && DISABLED(DOXYGEN)
 void (*SdBaseFile::oldDateTime_)(uint16_t& date, uint16_t& time) = 0;  // NOLINT
 #endif  // ALLOW_DEPRECATED_FUNCTIONS
 

MarlinKimbra/SdBaseFile.h

@@ -364,7 +364,7 @@ class SdBaseFile {
     uint8_t width, bool printSlash);
 //------------------------------------------------------------------------------
 // Deprecated functions  - suppress cpplint warnings with NOLINT comment
-#if ALLOW_DEPRECATED_FUNCTIONS && !defined(DOXYGEN)
+#if ALLOW_DEPRECATED_FUNCTIONS && DISABLED(DOXYGEN)
  public:
   /** \deprecated Use:
    * bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock);

MarlinKimbra/SdVolume.h

@@ -193,7 +193,7 @@ class SdVolume {
   }
 //------------------------------------------------------------------------------
   // Deprecated functions  - suppress cpplint warnings with NOLINT comment
-#if ALLOW_DEPRECATED_FUNCTIONS && !defined(DOXYGEN)
+#if ALLOW_DEPRECATED_FUNCTIONS && DISABLED(DOXYGEN)
  public:
   /** \deprecated Use: bool SdVolume::init(Sd2Card* dev);
    * \param[in] dev The SD card where the volume is located.

MarlinKimbra/conditionals.h

@@ -48,7 +48,7 @@
   #define REPRAP_DISCOUNT_SMART_CONTROLLER
 #endif
 
-#ifdef SPARK_FULL_GRAPHICS
+#if ENABLED(SPARK_FULL_GRAPHICS)
   #define ENCODER_PULSES_PER_STEP 2
   #define ENCODER_STEPS_PER_MENU_ITEM 1
 
@@ -62,7 +62,7 @@
   #define NEWPANEL
 #endif
 
-#ifdef RADDS_DISPLAY
+#if ENABLED(RADDS_DISPLAY)
   #define ENCODER_PULSES_PER_STEP 2
   #define ENCODER_STEPS_PER_MENU_ITEM 1
 
@@ -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
 
-  #ifndef ENCODER_PULSES_PER_STEP
+  #if DISABLED(ENCODER_PULSES_PER_STEP)
     #define ENCODER_PULSES_PER_STEP 4
   #endif
 
-  #ifndef ENCODER_STEPS_PER_MENU_ITEM
+  #if DISABLED(ENCODER_STEPS_PER_MENU_ITEM)
     #define ENCODER_STEPS_PER_MENU_ITEM 1
   #endif
 
@@ -232,7 +232,7 @@
 /**
  * DRIVER_EXTRUDERS
  */
-#if !defined(MKR4) && !defined(NPR2)
+#if DISABLED(MKR4) && DISABLED(NPR2)
   #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder
 #endif
 
@@ -369,7 +369,7 @@
 /**
  * Servo Leveling
  */
-#define SERVO_LEVELING (defined(SERVO_ENDSTOPS) && defined(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
  */
-#ifndef POWER_SUPPLY
+#if DISABLED(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 (defined(NUM_SERVOS) && NUM_SERVOS > 0)
+#define HAS_SERVOS (ENABLED(NUM_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))
@@ -630,8 +630,8 @@
 /**
  * Shorthand for filament sensor and power sensor for ultralcd.cpp, dogm_lcd_implementation.h, ultralcd_implementation_hitachi_HD44780.h
  */
-#define HAS_LCD_FILAMENT_SENSOR (HAS_FILAMENT_SENSOR && defined(FILAMENT_LCD_DISPLAY))
-#define HAS_LCD_POWER_SENSOR (HAS_POWER_CONSUMPTION_SENSOR && defined(POWER_CONSUMPTION_LCD_DISPLAY))
+#define HAS_LCD_FILAMENT_SENSOR (HAS_FILAMENT_SENSOR && ENABLED(FILAMENT_LCD_DISPLAY))
+#define HAS_LCD_POWER_SENSOR (HAS_POWER_CONSUMPTION_SENSOR && ENABLED(POWER_CONSUMPTION_LCD_DISPLAY))
 
 /**
  * Helper Macros for heaters and extruder fan
@@ -642,7 +642,7 @@
   #define WRITE_HEATER(pin,value) WRITE(pin,value)
 #endif
 #define WRITE_HEATER_0P(v) WRITE_HEATER(HEATER_0_PIN, v)
-#if HOTENDS > 1 || defined(HEATERS_PARALLEL)
+#if HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)
   #define WRITE_HEATER_1(v) WRITE_HEATER(HEATER_1_PIN, v)
   #if HOTENDS > 2
     #define WRITE_HEATER_2(v) WRITE_HEATER(HEATER_2_PIN, v)
@@ -657,14 +657,14 @@
   #define WRITE_HEATER_0(v) WRITE_HEATER_0P(v)
 #endif
 #if HAS_HEATER_BED
-  #ifdef INVERTED_BED_PINS
+  #if ENABLED(INVERTED_BED_PINS)
     #define WRITE_HEATER_BED(v) WRITE(HEATER_BED_PIN,!v)
   #else
     #define WRITE_HEATER_BED(v) WRITE(HEATER_BED_PIN,v)
   #endif
 #endif
 #if HAS_FAN
-  #ifdef INVERTED_HEATER_PINS
+  #if ENABLED(INVERTED_HEATER_PINS)
     #define WRITE_FAN(v) WRITE(FAN_PIN, !v)
   #else
     #define WRITE_FAN(v) WRITE(FAN_PIN, v)
@@ -674,7 +674,7 @@
 /**
  * Buzzer
  */
-#define HAS_BUZZER (PIN_EXISTS(BEEPER) || defined(LCD_USE_I2C_BUZZER))
+#define HAS_BUZZER (PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER))
 
 /**
  * Servos

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.
@@ -15,8 +15,8 @@
  * - Extruders number
  * - UI Language
  *
- * Mechanisms-settings can be found in configuration_xxxxxx.h (where xxxxxx can be: cartesian - delta - core - scara)
- * Feature-settings can be found in configuration_feature.h
+ * Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
+ * Feature-settings can be found in Configuration_Feature.h
  */
 
 /***********************************************************************
@@ -241,19 +241,19 @@
  ********************** Do not touch this section **********************
  ***********************************************************************/
 #if MECH(CARTESIAN)
-  #include "configuration_cartesian.h"
+  #include "Configuration_Cartesian.h"
 #elif MECH(COREXY)
-  #include "configuration_core.h"
+  #include "Configuration_Core.h"
 #elif MECH(COREXZ)
-  #include "configuration_core.h"
+  #include "Configuration_Core.h"
 #elif MECH(DELTA)
-  #include "configuration_delta.h"
+  #include "Configuration_Delta.h"
 #elif MECH(SCARA)
-  #include "configuration_scara.h"
+  #include "Configuration_Scara.h"
 #endif 
 
-#include "configuration_feature.h"
-#include "configuration_overall.h"
+#include "Configuration_Feature.h"
+#include "Configuration_Overall.h"
 
 #include "thermistortables.h"
 #include "conditionals.h"

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.
@@ -68,8 +68,8 @@
  * - Buffer stuff
  * - Whatchdog
  *
- * Basic-settings can be found in configuration_basic.h
- * Mechanisms-settings can be found in configuration_xxxxxx.h (where xxxxxx can be: cartesian - delta - core - scara)
+ * Basic-settings can be found in Configuration_Basic.h
+ * Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
  * 
  */
 

MarlinKimbra/configuration_store.cpp

@@ -418,7 +418,7 @@ void Config_ResetDefault() {
     float tmp8[] = DEFAULT_Kd;
   #endif // PIDTEMP
 
-  #if defined(HOTEND_OFFSET_X) && defined(HOTEND_OFFSET_Y)
+  #if ENABLED(HOTEND_OFFSET_X) && ENABLED(HOTEND_OFFSET_Y)
     float tmp9[] = HOTEND_OFFSET_X;
     float tmp10[] = HOTEND_OFFSET_Y;
   #else
@@ -569,14 +569,14 @@ void Config_ResetDefault() {
 
   calculate_volumetric_multipliers();
 
-  #ifdef IDLE_OOZING_PREVENT
+  #if ENABLED(IDLE_OOZING_PREVENT)
     IDLE_OOZING_enabled = true;
   #endif
 
   ECHO_LM(DB, "Hardcoded Default Settings Loaded");
 }
 
-#if !defined(DISABLE_M503)
+#if DISABLED(DISABLE_M503)
 
   /**
    * Print Configuration Settings - M503

MarlinKimbra/dogm_lcd_implementation.h

@@ -33,7 +33,7 @@
 
 #include "ultralcd.h"
 #include "ultralcd_st7920_u8glib_rrd.h"
-#include "Configuration.h"
+#include "Configuration_Basic.h"
 
 #if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT)
    #undef USE_BIG_EDIT_FONT
@@ -106,7 +106,7 @@
   #define LCD_WIDTH_EDIT       22
 #endif
 
-#ifndef TALL_FONT_CORRECTION
+#if DISABLED(TALL_FONT_CORRECTION)
   #define TALL_FONT_CORRECTION 0
 #endif
 
@@ -137,10 +137,10 @@
   U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0
 #endif
 
-#ifndef LCD_PIXEL_WIDTH
+#if DISABLED(LCD_PIXEL_WIDTH)
   #define LCD_PIXEL_WIDTH 128
 #endif
-#ifndef LCD_PIXEL_HEIGHT
+#if DISABLED(LCD_PIXEL_HEIGHT)
   #define LCD_PIXEL_HEIGHT 64
 #endif
 
@@ -238,7 +238,7 @@ static void lcd_implementation_init() {
       if (show_bootscreen) {
         u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
         lcd_setFont(FONT_MENU);
-        #ifndef STRING_SPLASH_LINE2
+        #if DISABLED(STRING_SPLASH_LINE2)
           u8g.drawStr(txt1X, u8g.getHeight() - DOG_CHAR_HEIGHT, STRING_SPLASH_LINE1);
         #else
           int txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1)*DOG_CHAR_WIDTH) / 2;

MarlinKimbra/firmware_test.h

@@ -28,7 +28,7 @@ void FirmwareTest()
 
     ECHO_EM(" ");
     ECHO_EM("***** ENDSTOP X *****");
-    #if defined(X_MIN_PIN) && X_MIN_PIN > -1 && X_HOME_DIR == -1
+    #if ENABLED(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 defined(X_MAX_PIN) && X_MAX_PIN > -1 && X_HOME_DIR == 1
+    #elif ENABLED(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 defined(Y_MIN_PIN) && Y_MIN_PIN > -1 && Y_HOME_DIR == -1
+    #if ENABLED(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 defined(Y_MAX_PIN) && Y_MAX_PIN > -1 && Y_HOME_DIR == 1
+    #elif ENABLED(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 defined(Z_MIN_PIN) && Z_MIN_PIN > -1 && Z_HOME_DIR == -1
+    #if ENABLED(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 defined(Z_MAX_PIN) && Z_MAX_PIN > -1 && Z_HOME_DIR == 1
+    #elif ENABLED(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.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.h"
+//   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration_Basic.h"
 //   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
 // See also documentation/LCDLanguageFont.md
 
@@ -25,7 +25,7 @@
 // 13 Basque-Euskera
 // 14 Portuguese (Brazil)
 
-#ifndef LANGUAGE_CHOICE
+#if DISABLED(LANGUAGE_CHOICE)
   #define LANGUAGE_CHOICE 7  // Pick your language from the list above
 #endif
 
@@ -49,24 +49,24 @@
 #elif MB(SAV_MKI)
   #define MACHINE_NAME "SAV MkI"
   #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
-#elif !defined(MACHINE_NAME)
+#elif DISABLED(MACHINE_NAME)
   #define MACHINE_NAME "3D Printer"
 #endif
 
-#ifdef CUSTOM_MACHINE_NAME
+#if ENABLED(CUSTOM_MACHINE_NAME)
   #undef MACHINE_NAME
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
 #endif
 
-#ifndef SOURCE_CODE_URL
+#if DISABLED(SOURCE_CODE_URL)
   #define SOURCE_CODE_URL "https://github.com/MagoKimbra/MarlinKimbra"
 #endif
 
-#ifndef BUILD_VERSION
+#if DISABLED(BUILD_VERSION)
   #define BUILD_VERSION "V4; MarlinKimbra for 4 extruder"
 #endif
 
-#ifndef MACHINE_UUID
+#if DISABLED(MACHINE_UUID)
   #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 #endif
 
@@ -235,7 +235,7 @@
 #define MSG_BED_LEVELLING_Z                 " Z: "
 
 // LCD Menu Messages
-#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILLIC ))
+#if !(ENABLED( DISPLAY_CHARSET_HD44780_JAPAN ) || ENABLED( DISPLAY_CHARSET_HD44780_WESTERN ) || ENABLED( DISPLAY_CHARSET_HD44780_CYRILLIC ))
   #define DISPLAY_CHARSET_HD44780_JAPAN
 #endif
 

MarlinKimbra/language_an.h

@@ -158,7 +158,7 @@
 #define MSG_DEBUG_DRYRUN                    "DEBUG DRYRUN ENABLED"
 
 // Calibrate Delta
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -167,7 +167,7 @@
 #endif // DELTA
 
 // Scara
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -189,7 +189,7 @@
 #define MSG_INVALID_POS_SLOT                "Invalid slot, total slots: "
 
 // Firmware Test
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_ca.h

@@ -158,7 +158,7 @@
 #define MSG_DEBUG_DRYRUN                    "DEBUG DRYRUN ENABLED"
 
 // Calibrate Delta
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -167,7 +167,7 @@
 #endif // DELTA
 
 // Scara
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -189,7 +189,7 @@
 #define MSG_INVALID_POS_SLOT                "Invalid slot, total slots: "
 
 // Firmware Test
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_de.h

@@ -159,7 +159,7 @@
 #define MSG_DEBUG_DRYRUN                    "DEBUG DRYRUN ENABLED"
 
 // Calibrate Delta
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -168,7 +168,7 @@
 #endif // DELTA
 
 // Scara
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -190,7 +190,7 @@
 #define MSG_INVALID_POS_SLOT                "Invalid slot, total slots: "
 
 // Firmware Test
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_en.h

@@ -8,12 +8,12 @@
 #ifndef LANGUAGE_EN_H
 #define LANGUAGE_EN_H
 
-#if !( defined(MAPPER_NON)|| defined(MAPPER_C2C3)|| defined(MAPPER_D0D1)|| defined(MAPPER_D0D1_MOD)|| defined(MAPPER_E382E383) )
+#if !( ENABLED(MAPPER_NON)|| ENABLED(MAPPER_C2C3)|| ENABLED(MAPPER_D0D1)|| ENABLED(MAPPER_D0D1_MOD)|| ENABLED(MAPPER_E382E383) )
   #define MAPPER_NON         // For direct asci codes
 #endif
 
 //#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
-#if !( defined(SIMULATE_ROMFONT)|| defined(DISPLAY_CHARSET_ISO10646_1)|| defined(DISPLAY_CHARSET_ISO10646_5)|| defined(DISPLAY_CHARSET_ISO10646_KANA)|| defined(DISPLAY_CHARSET_ISO10646_CN) )
+#if !( ENABLED(SIMULATE_ROMFONT)|| ENABLED(DISPLAY_CHARSET_ISO10646_1)|| ENABLED(DISPLAY_CHARSET_ISO10646_5)|| ENABLED(DISPLAY_CHARSET_ISO10646_KANA)|| ENABLED(DISPLAY_CHARSET_ISO10646_CN) )
   #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
 #endif
 
@@ -168,7 +168,7 @@
 #define MSG_DEBUG_DRYRUN                    "DEBUG DRYRUN ENABLED"
 
 // Calibrate Delta
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -177,7 +177,7 @@
 #endif // DELTA
 
 // Scara
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -199,7 +199,7 @@
 #define MSG_INVALID_POS_SLOT                "Invalid slot, total slots: "
 
 // Firmware Test
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_es.h

@@ -158,7 +158,7 @@
 #define MSG_DEBUG_DRYRUN                    "DEBUG DRYRUN ENABLED"
 
 // Calibrate Delta
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -167,7 +167,7 @@
 #endif // DELTA
 
 // Scara
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -189,7 +189,7 @@
 #define MSG_INVALID_POS_SLOT                "Invalid slot, total slots: "
 
 // Firmware Test
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_eu.h

@@ -143,7 +143,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -151,7 +151,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -164,7 +164,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_fi.h

@@ -143,7 +143,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Kalibrointi"
   #define MSG_DELTA_CALIBRATE_X             "Kalibroi X"
   #define MSG_DELTA_CALIBRATE_Y             "Kalibroi Y"
@@ -151,7 +151,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Kalibroi Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -164,7 +164,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_fr.h

@@ -146,7 +146,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -154,7 +154,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -167,7 +167,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_it.h

@@ -163,7 +163,7 @@
 #define MSG_DEBUG_DRYRUN                    "DEBUG STAMPA A VUOTO"
 
 // Calibrate Delta
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Calibraz. Delta"
   #define MSG_DELTA_CALIBRATE_X             "Calibra X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibra Y"
@@ -172,7 +172,7 @@
 #endif // DELTA
 
 // Scara
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -194,7 +194,7 @@
 #define MSG_INVALID_POS_SLOT                "Slot invalido, slot totali: "
 
 // Firmware Test
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Dai il comando Y per andare avanti"
   #define MSG_FWTEST_NO                     "Dai il comando N per andare avanti"
   #define MSG_FWTEST_YES_NO                 "Dai il comando Y o N per andare avanti"

MarlinKimbra/language_nl.h

@@ -143,7 +143,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -151,7 +151,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -164,7 +164,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_pl.h

@@ -143,7 +143,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -151,7 +151,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -164,7 +164,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_pt-br.h

@@ -8,12 +8,12 @@
 #ifndef LANGUAGE_PT_BR_H
 #define LANGUAGE_PT_BR_H
 
-#if !( defined(MAPPER_NON)|| defined(MAPPER_C2C3)|| defined(MAPPER_D0D1)|| defined(MAPPER_D0D1_MOD)|| defined(MAPPER_E382E383) )
+#if !( ENABLED(MAPPER_NON)|| ENABLED(MAPPER_C2C3)|| ENABLED(MAPPER_D0D1)|| ENABLED(MAPPER_D0D1_MOD)|| ENABLED(MAPPER_E382E383) )
   #define MAPPER_NON         // For direct asci codes
 #endif
 
 //#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
-#if !( defined(SIMULATE_ROMFONT)|| defined(DISPLAY_CHARSET_ISO10646_1)|| defined(DISPLAY_CHARSET_ISO10646_5)|| defined(DISPLAY_CHARSET_ISO10646_KANA) )
+#if !( ENABLED(SIMULATE_ROMFONT)|| ENABLED(DISPLAY_CHARSET_ISO10646_1)|| ENABLED(DISPLAY_CHARSET_ISO10646_5)|| ENABLED(DISPLAY_CHARSET_ISO10646_KANA) )
   #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
 #endif
 
@@ -152,7 +152,7 @@
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -160,7 +160,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -172,7 +172,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_pt.h

@@ -143,7 +143,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -151,7 +151,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -164,7 +164,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/language_ru.h

@@ -143,7 +143,7 @@
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
 
-#ifdef DELTA
+#if MECH(DELTA)
   #define MSG_DELTA_CALIBRATE               "Delta Calibration"
   #define MSG_DELTA_CALIBRATE_X             "Calibrate X"
   #define MSG_DELTA_CALIBRATE_Y             "Calibrate Y"
@@ -151,7 +151,7 @@
   #define MSG_DELTA_CALIBRATE_CENTER        "Calibrate Center"
 #endif // DELTA
 
-#ifdef SCARA
+#if MECH(SCARA)
   #define MSG_XSCALE                        "X Scale"
   #define MSG_YSCALE                        "Y Scale"
 #endif
@@ -164,7 +164,7 @@
 #define MSG_PURGE_XMM                       "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
 #define MSG_RETRACT_XMM                     "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
 
-#ifdef FIRMWARE_TEST
+#if ENABLED(FIRMWARE_TEST)
   #define MSG_FWTEST_YES                    "Put the Y command to go next"
   #define MSG_FWTEST_NO                     "Put the N command to go next"
   #define MSG_FWTEST_YES_NO                 "Put the Y or N command to go next"

MarlinKimbra/planner.cpp

@@ -109,7 +109,7 @@ static float previous_nominal_speed;   // Nominal speed of previous path line se
 
 unsigned char g_uc_extruder_last_move[4] = {0,0,0,0};
 
-#ifdef XY_FREQUENCY_LIMIT
+#if ENABLED(XY_FREQUENCY_LIMIT)
   // Used for the frequency limit
   #define MAX_FREQ_TIME (1000000.0/XY_FREQUENCY_LIMIT)
   // Old direction bits. Used for speed calculations
@@ -429,7 +429,7 @@ void check_axes_activity() {
   }
 
   #if HAS(FAN)
-    #ifdef FAN_KICKSTART_TIME
+    #if ENABLED(FAN_KICKSTART_TIME)
       static millis_t fan_kick_end;
       if (tail_fan_speed) {
         millis_t ms = millis();
@@ -803,7 +803,7 @@ float junction_deviation = 0.1;
         if (segment_time < minsegmenttime) {
           // buffer is draining, add extra time.  The amount of time added increases if the buffer is still emptied more.
           inverse_second = 1000000.0 / (segment_time + lround(2 * (minsegmenttime - segment_time) / moves_queued));
-          #ifdef XY_FREQUENCY_LIMIT
+          #if ENABLED(XY_FREQUENCY_LIMIT)
             segment_time = lround(1000000.0 / inverse_second);
           #endif
         }
@@ -850,7 +850,7 @@ float junction_deviation = 0.1;
   }
 
   // Max segement time in us.
-  #ifdef XY_FREQUENCY_LIMIT
+  #if ENABLED(XY_FREQUENCY_LIMIT)
     #define MAX_FREQ_TIME (1000000.0 / XY_FREQUENCY_LIMIT)
 
     // Check and limit the xy direction change frequency

MarlinKimbra/sanitycheck.h

@@ -95,7 +95,7 @@
   #if NUM_SERVOS > 4
     #error The maximum number of SERVOS in Marlin is 4.
   #endif
-  #if defined(NUM_SERVOS) && NUM_SERVOS > 0
+  #if ENABLED(NUM_SERVOS) && 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 X_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS.
@@ -143,23 +143,24 @@
      * Require a Z Probe Pin if Z_PROBE_ENDSTOP is enabled.
      */
     #if ENABLED(Z_PROBE_ENDSTOP)
-      #ifndef Z_PROBE_PIN
+      #if DISABLED(Z_PROBE_PIN)
         #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 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.
-//      #ifndef NUM_SERVOS
+//      #if DISABLED(NUM_SERVOS)
 //        #error You must have NUM_SERVOS defined and there must be at least 1 configured to use Z_PROBE_ENDSTOP.
 //      #endif
-//      #if defined(NUM_SERVOS) && NUM_SERVOS < 1
+//      #if ENABLED(NUM_SERVOS) && NUM_SERVOS < 1
 //        #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 You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_PROBE_ENDSTOP.
 //      #endif
-//      #ifndef SERVO_ENDSTOP_ANGLES
+//      #if DISABLED(ERVO_ENDSTOP_ANGLES)
 //        #error You must have SERVO_ENDSTOP_ANGLES defined for Z Extend and Retract to use Z_PROBE_ENDSTOP.
 //      #endif
     #endif
@@ -208,7 +209,7 @@
   /**
    * ULTIPANEL encoder
    */
-  #if ENABLED(ULTIPANEL) && DISABLED(NEWPANEL) && DISABLED(SR_LCD_2W_NL) && !defined(SHIFT_CLK)
+  #if ENABLED(ULTIPANEL) && DISABLED(NEWPANEL) && DISABLED(SR_LCD_2W_NL) && DISABLED(SHIFT_CLK)
     #error ULTIPANEL requires some kind of encoder.
   #endif
 
@@ -216,7 +217,7 @@
    * Delta & Z_PROBE_ENDSTOP
    */
   #if MECH(DELTA) && ENABLED(Z_PROBE_ENDSTOP)
-    #ifndef Z_PROBE_PIN
+    #if DISABLED(Z_PROBE_PIN)
       #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
@@ -230,7 +231,7 @@
   #if ENABLED(DUAL_X_CARRIAGE)
     #if EXTRUDERS == 1 || MECH(COREXY) \
         || HASNT(X2_ENABLE) || HASNT(X2_STEP) || HASNT(X2_DIR) \
-        || !defined(X2_HOME_POS) || !defined(X2_MIN_POS) || !defined(X2_MAX_POS) \
+        || DISABLED(X2_HOME_POS) || DISABLED(X2_MIN_POS) || DISABLED(X2_MAX_POS) \
         || HASNT(X_MAX)
       #error Missing or invalid definitions for DUAL_X_CARRIAGE mode.
     #endif
@@ -269,7 +270,7 @@
     #if HASNT(HEATER_2)
       #error HEATER_2_PIN not defined for this board
     #endif
-  #elif HOTENDS > 1 || defined(HEATERS_PARALLEL)
+  #elif HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)
     #if HASNT(HEATER_1)
       #error HEATER_1_PIN not defined for this board
     #endif
@@ -286,7 +287,7 @@
   /**
    * Warnings for old configurations
    */
-  #ifdef X_HOME_RETRACT_MM
+  #if ENABLED(X_HOME_RETRACT_MM)
     #error [XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM.
   #endif
 
@@ -294,11 +295,11 @@
     #error WATCH_TEMP_PERIOD now uses seconds instead of milliseconds.
   #endif
 
-  #if DISABLED(THERMAL_PROTECTION_HOTENDS) && (defined(WATCH_TEMP_PERIOD) || defined(THERMAL_PROTECTION_PERIOD))
+  #if DISABLED(THERMAL_PROTECTION_HOTENDS) && (ENABLED(WATCH_TEMP_PERIOD) || ENABLED(THERMAL_PROTECTION_PERIOD))
     #error Thermal Runaway Protection for hotends must now be enabled with THERMAL_PROTECTION_HOTENDS.
   #endif
 
-  #if DISABLED(THERMAL_PROTECTION_BED) && defined(THERMAL_PROTECTION_BED_PERIOD)
+  #if DISABLED(THERMAL_PROTECTION_BED) && ENABLED(THERMAL_PROTECTION_BED_PERIOD)
     #error Thermal Runaway Protection for the bed must now be enabled with THERMAL_PROTECTION_BED.
   #endif
 
@@ -310,11 +311,11 @@
     #error "Z_LATE_ENABLE can't be used with COREXZ."
   #endif
 
-  #ifdef BEEPER
+  #if ENABLED(BEEPER)
     #error BEEPER has been replaced with BEEPER_PIN. Please update your pins definitions.
   #endif
 
-  #ifdef SDCARDDETECT
+  #if ENABLED(SDCARDDETECT)
     #error SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions.
   #endif
 

MarlinKimbra/servo.cpp

@@ -43,7 +43,7 @@
  detach()    - Stops an attached servos from pulsing its i/o pin.
 
 */
-#include "Configuration.h"
+#include "Configuration_Basic.h"
 
 #if HAS(SERVOS)
 
@@ -103,15 +103,15 @@ static inline void handle_interrupts(timer16_Sequence_t timer, volatile uint16_t
 #ifndef WIRING // Wiring pre-defines signal handlers so don't define any if compiling for the Wiring platform
 
   // Interrupt handlers for Arduino
-  #if ENABLED(_useTimer1)
+  #ifdef _useTimer1
     SIGNAL (TIMER1_COMPA_vect) { handle_interrupts(_timer1, &TCNT1, &OCR1A); }
   #endif
 
-  #if ENABLED(_useTimer3)
+  #ifdef _useTimer3
     SIGNAL (TIMER3_COMPA_vect) { handle_interrupts(_timer3, &TCNT3, &OCR3A); }
   #endif
 
-  #if ENABLED(_useTimer4)
+  #ifdef _useTimer4
     SIGNAL (TIMER4_COMPA_vect) { handle_interrupts(_timer4, &TCNT4, &OCR4A); }
   #endif
 
@@ -122,10 +122,10 @@ static inline void handle_interrupts(timer16_Sequence_t timer, volatile uint16_t
 #else //!WIRING
 
   // Interrupt handlers for Wiring
-  #if ENABLED(_useTimer1)
+  #ifdef _useTimer1
     void Timer1Service() { handle_interrupts(_timer1, &TCNT1, &OCR1A); }
   #endif
-  #if ENABLED(_useTimer3)
+  #ifdef _useTimer3
     void Timer3Service() { handle_interrupts(_timer3, &TCNT3, &OCR3A); }
   #endif
 
@@ -133,7 +133,7 @@ static inline void handle_interrupts(timer16_Sequence_t timer, volatile uint16_t
 
 
 static void initISR(timer16_Sequence_t timer) {
-  #if ENABLED(_useTimer1)
+  #ifdef _useTimer1
     if (timer == _timer1) {
       TCCR1A = 0;             // normal counting mode
       TCCR1B = _BV(CS11);     // set prescaler of 8
@@ -152,7 +152,7 @@ static void initISR(timer16_Sequence_t timer) {
     }
   #endif
 
-  #if ENABLED(_useTimer3)
+  #ifdef _useTimer3
     if (timer == _timer3) {
       TCCR3A = 0;             // normal counting mode
       TCCR3B = _BV(CS31);     // set prescaler of 8
@@ -170,7 +170,7 @@ static void initISR(timer16_Sequence_t timer) {
     }
   #endif
 
-  #if ENABLED(_useTimer4)
+  #ifdef _useTimer4
     if (timer == _timer4) {
       TCCR4A = 0;             // normal counting mode
       TCCR4B = _BV(CS41);     // set prescaler of 8
@@ -180,7 +180,7 @@ static void initISR(timer16_Sequence_t timer) {
     }
   #endif
 
-  #if ENABLED(_useTimer5)
+  #ifdef _useTimer5
     if (timer == _timer5) {
       TCCR5A = 0;             // normal counting mode
       TCCR5B = _BV(CS51);     // set prescaler of 8
@@ -307,7 +307,7 @@ bool Servo::attached() { return servo_info[this->servoIndex].Pin.isActive; }
 void Servo::move(int value) {
   if (this->attach(0) >= 0) {
     this->write(value);
-    #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
+    #if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE)
       delay(SERVO_DEACTIVATION_DELAY);
       this->detach();
     #endif

MarlinKimbra/stepper.cpp

@@ -262,7 +262,7 @@ void checkHitEndstops() {
       ECHO_MV(MSG_ENDSTOP_Z, (float)endstops_trigsteps[Z_AXIS] / axis_steps_per_unit[Z_AXIS]);
       LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_ZS);
     }
-    #ifdef Z_PROBE_ENDSTOP
+    #if ENABLED(Z_PROBE_ENDSTOP)
     if (endstop_hit_bits & BIT(Z_PROBE)) {
       ECHO_MV(MSG_ENDSTOP_ZPS, (float)endstops_trigsteps[Z_AXIS] / axis_steps_per_unit[Z_AXIS]);
       LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_ZPS);
@@ -603,7 +603,7 @@ ISR(TIMER1_COMPA_vect) {
   if (cleaning_buffer_counter) {
     current_block = NULL;
     plan_discard_current_block();
-    #ifdef SD_FINISHED_RELEASECOMMAND
+    #if ENABLED(SD_FINISHED_RELEASECOMMAND)
       if ((cleaning_buffer_counter == 1) && (SD_FINISHED_STEPPERRELEASE)) enqueuecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
     #endif
     cleaning_buffer_counter--;
@@ -669,7 +669,7 @@ ISR(TIMER1_COMPA_vect) {
       STEP_START(x,X);
       STEP_START(y,Y);
       STEP_START(z,Z);
-      #ifndef ADVANCE
+      #if DISABLED(ADVANCE)
         STEP_START(e,E);
       #endif
 
@@ -1251,7 +1251,7 @@ void digipot_init() {
       digipot_current(i,digipot_motor_current[i]);
     }
   #endif
-  #ifdef MOTOR_CURRENT_PWM_XY_PIN
+  #if ENABLED(MOTOR_CURRENT_PWM_XY_PIN)
     pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT);
     pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT);
     pinMode(MOTOR_CURRENT_PWM_E_PIN, OUTPUT);
@@ -1277,7 +1277,7 @@ void digipot_current(uint8_t driver, int current) {
     const uint8_t digipot_ch[] = DIGIPOT_CHANNELS;
     digitalPotWrite(digipot_ch[driver], current);
   #endif
-  #ifdef MOTOR_CURRENT_PWM_XY_PIN
+  #if ENABLED(MOTOR_CURRENT_PWM_XY_PIN)
     switch(driver) {
       case 0: analogWrite(MOTOR_CURRENT_PWM_XY_PIN, 255L * current / MOTOR_CURRENT_PWM_RANGE); break;
       case 1: analogWrite(MOTOR_CURRENT_PWM_Z_PIN, 255L * current / MOTOR_CURRENT_PWM_RANGE); break;

MarlinKimbra/stepper.h

@@ -37,7 +37,7 @@
   #define NORM_E_DIR() { if(current_block->active_driver == 2) { E2_DIR_WRITE(!INVERT_E2_DIR); } else { if(current_block->active_driver == 1) { E1_DIR_WRITE(!INVERT_E1_DIR); } else { E0_DIR_WRITE(!INVERT_E0_DIR); }}}
   #define REV_E_DIR() { if(current_block->active_driver == 2) { E2_DIR_WRITE(INVERT_E2_DIR); } else { if(current_block->active_driver == 1) { E1_DIR_WRITE(INVERT_E1_DIR); } else { E0_DIR_WRITE(INVERT_E0_DIR); }}}
 #elif DRIVER_EXTRUDERS > 1
-  #ifndef DUAL_X_CARRIAGE
+  #if DISABLED(DUAL_X_CARRIAGE)
     #define E_STEP_WRITE(v) { if(current_block->active_driver == 1) { E1_STEP_WRITE(v); } else { E0_STEP_WRITE(v); }}
     #define NORM_E_DIR() { if(current_block->active_driver == 1) { E1_DIR_WRITE(!INVERT_E1_DIR); } else { E0_DIR_WRITE(!INVERT_E0_DIR); }}
     #define REV_E_DIR() { if(current_block->active_driver == 1) { E1_DIR_WRITE(INVERT_E1_DIR); } else { E0_DIR_WRITE(INVERT_E0_DIR); }}

MarlinKimbra/temperature.cpp

@@ -30,7 +30,7 @@
 //================================== macros =================================
 //===========================================================================
 
-#ifdef K1 // Defined in Configuration.h in the PID settings
+#if ENABLED(K1) // Defined in Configuration.h in the PID settings
   #define K2 (1.0 - K1)
 #endif
 
@@ -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 );
-#ifdef BED_MINTEMP
+#if ENABLED(BED_MINTEMP)
   static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP;
 #endif
-#ifdef BED_MAXTEMP
+#if ENABLED(BED_MAXTEMP)
   static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP;
 #endif
 
@@ -173,12 +173,12 @@ static float analog2temp(int raw, uint8_t e);
 static float analog2tempBed(int raw);
 static void updateTemperaturesFromRawValues();
 
-#ifdef THERMAL_PROTECTION_HOTENDS
+#if ENABLED(THERMAL_PROTECTION_HOTENDS)
   int watch_target_temp[HOTENDS] = { 0 };
   millis_t watch_heater_next_ms[HOTENDS] = { 0 };
 #endif
 
-#ifndef SOFT_PWM_SCALE
+#if DISABLED(SOFT_PWM_SCALE)
   #define SOFT_PWM_SCALE 0
 #endif
 
@@ -471,7 +471,7 @@ inline void _temp_error(int e, const char *serial_msg, const char *lcd_msg) {
     PS_PGM(serial_msg);
     ECHO_M(MSG_STOPPED_HEATER);
     if (e >= 0) ECHO_EV((int)e); else ECHO_EM(MSG_HEATER_BED);
-    #ifdef ULTRA_LCD
+    #if ENABLED(ULTRA_LCD)
       lcd_setalertstatuspgm(lcd_msg);
     #endif
   }
@@ -775,7 +775,7 @@ static float analog2tempBed(int raw) {
     if (i == BEDTEMPTABLE_LEN) celsius = PGM_RD_W(BEDTEMPTABLE[i-1][1]);
 
     return celsius;
-  #elif defined BED_USES_AD595
+  #elif ENABLED(BED_USES_AD595)
     return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET;
   #else
     return 0;
@@ -1049,38 +1049,38 @@ void tp_init() {
         maxttemp_raw[NR] += OVERSAMPLENR; \
     }
 
-  #ifdef HEATER_0_MINTEMP
+  #if ENABLED(HEATER_0_MINTEMP)
     TEMP_MIN_ROUTINE(0);
   #endif
-  #ifdef HEATER_0_MAXTEMP
+  #if ENABLED(HEATER_0_MAXTEMP)
     TEMP_MAX_ROUTINE(0);
   #endif
   #if HOTENDS > 1
-    #ifdef HEATER_1_MINTEMP
+    #if ENABLED(HEATER_1_MINTEMP)
       TEMP_MIN_ROUTINE(1);
     #endif
-    #ifdef HEATER_1_MAXTEMP
+    #if ENABLED(HEATER_1_MAXTEMP)
       TEMP_MAX_ROUTINE(1);
     #endif
     #if HOTENDS > 2
-      #ifdef HEATER_2_MINTEMP
+      #if ENABLED(HEATER_2_MINTEMP)
         TEMP_MIN_ROUTINE(2);
       #endif
-      #ifdef HEATER_2_MAXTEMP
+      #if ENABLED(HEATER_2_MAXTEMP)
         TEMP_MAX_ROUTINE(2);
       #endif
       #if HOTENDS > 3
-        #ifdef HEATER_3_MINTEMP
+        #if ENABLED(HEATER_3_MINTEMP)
           TEMP_MIN_ROUTINE(3);
         #endif
-        #ifdef HEATER_3_MAXTEMP
+        #if ENABLED(HEATER_3_MAXTEMP)
           TEMP_MAX_ROUTINE(3);
         #endif
       #endif // HOTENDS > 3
     #endif // HOTENDS > 2
   #endif // HOTENDS > 1
 
-  #ifdef BED_MINTEMP
+  #if ENABLED(BED_MINTEMP)
     while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) {
       #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
         bed_minttemp_raw += OVERSAMPLENR;
@@ -1089,7 +1089,7 @@ void tp_init() {
       #endif
     }
   #endif //BED_MINTEMP
-  #ifdef BED_MAXTEMP
+  #if ENABLED(BED_MAXTEMP)
     while(analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
       #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
         bed_maxttemp_raw -= OVERSAMPLENR;
@@ -1471,7 +1471,7 @@ ISR(TIMER0_COMPB_vect) {
      *
      * for heaters drived by relay
      */
-    #ifndef MIN_STATE_TIME
+    #if DISABLED(MIN_STATE_TIME)
       #define MIN_STATE_TIME 16 // MIN_STATE_TIME * 65.5 = time in milliseconds
     #endif
 

MarlinKimbra/temperature.h

@@ -97,7 +97,7 @@ extern float current_temperature_bed;
 FORCE_INLINE float degHotend(uint8_t hotend) { return current_temperature[HOTEND_ARG]; }
 FORCE_INLINE float degBed() { return current_temperature_bed; }
 
-#ifdef SHOW_TEMP_ADC_VALUES
+#if ENABLED(SHOW_TEMP_ADC_VALUES)
   FORCE_INLINE float rawHotendTemp(uint8_t hotend) { return current_temperature_raw[HOTEND_ARG]; }
   FORCE_INLINE float rawBedTemp() { return current_temperature_bed_raw; }
 #endif
@@ -105,7 +105,7 @@ FORCE_INLINE float degBed() { return current_temperature_bed; }
 FORCE_INLINE float degTargetHotend(uint8_t hotend) { return target_temperature[HOTEND_ARG]; }
 FORCE_INLINE float degTargetBed() { return target_temperature_bed; }
 
-#ifdef THERMAL_PROTECTION_HOTENDS
+#if ENABLED(THERMAL_PROTECTION_HOTENDS)
   void start_watching_heater(int e=0);
 #endif
 

MarlinKimbra/ultralcd.cpp

@@ -118,17 +118,17 @@ static void lcd_status_screen();
   #define ENCODER_FEEDRATE_DEADZONE 10
 
   #if DISABLED(LCD_I2C_VIKI)
-    #ifndef ENCODER_STEPS_PER_MENU_ITEM
+    #if DISABLED(ENCODER_STEPS_PER_MENU_ITEM)
       #define ENCODER_STEPS_PER_MENU_ITEM 5
     #endif
-    #ifndef ENCODER_PULSES_PER_STEP
+    #if DISABLED(ENCODER_PULSES_PER_STEP)
       #define ENCODER_PULSES_PER_STEP 1
     #endif
   #else
-    #ifndef ENCODER_STEPS_PER_MENU_ITEM
+    #if DISABLED(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
-    #ifndef ENCODER_PULSES_PER_STEP
+    #if DISABLED(ENCODER_PULSES_PER_STEP)
       #define ENCODER_PULSES_PER_STEP 1
     #endif
   #endif
@@ -139,7 +139,7 @@ static void lcd_status_screen();
   /**
    * START_MENU generates the init code for a menu function
    */
-#if defined(BTN_BACK) && BTN_BACK > 0
+#if ENABLED(BTN_BACK) && BTN_BACK > 0
   #define START_MENU(last_menu) do { \
     encoderRateMultiplierEnabled = false; \
     if (encoderPosition > 0x8000) encoderPosition = 0; \
@@ -308,7 +308,7 @@ static void lcd_status_screen() {
 
   #if ENABLED(LCD_PROGRESS_BAR)
     millis_t ms = millis();
-    #ifndef PROGRESS_MSG_ONCE
+    #if DISABLED(ROGRESS_MSG_ONCE)
       if (ms > progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME) {
         progress_bar_ms = ms;
       }
@@ -1560,23 +1560,23 @@ void lcd_quick_feedback() {
   next_button_update_ms = millis() + 500;
     
   #if ENABLED(LCD_USE_I2C_BUZZER)
-    #ifndef LCD_FEEDBACK_FREQUENCY_HZ
+    #if DISABLED(LCD_FEEDBACK_FREQUENCY_HZ)
       #define LCD_FEEDBACK_FREQUENCY_HZ 100
     #endif
-    #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
+    #if DISABLED(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
       #define LCD_FEEDBACK_FREQUENCY_DURATION_MS (1000/6)
     #endif    
     lcd.buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
   #elif PIN_EXISTS(BEEPER)
-    #ifndef LCD_FEEDBACK_FREQUENCY_HZ
+    #if DISABLED(LCD_FEEDBACK_FREQUENCY_HZ)
       #define LCD_FEEDBACK_FREQUENCY_HZ 5000
     #endif
-    #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
+    #if DISABLED(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
       #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
     #endif
     buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
   #else
-    #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
+    #if DISABLED(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
       #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
     #endif
     delay(LCD_FEEDBACK_FREQUENCY_DURATION_MS);
@@ -1638,7 +1638,7 @@ void lcd_init() {
   #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register
      pinMode (SR_DATA_PIN, OUTPUT);
      pinMode (SR_CLK_PIN, OUTPUT);
-  #elif defined(SHIFT_CLK)
+  #elif ENABLED(SHIFT_CLK)
      pinMode(SHIFT_CLK,OUTPUT);
      pinMode(SHIFT_LD,OUTPUT);
      pinMode(SHIFT_EN,OUTPUT);
@@ -1928,7 +1928,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
    * These values are independent of which pins are used for EN_A and EN_B indications
    * The rotary encoder part is also independent to the chipset used for the LCD
    */
-  #if defined(EN_A) && defined(EN_B)
+  #if ENABLED(EN_A) && ENABLED(EN_B)
     #define encrot0 0
     #define encrot1 2
     #define encrot2 3
@@ -1952,7 +1952,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
       #if BTN_ENC > 0
         millis_t ms = millis();
         if (ms > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C;
-        #if defined(BTN_BACK) && BTN_BACK > 0
+        #if ENABLED(BTN_BACK) && BTN_BACK > 0
           if (ms > next_button_update_ms && READ(BTN_BACK) == 0) newbutton |= EN_D;
         #endif
       #endif
@@ -2620,7 +2620,7 @@ static void coordtoLCD() {
   memset(buffer, 0, sizeof(buffer));
   strcat(buffer, "X");
   if (axis_known_position[X_AXIS]) {
-    #ifdef DELTA
+    #if MECH(DELTA)
       valuetemp = ftostr30(current_position[X_AXIS]);
     #else
       valuetemp = ftostr3(current_position[X_AXIS]);
@@ -2632,7 +2632,7 @@ static void coordtoLCD() {
 
   strcat(buffer, " Y");
   if (axis_known_position[Y_AXIS]) {
-    #ifdef DELTA
+    #if MECH(DELTA)
       valuetemp = ftostr30(current_position[Y_AXIS]);
     #else
       valuetemp = ftostr3(current_position[Y_AXIS]);

MarlinKimbra/ultralcd.h

@@ -80,7 +80,7 @@
     #define EN_A BIT(BLEN_A)
 
     #define LCD_CLICKED (buttons&EN_C)
-    #if defined(BTN_BACK) && BTN_BACK > 0
+    #if ENABLED(BTN_BACK) && BTN_BACK > 0
       #define EN_D BIT(BLEN_D)
       #define LCD_BACK_CLICKED (buttons&EN_D)
     #endif

MarlinKimbra/ultralcd_implementation_hitachi_HD44780.h

@@ -6,7 +6,7 @@
 * When selecting the Russian language, a slightly different LCD implementation is used to handle UTF8 characters.
 **/
 
-//#ifndef REPRAPWORLD_KEYPAD
+//#if DISABLED(REPRAPWORLD_KEYPAD)
 //  extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
 //#else
   extern volatile uint8_t buttons;  //an extended version of the last checked buttons in a bit array.
@@ -27,7 +27,7 @@
 #define EN_B BIT(BLEN_B) // The two encoder pins are connected through BTN_EN1 and BTN_EN2
 #define EN_A BIT(BLEN_A)
 
-#if defined(BTN_ENC) && BTN_ENC > -1
+#if ENABLED(BTN_ENC) && BTN_ENC > -1
   // encoder click is directly connected
   #define BLEN_C 2 
   #define EN_C BIT(BLEN_C) 
@@ -51,7 +51,7 @@
   #define B_DW (BUTTON_DOWN<<B_I2C_BTN_OFFSET)
   #define B_RI (BUTTON_RIGHT<<B_I2C_BTN_OFFSET)
 
-  #if defined(BTN_ENC) && BTN_ENC > -1
+  #if ENABLED(BTN_ENC) && BTN_ENC > -1
     // the pause/stop/restart button is connected to BTN_ENC when used
     #define B_ST (EN_C)                            // Map the pause/stop/resume button into its normalized functional name
     #define LCD_CLICKED (buttons&(B_MI|B_RI|B_ST)) // pause/stop button also acts as click until we implement proper pause/stop.
@@ -380,7 +380,7 @@ static void lcd_implementation_init(
 
   #if ENABLED(LCD_I2C_TYPE_PCF8575)
     lcd.begin(LCD_WIDTH, LCD_HEIGHT);
-    #ifdef LCD_I2C_PIN_BL
+    #if ENABLED(LCD_I2C_PIN_BL)
       lcd.setBacklightPin(LCD_I2C_PIN_BL, POSITIVE);
       lcd.setBacklight(HIGH);
     #endif
@@ -554,7 +554,7 @@ static void lcd_implementation_status_screen() {
 
         lcd.print('X');
         if (axis_known_position[X_AXIS])
-          #ifdef DELTA
+          #if MECH(DELTA)
             lcd.print(ftostr30(current_position[X_AXIS]));
           #else
             lcd.print(ftostr3(current_position[X_AXIS]));
@@ -562,7 +562,7 @@ static void lcd_implementation_status_screen() {
         else
           lcd_printPGM(PSTR("---"));
 
-        #ifdef DELTA
+        #if MECH(DELTA)
           lcd_printPGM(PSTR(" Y"));
           if (axis_known_position[Y_AXIS])
             lcd.print(ftostr30(current_position[Y_AXIS]));

MarlinKimbra/utf_mapper.h

@@ -141,7 +141,7 @@
       }
       else if (seen_c2){
         d &= 0x3f;
-        #ifndef MAPPER_ONE_TO_ONE
+        #if DISABLED(MAPPER_ONE_TO_ONE)
           HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
         #else
           HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
@@ -200,7 +200,7 @@
         return 0;
       } else if (seen_d5) {
           d &= 0x3fu;
-        #ifndef MAPPER_ONE_TO_ONE
+        #if DISABLED(MAPPER_ONE_TO_ONE)
           HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
         #else
           HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
@@ -230,7 +230,7 @@
         return 0;
       } else if ((seen_e3 == true) && (seen_82_83 == true)){
         d &= 0x3f;
-        #ifndef MAPPER_ONE_TO_ONE
+        #if DISABLED(MAPPER_ONE_TO_ONE)
           HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
         #else
           HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;