Browse Source

Include configurator copies of configs

Scott Lahteine 9 years ago
parent
commit
32683b282b

+ 15
- 15
Marlin/configurator/config/Configuration.h View File

38
 
38
 
39
 // @section info
39
 // @section info
40
 
40
 
41
-#ifdef HAS_AUTOMATIC_VERSIONING
41
+#if ENABLED(HAS_AUTOMATIC_VERSIONING)
42
   #include "_Version.h"
42
   #include "_Version.h"
43
 #else
43
 #else
44
   #include "Default_Version.h"
44
   #include "Default_Version.h"
195
 #define PIDTEMP
195
 #define PIDTEMP
196
 #define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current
196
 #define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current
197
 #define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
197
 #define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
198
-#ifdef PIDTEMP
198
+#if ENABLED(PIDTEMP)
199
   //#define PID_DEBUG // Sends debug data to the serial port.
199
   //#define PID_DEBUG // Sends debug data to the serial port.
200
   //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
200
   //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
201
   //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
201
   //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
248
 
248
 
249
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
249
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
250
 
250
 
251
-#ifdef PIDTEMPBED
251
+#if ENABLED(PIDTEMPBED)
252
 
252
 
253
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
253
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
254
 
254
 
318
 // coarse Endstop Settings
318
 // coarse Endstop Settings
319
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
319
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
320
 
320
 
321
-#ifndef ENDSTOPPULLUPS
321
+#if DISABLED(ENDSTOPPULLUPS)
322
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
322
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
323
   // #define ENDSTOPPULLUP_XMAX
323
   // #define ENDSTOPPULLUP_XMAX
324
   // #define ENDSTOPPULLUP_YMAX
324
   // #define ENDSTOPPULLUP_YMAX
408
                                  // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
408
                                  // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
409
                                  // It is assumed that when logic high = filament available
409
                                  // It is assumed that when logic high = filament available
410
                                  //                    when logic  low = filament ran out
410
                                  //                    when logic  low = filament ran out
411
-#ifdef FILAMENT_RUNOUT_SENSOR
411
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
412
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
412
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
413
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
413
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
414
   #define FILAMENT_RUNOUT_SCRIPT "M600"
414
   #define FILAMENT_RUNOUT_SCRIPT "M600"
421
 // #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling
421
 // #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling
422
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
422
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
423
 
423
 
424
-#ifdef MANUAL_BED_LEVELING
424
+#if ENABLED(MANUAL_BED_LEVELING)
425
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis
425
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis
426
 #endif  // MANUAL_BED_LEVELING
426
 #endif  // MANUAL_BED_LEVELING
427
 
427
 
428
-#ifdef MESH_BED_LEVELING
428
+#if ENABLED(MESH_BED_LEVELING)
429
   #define MESH_MIN_X 10
429
   #define MESH_MIN_X 10
430
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
430
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
431
   #define MESH_MIN_Y 10
431
   #define MESH_MIN_Y 10
444
 //#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line)
444
 //#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line)
445
 #define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
445
 #define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
446
 
446
 
447
-#ifdef ENABLE_AUTO_BED_LEVELING
447
+#if ENABLED(ENABLE_AUTO_BED_LEVELING)
448
 
448
 
449
   // There are 2 different ways to specify probing locations
449
   // There are 2 different ways to specify probing locations
450
   //
450
   //
461
   // Note: this feature generates 10KB extra code size
461
   // Note: this feature generates 10KB extra code size
462
   #define AUTO_BED_LEVELING_GRID
462
   #define AUTO_BED_LEVELING_GRID
463
 
463
 
464
-  #ifdef AUTO_BED_LEVELING_GRID
464
+  #if ENABLED(AUTO_BED_LEVELING_GRID)
465
 
465
 
466
     #define LEFT_PROBE_BED_POSITION 15
466
     #define LEFT_PROBE_BED_POSITION 15
467
     #define RIGHT_PROBE_BED_POSITION 170
467
     #define RIGHT_PROBE_BED_POSITION 170
518
                           // - Position the probe in a defined XY point before Z Homing when homing all axis (G28)
518
                           // - Position the probe in a defined XY point before Z Homing when homing all axis (G28)
519
                           // - Block Z homing only when the probe is outside bed area.
519
                           // - Block Z homing only when the probe is outside bed area.
520
 
520
 
521
-  #ifdef Z_SAFE_HOMING
521
+  #if ENABLED(Z_SAFE_HOMING)
522
 
522
 
523
     #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2)    // X point for Z homing when homing all axis (G28)
523
     #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2)    // X point for Z homing when homing all axis (G28)
524
     #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
524
     #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
550
 
550
 
551
 // Manual homing switch locations:
551
 // Manual homing switch locations:
552
 // For deltabots this means top and center of the Cartesian print volume.
552
 // For deltabots this means top and center of the Cartesian print volume.
553
-#ifdef MANUAL_HOME_POSITIONS
553
+#if ENABLED(MANUAL_HOME_POSITIONS)
554
   #define MANUAL_X_HOME_POS 0
554
   #define MANUAL_X_HOME_POS 0
555
   #define MANUAL_Y_HOME_POS 0
555
   #define MANUAL_Y_HOME_POS 0
556
   #define MANUAL_Z_HOME_POS 0
556
   #define MANUAL_Z_HOME_POS 0
589
 
589
 
590
 // Custom M code points
590
 // Custom M code points
591
 #define CUSTOM_M_CODES
591
 #define CUSTOM_M_CODES
592
-#ifdef CUSTOM_M_CODES
593
-  #ifdef ENABLE_AUTO_BED_LEVELING
592
+#if ENABLED(CUSTOM_M_CODES)
593
+  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
594
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
594
     #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
595
     #define Z_PROBE_OFFSET_RANGE_MIN -20
595
     #define Z_PROBE_OFFSET_RANGE_MIN -20
596
     #define Z_PROBE_OFFSET_RANGE_MAX 20
596
     #define Z_PROBE_OFFSET_RANGE_MAX 20
607
 //define this to enable EEPROM support
607
 //define this to enable EEPROM support
608
 //#define EEPROM_SETTINGS
608
 //#define EEPROM_SETTINGS
609
 
609
 
610
-#ifdef EEPROM_SETTINGS
610
+#if ENABLED(EEPROM_SETTINGS)
611
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
611
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
612
   #define EEPROM_CHITCHAT // Please keep turned on if you can.
612
   #define EEPROM_CHITCHAT // Please keep turned on if you can.
613
 #endif
613
 #endif
796
 // With this option servos are powered only during movement, then turned off to prevent jitter.
796
 // With this option servos are powered only during movement, then turned off to prevent jitter.
797
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
797
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
798
 
798
 
799
-#ifdef DEACTIVATE_SERVOS_AFTER_MOVE
799
+#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE)
800
   // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
800
   // Delay (in microseconds) before turning the servo off. This depends on the servo speed.
801
   // 300ms is a good value but you can try less delay.
801
   // 300ms is a good value but you can try less delay.
802
   // If the servo can't reach the requested position, increase it.
802
   // If the servo can't reach the requested position, increase it.

+ 22
- 22
Marlin/configurator/config/Configuration_adv.h View File

9
 //=============================Thermal Settings  ============================
9
 //=============================Thermal Settings  ============================
10
 //===========================================================================
10
 //===========================================================================
11
 
11
 
12
-#ifdef BED_LIMIT_SWITCHING
12
+#if ENABLED(BED_LIMIT_SWITCHING)
13
   #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
13
   #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
14
 #endif
14
 #endif
15
 #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control
15
 #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control
17
 /**
17
 /**
18
  * Thermal Protection parameters
18
  * Thermal Protection parameters
19
  */
19
  */
20
-#ifdef THERMAL_PROTECTION_HOTENDS
20
+#if ENABLED(THERMAL_PROTECTION_HOTENDS)
21
   #define THERMAL_PROTECTION_PERIOD 40        // Seconds
21
   #define THERMAL_PROTECTION_PERIOD 40        // Seconds
22
   #define THERMAL_PROTECTION_HYSTERESIS 4     // Degrees Celsius
22
   #define THERMAL_PROTECTION_HYSTERESIS 4     // Degrees Celsius
23
 
23
 
31
   #define WATCH_TEMP_INCREASE 4               // Degrees Celsius
31
   #define WATCH_TEMP_INCREASE 4               // Degrees Celsius
32
 #endif
32
 #endif
33
 
33
 
34
-#ifdef THERMAL_PROTECTION_BED
34
+#if ENABLED(THERMAL_PROTECTION_BED)
35
   #define THERMAL_PROTECTION_BED_PERIOD 20    // Seconds
35
   #define THERMAL_PROTECTION_BED_PERIOD 20    // Seconds
36
   #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
36
   #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
37
 #endif
37
 #endif
38
 
38
 
39
-#ifdef PIDTEMP
39
+#if ENABLED(PIDTEMP)
40
   // this adds an experimental additional term to the heating power, proportional to the extrusion speed.
40
   // this adds an experimental additional term to the heating power, proportional to the extrusion speed.
41
   // if Kc is chosen well, the additional required power due to increased melting should be compensated.
41
   // if Kc is chosen well, the additional required power due to increased melting should be compensated.
42
   #define PID_ADD_EXTRUSION_RATE
42
   #define PID_ADD_EXTRUSION_RATE
43
-  #ifdef PID_ADD_EXTRUSION_RATE
43
+  #if ENABLED(PID_ADD_EXTRUSION_RATE)
44
     #define  DEFAULT_Kc (1) //heating power=Kc*(e_speed)
44
     #define  DEFAULT_Kc (1) //heating power=Kc*(e_speed)
45
   #endif
45
   #endif
46
 #endif
46
 #endif
56
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
56
  * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
57
  */
57
  */
58
 #define AUTOTEMP
58
 #define AUTOTEMP
59
-#ifdef AUTOTEMP
59
+#if ENABLED(AUTOTEMP)
60
   #define AUTOTEMP_OLDWEIGHT 0.98
60
   #define AUTOTEMP_OLDWEIGHT 0.98
61
 #endif
61
 #endif
62
 
62
 
133
 // On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder.
133
 // On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder.
134
 //#define Z_DUAL_STEPPER_DRIVERS
134
 //#define Z_DUAL_STEPPER_DRIVERS
135
 
135
 
136
-#ifdef Z_DUAL_STEPPER_DRIVERS
136
+#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
137
 
137
 
138
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
138
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
139
   // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
139
   // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
150
 
150
 
151
   // #define Z_DUAL_ENDSTOPS
151
   // #define Z_DUAL_ENDSTOPS
152
 
152
 
153
-  #ifdef Z_DUAL_ENDSTOPS
153
+  #if ENABLED(Z_DUAL_ENDSTOPS)
154
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
154
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
155
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
155
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
156
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.
156
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.
169
 // prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage
169
 // prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage
170
 // allowing faster printing speeds.
170
 // allowing faster printing speeds.
171
 //#define DUAL_X_CARRIAGE
171
 //#define DUAL_X_CARRIAGE
172
-#ifdef DUAL_X_CARRIAGE
172
+#if ENABLED(DUAL_X_CARRIAGE)
173
   // Configuration for second X-carriage
173
   // Configuration for second X-carriage
174
   // Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop;
174
   // Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop;
175
   // the second x-carriage always homes to the maximum endstop.
175
   // the second x-carriage always homes to the maximum endstop.
240
 
240
 
241
 // @section lcd
241
 // @section lcd
242
 
242
 
243
-#ifdef ULTIPANEL
243
+#if ENABLED(ULTIPANEL)
244
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
244
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
245
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
245
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
246
 #endif
246
 #endif
289
 
289
 
290
 // @section lcd
290
 // @section lcd
291
 
291
 
292
-#ifdef SDSUPPORT
292
+#if ENABLED(SDSUPPORT)
293
 
293
 
294
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
294
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
295
   // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
295
   // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
310
   // Show a progress bar on HD44780 LCDs for SD printing
310
   // Show a progress bar on HD44780 LCDs for SD printing
311
   //#define LCD_PROGRESS_BAR
311
   //#define LCD_PROGRESS_BAR
312
 
312
 
313
-  #ifdef LCD_PROGRESS_BAR
313
+  #if ENABLED(LCD_PROGRESS_BAR)
314
     // Amount of time (ms) to show the bar
314
     // Amount of time (ms) to show the bar
315
     #define PROGRESS_BAR_BAR_TIME 2000
315
     #define PROGRESS_BAR_BAR_TIME 2000
316
     // Amount of time (ms) to show the status message
316
     // Amount of time (ms) to show the status message
333
 #endif // SDSUPPORT
333
 #endif // SDSUPPORT
334
 
334
 
335
 // for dogm lcd displays you can choose some additional fonts:
335
 // for dogm lcd displays you can choose some additional fonts:
336
-#ifdef DOGLCD
336
+#if ENABLED(DOGLCD)
337
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
337
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
338
   // we don't have a big font for Cyrillic, Kana
338
   // we don't have a big font for Cyrillic, Kana
339
   //#define USE_BIG_EDIT_FONT
339
   //#define USE_BIG_EDIT_FONT
348
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
348
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
349
 //#define USE_WATCHDOG
349
 //#define USE_WATCHDOG
350
 
350
 
351
-#ifdef USE_WATCHDOG
351
+#if ENABLED(USE_WATCHDOG)
352
 // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
352
 // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
353
 // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
353
 // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
354
 //  However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
354
 //  However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
361
 // it can e.g. be used to change z-positions in the print startup phase in real-time
361
 // it can e.g. be used to change z-positions in the print startup phase in real-time
362
 // does not respect endstops!
362
 // does not respect endstops!
363
 //#define BABYSTEPPING
363
 //#define BABYSTEPPING
364
-#ifdef BABYSTEPPING
364
+#if ENABLED(BABYSTEPPING)
365
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
365
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
366
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
366
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
367
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
367
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
378
 // so: v ^ 2 is proportional to number of steps we advance the extruder
378
 // so: v ^ 2 is proportional to number of steps we advance the extruder
379
 //#define ADVANCE
379
 //#define ADVANCE
380
 
380
 
381
-#ifdef ADVANCE
381
+#if ENABLED(ADVANCE)
382
   #define EXTRUDER_ADVANCE_K .0
382
   #define EXTRUDER_ADVANCE_K .0
383
   #define D_FILAMENT 2.85
383
   #define D_FILAMENT 2.85
384
   #define STEPS_MM_E 836
384
   #define STEPS_MM_E 836
405
 
405
 
406
 // The number of linear motions that can be in the plan at any give time.
406
 // The number of linear motions that can be in the plan at any give time.
407
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
407
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
408
-#ifdef SDSUPPORT
408
+#if ENABLED(SDSUPPORT)
409
   #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
409
   #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
410
 #else
410
 #else
411
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
411
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
435
 // the moves are than replaced by the firmware controlled ones.
435
 // the moves are than replaced by the firmware controlled ones.
436
 
436
 
437
 // #define FWRETRACT  //ONLY PARTIALLY TESTED
437
 // #define FWRETRACT  //ONLY PARTIALLY TESTED
438
-#ifdef FWRETRACT
438
+#if ENABLED(FWRETRACT)
439
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
439
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
440
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
440
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
441
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
441
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
447
 #endif
447
 #endif
448
 
448
 
449
 // Add support for experimental filament exchange support M600; requires display
449
 // Add support for experimental filament exchange support M600; requires display
450
-#ifdef ULTIPANEL
450
+#if ENABLED(ULTIPANEL)
451
   //#define FILAMENTCHANGEENABLE
451
   //#define FILAMENTCHANGEENABLE
452
-  #ifdef FILAMENTCHANGEENABLE
452
+  #if ENABLED(FILAMENTCHANGEENABLE)
453
     #define FILAMENTCHANGE_XPOS 3
453
     #define FILAMENTCHANGE_XPOS 3
454
     #define FILAMENTCHANGE_YPOS 3
454
     #define FILAMENTCHANGE_YPOS 3
455
     #define FILAMENTCHANGE_ZADD 10
455
     #define FILAMENTCHANGE_ZADD 10
469
 // @section tmc
469
 // @section tmc
470
 
470
 
471
 //#define HAVE_TMCDRIVER
471
 //#define HAVE_TMCDRIVER
472
-#ifdef HAVE_TMCDRIVER
472
+#if ENABLED(HAVE_TMCDRIVER)
473
 
473
 
474
 //  #define X_IS_TMC
474
 //  #define X_IS_TMC
475
   #define X_MAX_CURRENT 1000  //in mA
475
   #define X_MAX_CURRENT 1000  //in mA
531
 // @section l6470
531
 // @section l6470
532
 
532
 
533
 //#define HAVE_L6470DRIVER
533
 //#define HAVE_L6470DRIVER
534
-#ifdef HAVE_L6470DRIVER
534
+#if ENABLED(HAVE_L6470DRIVER)
535
 
535
 
536
 //  #define X_IS_L6470
536
 //  #define X_IS_L6470
537
   #define X_MICROSTEPS 16     //number of microsteps
537
   #define X_MICROSTEPS 16     //number of microsteps

Loading…
Cancel
Save