From 32683b282b5fabf10b2cb80b0bb6e35d48d9352a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 Jul 2015 18:53:01 -0700 Subject: [PATCH] Include configurator copies of configs --- Marlin/configurator/config/Configuration.h | 30 ++++++------- .../configurator/config/Configuration_adv.h | 44 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index c441c24675..dfcfaebee7 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#ifdef HAS_AUTOMATIC_VERSIONING +#if ENABLED(HAS_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" @@ -195,7 +195,7 @@ Here are some standard links for getting your machine calibrated: #define PIDTEMP #define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current #define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current -#ifdef PIDTEMP +#if ENABLED(PIDTEMP) //#define PID_DEBUG // Sends debug data to the serial port. //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay @@ -248,7 +248,7 @@ Here are some standard links for getting your machine calibrated: //#define PID_BED_DEBUG // Sends debug data to the serial port. -#ifdef PIDTEMPBED +#if ENABLED(PIDTEMPBED) #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term @@ -318,7 +318,7 @@ Here are some standard links for getting your machine calibrated: // coarse Endstop Settings #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors -#ifndef ENDSTOPPULLUPS +#if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined // #define ENDSTOPPULLUP_XMAX // #define ENDSTOPPULLUP_YMAX @@ -408,7 +408,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // It is assumed that when logic high = filament available // when logic low = filament ran out -#ifdef FILAMENT_RUNOUT_SENSOR +#if ENABLED(FILAMENT_RUNOUT_SENSOR) const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. #define FILAMENT_RUNOUT_SCRIPT "M600" @@ -421,11 +421,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // #define MANUAL_BED_LEVELING // Add display menu option for bed leveling // #define MESH_BED_LEVELING // Enable mesh bed leveling -#ifdef MANUAL_BED_LEVELING +#if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis #endif // MANUAL_BED_LEVELING -#ifdef MESH_BED_LEVELING +#if ENABLED(MESH_BED_LEVELING) #define MESH_MIN_X 10 #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) #define MESH_MIN_Y 10 @@ -444,7 +444,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) #define Z_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled. -#ifdef ENABLE_AUTO_BED_LEVELING +#if ENABLED(ENABLE_AUTO_BED_LEVELING) // There are 2 different ways to specify probing locations // @@ -461,7 +461,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // Note: this feature generates 10KB extra code size #define AUTO_BED_LEVELING_GRID - #ifdef AUTO_BED_LEVELING_GRID + #if ENABLED(AUTO_BED_LEVELING_GRID) #define LEFT_PROBE_BED_POSITION 15 #define RIGHT_PROBE_BED_POSITION 170 @@ -518,7 +518,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // - Position the probe in a defined XY point before Z Homing when homing all axis (G28) // - Block Z homing only when the probe is outside bed area. - #ifdef Z_SAFE_HOMING + #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2) // X point for Z homing when homing all axis (G28) #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28) @@ -550,7 +550,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // Manual homing switch locations: // For deltabots this means top and center of the Cartesian print volume. -#ifdef MANUAL_HOME_POSITIONS +#if ENABLED(MANUAL_HOME_POSITIONS) #define MANUAL_X_HOME_POS 0 #define MANUAL_Y_HOME_POS 0 #define MANUAL_Z_HOME_POS 0 @@ -589,8 +589,8 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // Custom M code points #define CUSTOM_M_CODES -#ifdef CUSTOM_M_CODES - #ifdef ENABLE_AUTO_BED_LEVELING +#if ENABLED(CUSTOM_M_CODES) + #if ENABLED(ENABLE_AUTO_BED_LEVELING) #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 #define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MAX 20 @@ -607,7 +607,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //define this to enable EEPROM support //#define EEPROM_SETTINGS -#ifdef EEPROM_SETTINGS +#if ENABLED(EEPROM_SETTINGS) // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: #define EEPROM_CHITCHAT // Please keep turned on if you can. #endif @@ -796,7 +796,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // With this option servos are powered only during movement, then turned off to prevent jitter. //#define DEACTIVATE_SERVOS_AFTER_MOVE -#ifdef DEACTIVATE_SERVOS_AFTER_MOVE +#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) // Delay (in microseconds) before turning the servo off. This depends on the servo speed. // 300ms is a good value but you can try less delay. // If the servo can't reach the requested position, increase it. diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index e6c954d587..94d96d01aa 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -9,7 +9,7 @@ //=============================Thermal Settings ============================ //=========================================================================== -#ifdef BED_LIMIT_SWITCHING +#if ENABLED(BED_LIMIT_SWITCHING) #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS #endif #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control @@ -17,7 +17,7 @@ /** * Thermal Protection parameters */ -#ifdef THERMAL_PROTECTION_HOTENDS +#if ENABLED(THERMAL_PROTECTION_HOTENDS) #define THERMAL_PROTECTION_PERIOD 40 // Seconds #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius @@ -31,16 +31,16 @@ #define WATCH_TEMP_INCREASE 4 // Degrees Celsius #endif -#ifdef THERMAL_PROTECTION_BED +#if ENABLED(THERMAL_PROTECTION_BED) #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -#ifdef PIDTEMP +#if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. #define PID_ADD_EXTRUSION_RATE - #ifdef PID_ADD_EXTRUSION_RATE + #if ENABLED(PID_ADD_EXTRUSION_RATE) #define DEFAULT_Kc (1) //heating power=Kc*(e_speed) #endif #endif @@ -56,7 +56,7 @@ * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode */ #define AUTOTEMP -#ifdef AUTOTEMP +#if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 #endif @@ -133,7 +133,7 @@ // On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder. //#define Z_DUAL_STEPPER_DRIVERS -#ifdef Z_DUAL_STEPPER_DRIVERS +#if ENABLED(Z_DUAL_STEPPER_DRIVERS) // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper. // That way the machine is capable to align the bed during home, since both Z steppers are homed. @@ -150,7 +150,7 @@ // #define Z_DUAL_ENDSTOPS - #ifdef Z_DUAL_ENDSTOPS + #if ENABLED(Z_DUAL_ENDSTOPS) #define Z2_MAX_PIN 36 //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36) const bool Z2_MAX_ENDSTOP_INVERTING = false; #define DISABLE_XMAX_ENDSTOP //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis. @@ -169,7 +169,7 @@ // prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage // allowing faster printing speeds. //#define DUAL_X_CARRIAGE -#ifdef DUAL_X_CARRIAGE +#if ENABLED(DUAL_X_CARRIAGE) // Configuration for second X-carriage // Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop; // the second x-carriage always homes to the maximum endstop. @@ -240,7 +240,7 @@ // @section lcd -#ifdef ULTIPANEL +#if ENABLED(ULTIPANEL) #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder #endif @@ -289,7 +289,7 @@ // @section lcd -#ifdef SDSUPPORT +#if ENABLED(SDSUPPORT) // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT @@ -310,7 +310,7 @@ // Show a progress bar on HD44780 LCDs for SD printing //#define LCD_PROGRESS_BAR - #ifdef LCD_PROGRESS_BAR + #if ENABLED(LCD_PROGRESS_BAR) // Amount of time (ms) to show the bar #define PROGRESS_BAR_BAR_TIME 2000 // Amount of time (ms) to show the status message @@ -333,7 +333,7 @@ #endif // SDSUPPORT // for dogm lcd displays you can choose some additional fonts: -#ifdef DOGLCD +#if ENABLED(DOGLCD) // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT // we don't have a big font for Cyrillic, Kana //#define USE_BIG_EDIT_FONT @@ -348,7 +348,7 @@ // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. //#define USE_WATCHDOG -#ifdef USE_WATCHDOG +#if ENABLED(USE_WATCHDOG) // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. @@ -361,7 +361,7 @@ // it can e.g. be used to change z-positions in the print startup phase in real-time // does not respect endstops! //#define BABYSTEPPING -#ifdef BABYSTEPPING +#if ENABLED(BABYSTEPPING) #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements @@ -378,7 +378,7 @@ // so: v ^ 2 is proportional to number of steps we advance the extruder //#define ADVANCE -#ifdef ADVANCE +#if ENABLED(ADVANCE) #define EXTRUDER_ADVANCE_K .0 #define D_FILAMENT 2.85 #define STEPS_MM_E 836 @@ -405,7 +405,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // The number of linear motions that can be in the plan at any give time. // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering. -#ifdef SDSUPPORT +#if ENABLED(SDSUPPORT) #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller #else #define BLOCK_BUFFER_SIZE 16 // maximize block buffer @@ -435,7 +435,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // the moves are than replaced by the firmware controlled ones. // #define FWRETRACT //ONLY PARTIALLY TESTED -#ifdef FWRETRACT +#if ENABLED(FWRETRACT) #define MIN_RETRACT 0.1 //minimum extruded mm to accept a automatic gcode retraction attempt #define RETRACT_LENGTH 3 //default retract length (positive mm) #define RETRACT_LENGTH_SWAP 13 //default swap retract length (positive mm), for extruder change @@ -447,9 +447,9 @@ const unsigned int dropsegments=5; //everything with less than this number of st #endif // Add support for experimental filament exchange support M600; requires display -#ifdef ULTIPANEL +#if ENABLED(ULTIPANEL) //#define FILAMENTCHANGEENABLE - #ifdef FILAMENTCHANGEENABLE + #if ENABLED(FILAMENTCHANGEENABLE) #define FILAMENTCHANGE_XPOS 3 #define FILAMENTCHANGE_YPOS 3 #define FILAMENTCHANGE_ZADD 10 @@ -469,7 +469,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // @section tmc //#define HAVE_TMCDRIVER -#ifdef HAVE_TMCDRIVER +#if ENABLED(HAVE_TMCDRIVER) // #define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA @@ -531,7 +531,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // @section l6470 //#define HAVE_L6470DRIVER -#ifdef HAVE_L6470DRIVER +#if ENABLED(HAVE_L6470DRIVER) // #define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps