From e01f5e1ef7652973ddce84ca0c6655e7fc38378f Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Tue, 15 Sep 2015 12:36:08 -0500 Subject: [PATCH] Cleanup --- Marlin/Configuration.h | 32 ++++++------- Marlin/Configuration_adv.h | 46 +++++++++---------- Marlin/SdFatUtil.h | 2 +- Marlin/configurator/config/Configuration.h | 32 ++++++------- .../configurator/config/Configuration_adv.h | 46 +++++++++---------- .../Felix/Configuration.h | 34 +++++++------- .../Felix/Configuration_DUAL.h | 38 +++++++-------- .../Felix/Configuration_adv.h | 46 +++++++++---------- .../Hephestos/Configuration.h | 34 +++++++------- .../Hephestos/Configuration_adv.h | 46 +++++++++---------- .../K8200/Configuration.h | 30 ++++++------ .../K8200/Configuration_adv.h | 46 +++++++++---------- .../RepRapWorld/Megatronics/Configuration.h | 36 +++++++-------- .../RigidBot/Configuration.h | 36 +++++++-------- .../RigidBot/Configuration_adv.h | 46 +++++++++---------- .../SCARA/Configuration.h | 32 ++++++------- .../SCARA/Configuration_adv.h | 46 +++++++++---------- .../TAZ4/Configuration.h | 16 +++---- .../TAZ4/Configuration_adv.h | 46 +++++++++---------- .../WITBOX/Configuration.h | 34 +++++++------- .../WITBOX/Configuration_adv.h | 46 +++++++++---------- .../adafruit/ST7565/Configuration.h | 36 +++++++-------- .../delta/biv2.5/Configuration.h | 34 +++++++------- .../delta/biv2.5/Configuration_adv.h | 44 +++++++++--------- .../delta/generic/Configuration.h | 36 +++++++-------- .../delta/generic/Configuration_adv.h | 46 +++++++++---------- .../delta/kossel_mini/Configuration.h | 34 +++++++------- .../delta/kossel_mini/Configuration_adv.h | 46 +++++++++---------- .../delta/kossel_pro/Configuration.h | 34 +++++++------- .../delta/kossel_pro/Configuration_adv.h | 46 +++++++++---------- .../makibox/Configuration.h | 36 +++++++-------- .../makibox/Configuration_adv.h | 46 +++++++++---------- .../tvrrug/Round2/Configuration.h | 36 +++++++-------- .../tvrrug/Round2/Configuration_adv.h | 46 +++++++++---------- Marlin/pins_MEGACONTROLLER.h | 6 +-- Marlin/pins_RAMBO.h | 8 ++-- Marlin/pins_RAMPS_13.h | 14 +++--- Marlin/pins_RIGIDBOARD.h | 4 +- Marlin/pins_SANGUINOLOLU_11.h | 14 +++--- 39 files changed, 668 insertions(+), 668 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7c1009e09..e209b18e2 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -321,13 +321,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -419,8 +419,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -504,7 +504,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -723,7 +723,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -777,7 +777,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 50be513ed..8c4eb0e51 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -145,7 +145,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -217,7 +217,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -433,7 +433,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -470,52 +470,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -532,63 +532,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/SdFatUtil.h b/Marlin/SdFatUtil.h index ac004cf7d..0cd4e8a36 100644 --- a/Marlin/SdFatUtil.h +++ b/Marlin/SdFatUtil.h @@ -42,7 +42,7 @@ namespace SdFatUtil { } using namespace SdFatUtil; // NOLINT -#endif // #define SdFatUtil_h +#endif //#define SdFatUtil_h #endif \ No newline at end of file diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index ec7f0969d..c27646522 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -321,13 +321,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -419,8 +419,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -504,7 +504,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -722,7 +722,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -776,7 +776,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index f622524f7..ee6e6aadf 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -145,7 +145,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -217,7 +217,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -432,7 +432,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -469,52 +469,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -531,63 +531,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index b5543e3d9..5630c1786 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -288,10 +288,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -303,13 +303,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -401,8 +401,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -486,7 +486,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -705,7 +705,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -759,7 +759,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 672e05446..dad352aa6 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -78,7 +78,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders #define EXTRUDERS 2 @@ -131,8 +131,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 1 @@ -273,10 +273,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -288,13 +288,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -371,8 +371,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -457,7 +457,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -547,8 +547,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing). // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder). // For the other hotends it is their distance from the extruder 0 hotend. -// #define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis -// #define EXTRUDER_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis +//#define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis +//#define EXTRUDER_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) #define DEFAULT_XYJERK 10 // (mm/sec) @@ -675,7 +675,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -723,7 +723,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SF send wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 7b6cdd728..8ae05cfbd 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,63 +537,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index c6fcee837..b61cf1988 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -82,7 +82,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -145,8 +145,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -298,10 +298,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -313,13 +313,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -411,8 +411,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -497,7 +497,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -715,7 +715,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -769,7 +769,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index e8334227a..5d25cd62a 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,63 +537,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 5d4734ee3..3a6056652 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -80,11 +80,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -147,8 +147,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 5 #define TEMP_SENSOR_1 0 @@ -294,10 +294,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -309,13 +309,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX #define ENDSTOPPULLUP_XMIN #define ENDSTOPPULLUP_YMIN #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -407,8 +407,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -492,7 +492,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -710,7 +710,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -764,7 +764,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index dee7514d8..d51ed247f 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,63 +537,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 6f7e7e1c7..783410143 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -306,10 +306,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -321,13 +321,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -419,8 +419,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -505,7 +505,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -723,7 +723,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -777,7 +777,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 2369b878f..50d3ea6c7 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 // DGlass3D = 5; RigidBot = 1; 3DSv6 = 5 #define TEMP_SENSOR_1 0 @@ -215,9 +215,9 @@ Here are some standard links for getting your machine calibrated: #define DEFAULT_Kd 76.55 // Base DGlass3D/E3Dv6 hotend - // #define DEFAULT_Kp 10 - // #define DEFAULT_Ki 0.85 - // #define DEFAULT_Kd 245 + //#define DEFAULT_Kp 10 + //#define DEFAULT_Ki 0.85 + //#define DEFAULT_Kd 245 #endif // PIDTEMP @@ -307,13 +307,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -405,8 +405,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -490,7 +490,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -766,7 +766,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 80580c2d3..264a40401 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -145,7 +145,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -217,7 +217,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -433,7 +433,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -470,52 +470,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -532,63 +532,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 0738512ef..d7270e038 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -100,11 +100,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -167,8 +167,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -314,10 +314,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -329,13 +329,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX #define ENDSTOPPULLUP_ZMAX // open pin, inverted #define ENDSTOPPULLUP_XMIN // open pin, inverted #define ENDSTOPPULLUP_YMIN // open pin, inverted - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -427,8 +427,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -512,7 +512,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -521,7 +521,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, // it is highly recommended you let this Z_SAFE_HOMING enabled!!! - // #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. + //#define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: // - Allow Z homing only after X and Y homing AND stepper drivers still enabled. // - If stepper drivers timeout, it will need X and Y homing again before Z homing. @@ -730,7 +730,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -784,7 +784,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index a5983c5ae..2fa80655f 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,63 +537,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index cf52f9c3c..9355d8f7e 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 7 #define TEMP_SENSOR_1 7 @@ -439,8 +439,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -523,7 +523,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -741,7 +741,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -795,7 +795,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 126794b1b..ffc126fb1 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ #define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -478,52 +478,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -540,63 +540,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 720aff139..d6775586e 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -82,7 +82,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -145,8 +145,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -298,10 +298,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -313,13 +313,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -411,8 +411,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -496,7 +496,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -714,7 +714,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -768,7 +768,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index e010b1383..2036af08c 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,63 +537,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 3d72a5fd3..048e8b050 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -306,10 +306,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -321,13 +321,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -419,8 +419,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -505,7 +505,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -723,7 +723,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -777,7 +777,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index fb77c1eda..028c14617 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 5 #define TEMP_SENSOR_1 5 @@ -306,10 +306,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ //=========================================================================== //============================== Delta Settings ============================= @@ -356,13 +356,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -454,8 +454,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -543,7 +543,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 50 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -847,7 +847,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // See http://minow.blogspot.com/index.html#4918805519571907051 // If needed, adjust the X, Y, Z calibration coordinates // in ultralcd.cpp@lcd_delta_calibrate_menu() -// #define DELTA_CALIBRATION_MENU +//#define DELTA_CALIBRATION_MENU /** * I2C Panels @@ -901,7 +901,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index e04d43a1e..3dc7c222d 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -476,52 +476,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -538,63 +538,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 7a6bf66e1..27679e76b 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 -1 #define TEMP_SENSOR_1 -1 @@ -306,10 +306,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ //=========================================================================== //============================== Delta Settings ============================= @@ -356,13 +356,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -454,8 +454,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -544,7 +544,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points #define Z_RAISE_AFTER_PROBING 50 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -848,11 +848,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // See http://minow.blogspot.com/index.html#4918805519571907051 // If needed, adjust the X, Y, Z calibration coordinates // in ultralcd.cpp@lcd_delta_calibrate_menu() -// #define DELTA_CALIBRATION_MENU +//#define DELTA_CALIBRATION_MENU // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -906,7 +906,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 7ba24cd24..2426f2bf4 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -443,7 +443,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -477,52 +477,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -539,63 +539,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 5f47f1baa..ac8a1a485 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 7 #define TEMP_SENSOR_1 0 @@ -306,10 +306,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ //=========================================================================== //============================== Delta Settings ============================= @@ -356,13 +356,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -454,8 +454,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -544,7 +544,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points #define Z_RAISE_AFTER_PROBING 50 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -852,7 +852,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // See http://minow.blogspot.com/index.html#4918805519571907051 // If needed, adjust the X, Y, Z calibration coordinates // in ultralcd.cpp@lcd_delta_calibrate_menu() -// #define DELTA_CALIBRATION_MENU +//#define DELTA_CALIBRATION_MENU /** * I2C Panels @@ -906,7 +906,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 60700a2e9..ee2437868 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -442,7 +442,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -476,52 +476,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -538,63 +538,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index b484a2dcc..eb4f59724 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -83,7 +83,7 @@ Here are some standard links for getting your machine calibrated: // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -146,8 +146,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 5 #define TEMP_SENSOR_1 0 @@ -293,10 +293,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ //=========================================================================== //============================== Delta Settings ============================= @@ -343,13 +343,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -441,8 +441,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -533,7 +533,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -843,7 +843,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // See http://minow.blogspot.com/index.html#4918805519571907051 // If needed, adjust the X, Y, Z calibration coordinates // in ultralcd.cpp@lcd_delta_calibrate_menu() -// #define DELTA_CALIBRATION_MENU +//#define DELTA_CALIBRATION_MENU /** * I2C Panels @@ -897,7 +897,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 98632c104..372328bb0 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -157,7 +157,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -229,7 +229,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -446,7 +446,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -480,52 +480,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -542,63 +542,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 7dc984e71..d2870e807 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 0 @@ -309,10 +309,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers //#define CONFIG_STEPPERS_TOSHIBA @@ -324,13 +324,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -422,8 +422,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -507,7 +507,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -725,7 +725,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -779,7 +779,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 7ba1c6b3e..ef9c9c140 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -440,7 +440,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -474,52 +474,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -536,63 +536,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index eee2edc17..e1e5ce028 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -75,11 +75,11 @@ Here are some standard links for getting your machine calibrated: // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +//#define CUSTOM_MACHINE_NAME "3D Printer" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders // :[1,2,3,4] @@ -142,8 +142,8 @@ Here are some standard links for getting your machine calibrated: // 110 is Pt100 with 1k pullup (non standard) // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. // Use it for Testing or Development purposes. NEVER for production machine. -// #define DUMMY_THERMISTOR_998_VALUE 25 -// #define DUMMY_THERMISTOR_999_VALUE 100 +//#define DUMMY_THERMISTOR_998_VALUE 25 +//#define DUMMY_THERMISTOR_999_VALUE 100 // :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } #define TEMP_SENSOR_0 5 #define TEMP_SENSOR_1 0 @@ -296,10 +296,10 @@ Here are some standard links for getting your machine calibrated: // @section machine // Uncomment this option to enable CoreXY kinematics -// #define COREXY +//#define COREXY // Uncomment this option to enable CoreXZ kinematics -// #define COREXZ +//#define COREXZ // Enable this option for Toshiba steppers #define CONFIG_STEPPERS_TOSHIBA @@ -311,13 +311,13 @@ Here are some standard links for getting your machine calibrated: #if DISABLED(ENDSTOPPULLUPS) // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - // #define ENDSTOPPULLUP_XMAX - // #define ENDSTOPPULLUP_YMAX - // #define ENDSTOPPULLUP_ZMAX - // #define ENDSTOPPULLUP_XMIN - // #define ENDSTOPPULLUP_YMIN - // #define ENDSTOPPULLUP_ZMIN - // #define ENDSTOPPULLUP_ZMIN_PROBE + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). @@ -409,8 +409,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //=========================== Manual Bed Leveling =========================== //=========================================================================== -// #define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -// #define MESH_BED_LEVELING // Enable mesh bed leveling. +//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. +//#define MESH_BED_LEVELING // Enable mesh bed leveling. #if ENABLED(MANUAL_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -495,7 +495,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -// #define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. @@ -717,7 +717,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The MakerLab Mini Panel with graphic controller and SD support // http://reprap.org/wiki/Mini_panel -// #define MINIPANEL +//#define MINIPANEL /** * I2C Panels @@ -771,7 +771,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -// #define PHOTOGRAPH_PIN 23 +//#define PHOTOGRAPH_PIN 23 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure //#define SF_ARC_FIX diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 416d13516..c1c9313dd 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -153,7 +153,7 @@ // Play a little bit with small adjustments (0.5mm) and check the behaviour. // The M119 (endstops report) will start reporting the Z2 Endstop as well. - // #define Z_DUAL_ENDSTOPS + //#define 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) @@ -225,7 +225,7 @@ //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. // When G28 is called, this option will make Y home before X -// #define HOME_Y_BEFORE_X +//#define HOME_Y_BEFORE_X // @section machine @@ -441,7 +441,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st // until then, intended retractions can be detected by moves that only extrude and the direction. // the moves are than replaced by the firmware controlled ones. -// #define FWRETRACT //ONLY PARTIALLY TESTED +//#define FWRETRACT //ONLY PARTIALLY TESTED #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) @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -// #define X_IS_TMC +//#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -// #define X2_IS_TMC +//#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -// #define Y_IS_TMC +//#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -// #define Y2_IS_TMC +//#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -// #define Z_IS_TMC +//#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -// #define Z2_IS_TMC +//#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -// #define E0_IS_TMC +//#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -// #define E1_IS_TMC +//#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -// #define E2_IS_TMC +//#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -// #define E3_IS_TMC +//#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,63 +537,63 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -// #define X_IS_L6470 +//#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define X2_IS_L6470 +//#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y_IS_L6470 +//#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Y2_IS_L6470 +//#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z_IS_L6470 +//#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define Z2_IS_L6470 +//#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E0_IS_L6470 +//#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E1_IS_L6470 +//#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E2_IS_L6470 +//#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -// #define E3_IS_L6470 +//#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/pins_MEGACONTROLLER.h index c472a9d38..3bb1df548 100644 --- a/Marlin/pins_MEGACONTROLLER.h +++ b/Marlin/pins_MEGACONTROLLER.h @@ -91,9 +91,9 @@ // GLCD features //#define LCD_CONTRAST 190 // Uncomment screen orientation - // #define LCD_SCREEN_ROT_90 - // #define LCD_SCREEN_ROT_180 - // #define LCD_SCREEN_ROT_270 + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 //The encoder and click button #define BTN_EN1 48 #define BTN_EN2 11 diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index 1d68cd66e..9092b7ac1 100644 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -133,10 +133,10 @@ //buttons are attached to a shift register // Not wired yet - // #define SHIFT_CLK 38 - // #define SHIFT_LD 42 - // #define SHIFT_OUT 40 - // #define SHIFT_EN 17 + //#define SHIFT_CLK 38 + //#define SHIFT_LD 42 + //#define SHIFT_OUT 40 + //#define SHIFT_EN 17 #define LCD_PINS_RS 75 #define LCD_PINS_ENABLE 17 diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index 69e4c685d..f9ce57d4d 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -181,9 +181,9 @@ // GLCD features //#define LCD_CONTRAST 190 // Uncomment screen orientation - // #define LCD_SCREEN_ROT_90 - // #define LCD_SCREEN_ROT_180 - // #define LCD_SCREEN_ROT_270 + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 //The encoder and click button #define BTN_EN1 40 #define BTN_EN2 63 @@ -226,10 +226,10 @@ // Buttons are attached to a shift register // Not wired yet - // #define SHIFT_CLK 38 - // #define SHIFT_LD 42 - // #define SHIFT_OUT 40 - // #define SHIFT_EN 17 + //#define SHIFT_CLK 38 + //#define SHIFT_LD 42 + //#define SHIFT_OUT 40 + //#define SHIFT_EN 17 #define LCD_PINS_RS 16 #define LCD_PINS_ENABLE 17 diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h index b6d1d0683..4f8abc126 100644 --- a/Marlin/pins_RIGIDBOARD.h +++ b/Marlin/pins_RIGIDBOARD.h @@ -37,8 +37,8 @@ // Marlin can respond to UP/DOWN by default // #undef BTN_EN1 // #undef BTN_EN2 - // #define BTN_EN1 -1 - // #define BTN_EN2 -1 + //#define BTN_EN1 -1 + //#define BTN_EN2 -1 #undef BTN_ENC #define BTN_ENC 31 diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h index cc0099a53..a92b4dedb 100644 --- a/Marlin/pins_SANGUINOLOLU_11.h +++ b/Marlin/pins_SANGUINOLOLU_11.h @@ -113,9 +113,9 @@ // Uncomment screen orientation #define LCD_SCREEN_ROT_0 - // #define LCD_SCREEN_ROT_90 - // #define LCD_SCREEN_ROT_180 - // #define LCD_SCREEN_ROT_270 + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 #else // !DOGLCD - Standard Hitachi LCD controller @@ -157,9 +157,9 @@ #define LCD_CONTRAST 1 // Uncomment screen orientation #define LCD_SCREEN_ROT_0 - // #define LCD_SCREEN_ROT_90 - // #define LCD_SCREEN_ROT_180 - // #define LCD_SCREEN_ROT_270 + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 //The encoder and click button #define BTN_EN1 11 #define BTN_EN2 10 @@ -170,5 +170,5 @@ #endif // MAKRPANEL // #if FAN_PIN == 12 || FAN_PIN ==13 -// #define FAN_SOFT_PWM +//#define FAN_SOFT_PWM // #endif