thomas
/
marlin
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Cleanup

Richard Wackerbarth 9 年前
父节点
5e36b64635
当前提交
e01f5e1ef7
共有 39 个文件被更改，包括 668 次插入 和 668 次删除
合并视图 显示文件统计
  1. 16
    16
      Marlin/Configuration.h
  2. 23
    23
      Marlin/Configuration_adv.h
  3. 1
    1
      Marlin/SdFatUtil.h
  4. 16
    16
      Marlin/configurator/config/Configuration.h
  5. 23
    23
      Marlin/configurator/config/Configuration_adv.h
  6. 17
    17
      Marlin/example_configurations/Felix/Configuration.h
  7. 19
    19
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  8. 23
    23
      Marlin/example_configurations/Felix/Configuration_adv.h
  9. 17
    17
      Marlin/example_configurations/Hephestos/Configuration.h
  10. 23
    23
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  11. 15
    15
      Marlin/example_configurations/K8200/Configuration.h
  12. 23
    23
      Marlin/example_configurations/K8200/Configuration_adv.h
  13. 18
    18
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 18
    18
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 23
    23
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  16. 16
    16
      Marlin/example_configurations/SCARA/Configuration.h
  17. 23
    23
      Marlin/example_configurations/SCARA/Configuration_adv.h
  18. 8
    8
      Marlin/example_configurations/TAZ4/Configuration.h
  19. 23
    23
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  20. 17
    17
      Marlin/example_configurations/WITBOX/Configuration.h
  21. 23
    23
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  22. 18
    18
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  23. 17
    17
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  24. 22
    22
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  25. 18
    18
      Marlin/example_configurations/delta/generic/Configuration.h
  26. 23
    23
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  27. 17
    17
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  28. 23
    23
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  29. 17
    17
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  30. 23
    23
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  31. 18
    18
      Marlin/example_configurations/makibox/Configuration.h
  32. 23
    23
      Marlin/example_configurations/makibox/Configuration_adv.h
  33. 18
    18
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  34. 23
    23
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  35. 3
    3
      Marlin/pins_MEGACONTROLLER.h
  36. 4
    4
      Marlin/pins_RAMBO.h
  37. 7
    7
      Marlin/pins_RAMPS_13.h
  38. 2
    2
      Marlin/pins_RIGIDBOARD.h
  39. 7
    7
      Marlin/pins_SANGUINOLOLU_11.h

+ 16
- 16
Marlin/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1
 148 
 #define TEMP_SENSOR_0 1
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
321
321
322 
 #if DISABLED(ENDSTOPPULLUPS)
 322 
 #if DISABLED(ENDSTOPPULLUPS)
323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
324 
-  // #define ENDSTOPPULLUP_XMAX
325 
-  // #define ENDSTOPPULLUP_YMAX
326 
-  // #define ENDSTOPPULLUP_ZMAX
327 
-  // #define ENDSTOPPULLUP_XMIN
328 
-  // #define ENDSTOPPULLUP_YMIN
329 
-  // #define ENDSTOPPULLUP_ZMIN
330 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
324 
+  //#define ENDSTOPPULLUP_XMAX
325 
+  //#define ENDSTOPPULLUP_YMAX
326 
+  //#define ENDSTOPPULLUP_ZMAX
327 
+  //#define ENDSTOPPULLUP_XMIN
328 
+  //#define ENDSTOPPULLUP_YMIN
329 
+  //#define ENDSTOPPULLUP_ZMIN
330 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
331 
 #endif
 331 
 #endif
332
332
333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
419 
 //=========================== Manual Bed Leveling ===========================
 419 
 //=========================== Manual Bed Leveling ===========================
420 
 //===========================================================================
 420 
 //===========================================================================
421
421
422 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
422 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
424
424
425 
 #if ENABLED(MANUAL_BED_LEVELING)
 425 
 #if ENABLED(MANUAL_BED_LEVELING)
426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
504 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 504 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
505 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 505 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
506
506
507 
-//   #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.
507 
+//#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.
508 
                                                                             // Useful to retract a deployable Z probe.
 508 
                                                                             // Useful to retract a deployable Z probe.
509
509
510 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 510 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
723
723
724 
 // The MakerLab Mini Panel with graphic controller and SD support
 724 
 // The MakerLab Mini Panel with graphic controller and SD support
725 
 // http://reprap.org/wiki/Mini_panel
 725 
 // http://reprap.org/wiki/Mini_panel
726 
-// #define MINIPANEL
726 
+//#define MINIPANEL
727
727
728 
 /**
 728 
 /**
729 
  * I2C Panels
 729 
  * I2C Panels
777
777
778 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 778 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
779 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 779 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
780 
-// #define PHOTOGRAPH_PIN     23
780 
+//#define PHOTOGRAPH_PIN     23
781
781
782 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 782 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
783 
 //#define SF_ARC_FIX
 783 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/Configuration_adv.h 查看文件

145 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 145 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
146 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 146 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
147
147
148 
-  // #define Z_DUAL_ENDSTOPS
148 
+  //#define Z_DUAL_ENDSTOPS
149
149
150 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 150 
   #if ENABLED(Z_DUAL_ENDSTOPS)
151 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 151 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
217 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 217 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
218
218
219 
 // When G28 is called, this option will make Y home before X
 219 
 // When G28 is called, this option will make Y home before X
220 
-// #define HOME_Y_BEFORE_X
220 
+//#define HOME_Y_BEFORE_X
221
221
222 
 // @section machine
 222 
 // @section machine
223
223
433 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 433 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
434 
 // the moves are than replaced by the firmware controlled ones.
 434 
 // the moves are than replaced by the firmware controlled ones.
435
435
436 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
436 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
437 
 #if ENABLED(FWRETRACT)
 437 
 #if ENABLED(FWRETRACT)
438 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 438 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
439 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 439 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
470 
 //#define HAVE_TMCDRIVER
 470 
 //#define HAVE_TMCDRIVER
471 
 #if ENABLED(HAVE_TMCDRIVER)
 471 
 #if ENABLED(HAVE_TMCDRIVER)
472
472
473 
-//  #define X_IS_TMC
473 
+//#define X_IS_TMC
474 
   #define X_MAX_CURRENT 1000  //in mA
 474 
   #define X_MAX_CURRENT 1000  //in mA
475 
   #define X_SENSE_RESISTOR 91 //in mOhms
 475 
   #define X_SENSE_RESISTOR 91 //in mOhms
476 
   #define X_MICROSTEPS 16     //number of microsteps
 476 
   #define X_MICROSTEPS 16     //number of microsteps
477
477
478 
-//  #define X2_IS_TMC
478 
+//#define X2_IS_TMC
479 
   #define X2_MAX_CURRENT 1000  //in mA
 479 
   #define X2_MAX_CURRENT 1000  //in mA
480 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X2_SENSE_RESISTOR 91 //in mOhms
481 
   #define X2_MICROSTEPS 16     //number of microsteps
 481 
   #define X2_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define Y_IS_TMC
483 
+//#define Y_IS_TMC
484 
   #define Y_MAX_CURRENT 1000  //in mA
 484 
   #define Y_MAX_CURRENT 1000  //in mA
485 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 485 
   #define Y_SENSE_RESISTOR 91 //in mOhms
486 
   #define Y_MICROSTEPS 16     //number of microsteps
 486 
   #define Y_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y2_IS_TMC
488 
+//#define Y2_IS_TMC
489 
   #define Y2_MAX_CURRENT 1000  //in mA
 489 
   #define Y2_MAX_CURRENT 1000  //in mA
490 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y2_MICROSTEPS 16     //number of microsteps
491 
   #define Y2_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Z_IS_TMC
493 
+//#define Z_IS_TMC
494 
   #define Z_MAX_CURRENT 1000  //in mA
 494 
   #define Z_MAX_CURRENT 1000  //in mA
495 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Z_SENSE_RESISTOR 91 //in mOhms
496 
   #define Z_MICROSTEPS 16     //number of microsteps
 496 
   #define Z_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z2_IS_TMC
498 
+//#define Z2_IS_TMC
499 
   #define Z2_MAX_CURRENT 1000  //in mA
 499 
   #define Z2_MAX_CURRENT 1000  //in mA
500 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z2_MICROSTEPS 16     //number of microsteps
 501 
   #define Z2_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define E0_IS_TMC
503 
+//#define E0_IS_TMC
504 
   #define E0_MAX_CURRENT 1000  //in mA
 504 
   #define E0_MAX_CURRENT 1000  //in mA
505 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 505 
   #define E0_SENSE_RESISTOR 91 //in mOhms
506 
   #define E0_MICROSTEPS 16     //number of microsteps
 506 
   #define E0_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E1_IS_TMC
508 
+//#define E1_IS_TMC
509 
   #define E1_MAX_CURRENT 1000  //in mA
 509 
   #define E1_MAX_CURRENT 1000  //in mA
510 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E1_SENSE_RESISTOR 91 //in mOhms
511 
   #define E1_MICROSTEPS 16     //number of microsteps
511 
   #define E1_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E2_IS_TMC
513 
+//#define E2_IS_TMC
514 
   #define E2_MAX_CURRENT 1000  //in mA
 514 
   #define E2_MAX_CURRENT 1000  //in mA
515 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E2_SENSE_RESISTOR 91 //in mOhms
516 
   #define E2_MICROSTEPS 16     //number of microsteps
516 
   #define E2_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E3_IS_TMC
518 
+//#define E3_IS_TMC
519 
   #define E3_MAX_CURRENT 1000  //in mA
 519 
   #define E3_MAX_CURRENT 1000  //in mA
520 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E3_SENSE_RESISTOR 91 //in mOhms
521 
   #define E3_MICROSTEPS 16     //number of microsteps
521 
   #define E3_MICROSTEPS 16     //number of microsteps
532 
 //#define HAVE_L6470DRIVER
 532 
 //#define HAVE_L6470DRIVER
533 
 #if ENABLED(HAVE_L6470DRIVER)
 533 
 #if ENABLED(HAVE_L6470DRIVER)
534
534
535 
-//  #define X_IS_L6470
535 
+//#define X_IS_L6470
536 
   #define X_MICROSTEPS 16     //number of microsteps
 536 
   #define X_MICROSTEPS 16     //number of microsteps
537 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
537 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
538 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 538 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 539 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
540
541 
-//  #define X2_IS_L6470
541 
+//#define X2_IS_L6470
542 
   #define X2_MICROSTEPS 16     //number of microsteps
 542 
   #define X2_MICROSTEPS 16     //number of microsteps
543 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 544 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 545 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
546
547 
-//  #define Y_IS_L6470
547 
+//#define Y_IS_L6470
548 
   #define Y_MICROSTEPS 16     //number of microsteps
 548 
   #define Y_MICROSTEPS 16     //number of microsteps
549 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 550 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 551 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
552
553 
-//  #define Y2_IS_L6470
553 
+//#define Y2_IS_L6470
554 
   #define Y2_MICROSTEPS 16     //number of microsteps
554 
   #define Y2_MICROSTEPS 16     //number of microsteps
555 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 556 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
558
559 
-//  #define Z_IS_L6470
559 
+//#define Z_IS_L6470
560 
   #define Z_MICROSTEPS 16     //number of microsteps
 560 
   #define Z_MICROSTEPS 16     //number of microsteps
561 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 562 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 563 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
564
565 
-//  #define Z2_IS_L6470
565 
+//#define Z2_IS_L6470
566 
   #define Z2_MICROSTEPS 16     //number of microsteps
 566 
   #define Z2_MICROSTEPS 16     //number of microsteps
567 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 568 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 569 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
570
571 
-//  #define E0_IS_L6470
571 
+//#define E0_IS_L6470
572 
   #define E0_MICROSTEPS 16     //number of microsteps
 572 
   #define E0_MICROSTEPS 16     //number of microsteps
573 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 574 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 575 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
576
577 
-//  #define E1_IS_L6470
577 
+//#define E1_IS_L6470
578 
   #define E1_MICROSTEPS 16     //number of microsteps
578 
   #define E1_MICROSTEPS 16     //number of microsteps
579 
   #define E1_MICROSTEPS 16     //number of microsteps
 579 
   #define E1_MICROSTEPS 16     //number of microsteps
580 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 581 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 582 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
583
584 
-//  #define E2_IS_L6470
584 
+//#define E2_IS_L6470
585 
   #define E2_MICROSTEPS 16     //number of microsteps
585 
   #define E2_MICROSTEPS 16     //number of microsteps
586 
   #define E2_MICROSTEPS 16     //number of microsteps
 586 
   #define E2_MICROSTEPS 16     //number of microsteps
587 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 588 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 589 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
590
591 
-//  #define E3_IS_L6470
591 
+//#define E3_IS_L6470
592 
   #define E3_MICROSTEPS 16     //number of microsteps
592 
   #define E3_MICROSTEPS 16     //number of microsteps
593 
   #define E3_MICROSTEPS 16     //number of microsteps
 593 
   #define E3_MICROSTEPS 16     //number of microsteps
594 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 1
- 1
Marlin/SdFatUtil.h 查看文件

42 
 }
42 
 }
43
43
44 
 using namespace SdFatUtil;  // NOLINT
44 
 using namespace SdFatUtil;  // NOLINT
45 
-#endif  // #define SdFatUtil_h
45 
+#endif  //#define SdFatUtil_h
46
46
47
47
48 
 #endif
 48 
 #endif

+ 16
- 16
Marlin/configurator/config/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1
 148 
 #define TEMP_SENSOR_0 1
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
321
321
322 
 #if DISABLED(ENDSTOPPULLUPS)
 322 
 #if DISABLED(ENDSTOPPULLUPS)
323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
324 
-  // #define ENDSTOPPULLUP_XMAX
325 
-  // #define ENDSTOPPULLUP_YMAX
326 
-  // #define ENDSTOPPULLUP_ZMAX
327 
-  // #define ENDSTOPPULLUP_XMIN
328 
-  // #define ENDSTOPPULLUP_YMIN
329 
-  // #define ENDSTOPPULLUP_ZMIN
330 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
324 
+  //#define ENDSTOPPULLUP_XMAX
325 
+  //#define ENDSTOPPULLUP_YMAX
326 
+  //#define ENDSTOPPULLUP_ZMAX
327 
+  //#define ENDSTOPPULLUP_XMIN
328 
+  //#define ENDSTOPPULLUP_YMIN
329 
+  //#define ENDSTOPPULLUP_ZMIN
330 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
331 
 #endif
 331 
 #endif
332
332
333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
419 
 //=========================== Manual Bed Leveling ===========================
 419 
 //=========================== Manual Bed Leveling ===========================
420 
 //===========================================================================
 420 
 //===========================================================================
421
421
422 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
422 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
424
424
425 
 #if ENABLED(MANUAL_BED_LEVELING)
 425 
 #if ENABLED(MANUAL_BED_LEVELING)
426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
504 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 504 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
505 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 505 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
506
506
507 
-//   #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.
507 
+//#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.
508 
                                                                             // Useful to retract a deployable Z probe.
 508 
                                                                             // Useful to retract a deployable Z probe.
509
509
510 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 510 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
722
722
723 
 // The MakerLab Mini Panel with graphic controller and SD support
 723 
 // The MakerLab Mini Panel with graphic controller and SD support
724 
 // http://reprap.org/wiki/Mini_panel
 724 
 // http://reprap.org/wiki/Mini_panel
725 
-// #define MINIPANEL
725 
+//#define MINIPANEL
726
726
727 
 /**
 727 
 /**
728 
  * I2C Panels
 728 
  * I2C Panels
776
776
777 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 777 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
778 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 778 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
779 
-// #define PHOTOGRAPH_PIN     23
779 
+//#define PHOTOGRAPH_PIN     23
780
780
781 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 781 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
782 
 //#define SF_ARC_FIX
 782 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/configurator/config/Configuration_adv.h 查看文件

145 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 145 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
146 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 146 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
147
147
148 
-  // #define Z_DUAL_ENDSTOPS
148 
+  //#define Z_DUAL_ENDSTOPS
149
149
150 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 150 
   #if ENABLED(Z_DUAL_ENDSTOPS)
151 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 151 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
217 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 217 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
218
218
219 
 // When G28 is called, this option will make Y home before X
 219 
 // When G28 is called, this option will make Y home before X
220 
-// #define HOME_Y_BEFORE_X
220 
+//#define HOME_Y_BEFORE_X
221
221
222 
 // @section machine
 222 
 // @section machine
223
223
432 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 432 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
433 
 // the moves are than replaced by the firmware controlled ones.
 433 
 // the moves are than replaced by the firmware controlled ones.
434
434
435 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
435 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
436 
 #if ENABLED(FWRETRACT)
 436 
 #if ENABLED(FWRETRACT)
437 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 437 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
438 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 438 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
469 
 //#define HAVE_TMCDRIVER
 469 
 //#define HAVE_TMCDRIVER
470 
 #if ENABLED(HAVE_TMCDRIVER)
 470 
 #if ENABLED(HAVE_TMCDRIVER)
471
471
472 
-//  #define X_IS_TMC
472 
+//#define X_IS_TMC
473 
   #define X_MAX_CURRENT 1000  //in mA
 473 
   #define X_MAX_CURRENT 1000  //in mA
474 
   #define X_SENSE_RESISTOR 91 //in mOhms
 474 
   #define X_SENSE_RESISTOR 91 //in mOhms
475 
   #define X_MICROSTEPS 16     //number of microsteps
 475 
   #define X_MICROSTEPS 16     //number of microsteps
476
476
477 
-//  #define X2_IS_TMC
477 
+//#define X2_IS_TMC
478 
   #define X2_MAX_CURRENT 1000  //in mA
 478 
   #define X2_MAX_CURRENT 1000  //in mA
479 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 479 
   #define X2_SENSE_RESISTOR 91 //in mOhms
480 
   #define X2_MICROSTEPS 16     //number of microsteps
 480 
   #define X2_MICROSTEPS 16     //number of microsteps
481
481
482 
-//  #define Y_IS_TMC
482 
+//#define Y_IS_TMC
483 
   #define Y_MAX_CURRENT 1000  //in mA
 483 
   #define Y_MAX_CURRENT 1000  //in mA
484 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 484 
   #define Y_SENSE_RESISTOR 91 //in mOhms
485 
   #define Y_MICROSTEPS 16     //number of microsteps
 485 
   #define Y_MICROSTEPS 16     //number of microsteps
486
486
487 
-//  #define Y2_IS_TMC
487 
+//#define Y2_IS_TMC
488 
   #define Y2_MAX_CURRENT 1000  //in mA
 488 
   #define Y2_MAX_CURRENT 1000  //in mA
489 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 489 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
490 
   #define Y2_MICROSTEPS 16     //number of microsteps
490 
   #define Y2_MICROSTEPS 16     //number of microsteps
491
491
492 
-//  #define Z_IS_TMC
492 
+//#define Z_IS_TMC
493 
   #define Z_MAX_CURRENT 1000  //in mA
 493 
   #define Z_MAX_CURRENT 1000  //in mA
494 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 494 
   #define Z_SENSE_RESISTOR 91 //in mOhms
495 
   #define Z_MICROSTEPS 16     //number of microsteps
 495 
   #define Z_MICROSTEPS 16     //number of microsteps
496
496
497 
-//  #define Z2_IS_TMC
497 
+//#define Z2_IS_TMC
498 
   #define Z2_MAX_CURRENT 1000  //in mA
 498 
   #define Z2_MAX_CURRENT 1000  //in mA
499 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 499 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
500 
   #define Z2_MICROSTEPS 16     //number of microsteps
 500 
   #define Z2_MICROSTEPS 16     //number of microsteps
501
501
502 
-//  #define E0_IS_TMC
502 
+//#define E0_IS_TMC
503 
   #define E0_MAX_CURRENT 1000  //in mA
 503 
   #define E0_MAX_CURRENT 1000  //in mA
504 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 504 
   #define E0_SENSE_RESISTOR 91 //in mOhms
505 
   #define E0_MICROSTEPS 16     //number of microsteps
 505 
   #define E0_MICROSTEPS 16     //number of microsteps
506
506
507 
-//  #define E1_IS_TMC
507 
+//#define E1_IS_TMC
508 
   #define E1_MAX_CURRENT 1000  //in mA
 508 
   #define E1_MAX_CURRENT 1000  //in mA
509 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 509 
   #define E1_SENSE_RESISTOR 91 //in mOhms
510 
   #define E1_MICROSTEPS 16     //number of microsteps
510 
   #define E1_MICROSTEPS 16     //number of microsteps
511
511
512 
-//  #define E2_IS_TMC
512 
+//#define E2_IS_TMC
513 
   #define E2_MAX_CURRENT 1000  //in mA
 513 
   #define E2_MAX_CURRENT 1000  //in mA
514 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 514 
   #define E2_SENSE_RESISTOR 91 //in mOhms
515 
   #define E2_MICROSTEPS 16     //number of microsteps
515 
   #define E2_MICROSTEPS 16     //number of microsteps
516
516
517 
-//  #define E3_IS_TMC
517 
+//#define E3_IS_TMC
518 
   #define E3_MAX_CURRENT 1000  //in mA
 518 
   #define E3_MAX_CURRENT 1000  //in mA
519 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 519 
   #define E3_SENSE_RESISTOR 91 //in mOhms
520 
   #define E3_MICROSTEPS 16     //number of microsteps
520 
   #define E3_MICROSTEPS 16     //number of microsteps
531 
 //#define HAVE_L6470DRIVER
 531 
 //#define HAVE_L6470DRIVER
532 
 #if ENABLED(HAVE_L6470DRIVER)
 532 
 #if ENABLED(HAVE_L6470DRIVER)
533
533
534 
-//  #define X_IS_L6470
534 
+//#define X_IS_L6470
535 
   #define X_MICROSTEPS 16     //number of microsteps
 535 
   #define X_MICROSTEPS 16     //number of microsteps
536 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
536 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
537 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 537 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
538 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 538 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
539
539
540 
-//  #define X2_IS_L6470
540 
+//#define X2_IS_L6470
541 
   #define X2_MICROSTEPS 16     //number of microsteps
 541 
   #define X2_MICROSTEPS 16     //number of microsteps
542 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define Y_IS_L6470
546 
+//#define Y_IS_L6470
547 
   #define Y_MICROSTEPS 16     //number of microsteps
 547 
   #define Y_MICROSTEPS 16     //number of microsteps
548 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y2_IS_L6470
552 
+//#define Y2_IS_L6470
553 
   #define Y2_MICROSTEPS 16     //number of microsteps
553 
   #define Y2_MICROSTEPS 16     //number of microsteps
554 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Z_IS_L6470
558 
+//#define Z_IS_L6470
559 
   #define Z_MICROSTEPS 16     //number of microsteps
 559 
   #define Z_MICROSTEPS 16     //number of microsteps
560 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 562 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z2_IS_L6470
564 
+//#define Z2_IS_L6470
565 
   #define Z2_MICROSTEPS 16     //number of microsteps
 565 
   #define Z2_MICROSTEPS 16     //number of microsteps
566 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define E0_IS_L6470
570 
+//#define E0_IS_L6470
571 
   #define E0_MICROSTEPS 16     //number of microsteps
 571 
   #define E0_MICROSTEPS 16     //number of microsteps
572 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E1_IS_L6470
576 
+//#define E1_IS_L6470
577 
   #define E1_MICROSTEPS 16     //number of microsteps
577 
   #define E1_MICROSTEPS 16     //number of microsteps
578 
   #define E1_MICROSTEPS 16     //number of microsteps
 578 
   #define E1_MICROSTEPS 16     //number of microsteps
579 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 580 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 581 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
582
583 
-//  #define E2_IS_L6470
583 
+//#define E2_IS_L6470
584 
   #define E2_MICROSTEPS 16     //number of microsteps
584 
   #define E2_MICROSTEPS 16     //number of microsteps
585 
   #define E2_MICROSTEPS 16     //number of microsteps
 585 
   #define E2_MICROSTEPS 16     //number of microsteps
586 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 587 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 588 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
589
590 
-//  #define E3_IS_L6470
590 
+//#define E3_IS_L6470
591 
   #define E3_MICROSTEPS 16     //number of microsteps
591 
   #define E3_MICROSTEPS 16     //number of microsteps
592 
   #define E3_MICROSTEPS 16     //number of microsteps
 592 
   #define E3_MICROSTEPS 16     //number of microsteps
593 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 17
- 17
Marlin/example_configurations/Felix/Configuration.h 查看文件

79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1
 148 
 #define TEMP_SENSOR_0 1
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
288 
 // @section machine
 288 
 // @section machine
289
289
290 
 // Uncomment this option to enable CoreXY kinematics
 290 
 // Uncomment this option to enable CoreXY kinematics
291 
-// #define COREXY
291 
+//#define COREXY
292
292
293 
 // Uncomment this option to enable CoreXZ kinematics
 293 
 // Uncomment this option to enable CoreXZ kinematics
294 
-// #define COREXZ
294 
+//#define COREXZ
295
295
296 
 // Enable this option for Toshiba steppers
 296 
 // Enable this option for Toshiba steppers
297 
 //#define CONFIG_STEPPERS_TOSHIBA
 297 
 //#define CONFIG_STEPPERS_TOSHIBA
303
303
304 
 #if DISABLED(ENDSTOPPULLUPS)
 304 
 #if DISABLED(ENDSTOPPULLUPS)
305 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 305 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
306 
-  // #define ENDSTOPPULLUP_XMAX
307 
-  // #define ENDSTOPPULLUP_YMAX
308 
-  // #define ENDSTOPPULLUP_ZMAX
309 
-  // #define ENDSTOPPULLUP_XMIN
310 
-  // #define ENDSTOPPULLUP_YMIN
311 
-  // #define ENDSTOPPULLUP_ZMIN
312 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
306 
+  //#define ENDSTOPPULLUP_XMAX
307 
+  //#define ENDSTOPPULLUP_YMAX
308 
+  //#define ENDSTOPPULLUP_ZMAX
309 
+  //#define ENDSTOPPULLUP_XMIN
310 
+  //#define ENDSTOPPULLUP_YMIN
311 
+  //#define ENDSTOPPULLUP_ZMIN
312 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
313 
 #endif
 313 
 #endif
314
314
315 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 315 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
401 
 //=========================== Manual Bed Leveling ===========================
 401 
 //=========================== Manual Bed Leveling ===========================
402 
 //===========================================================================
 402 
 //===========================================================================
403
403
404 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
405 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
404 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
405 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
406
406
407 
 #if ENABLED(MANUAL_BED_LEVELING)
 407 
 #if ENABLED(MANUAL_BED_LEVELING)
408 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 408 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
486 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 486 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
487 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 487 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
488
488
489 
-//   #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.
489 
+//#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.
490 
                                                                             // Useful to retract a deployable Z probe.
 490 
                                                                             // Useful to retract a deployable Z probe.
491
491
492 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 492 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
705
705
706 
 // The MakerLab Mini Panel with graphic controller and SD support
 706 
 // The MakerLab Mini Panel with graphic controller and SD support
707 
 // http://reprap.org/wiki/Mini_panel
 707 
 // http://reprap.org/wiki/Mini_panel
708 
-// #define MINIPANEL
708 
+//#define MINIPANEL
709
709
710 
 /**
 710 
 /**
711 
  * I2C Panels
 711 
  * I2C Panels
759
759
760 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 760 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
761 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 761 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
762 
-// #define PHOTOGRAPH_PIN     23
762 
+//#define PHOTOGRAPH_PIN     23
763
763
764 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 764 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
765 
 //#define SF_ARC_FIX
 765 
 //#define SF_ARC_FIX

+ 19
- 19
Marlin/example_configurations/Felix/Configuration_DUAL.h 查看文件

78
78
79 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 79 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
80 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 80 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
81 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
81 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82
82
83 
 // This defines the number of extruders
 83 
 // This defines the number of extruders
84 
 #define EXTRUDERS 2
 84 
 #define EXTRUDERS 2
131 
 // 110 is Pt100 with 1k pullup (non standard)
 131 
 // 110 is Pt100 with 1k pullup (non standard)
132 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 132 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
133 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 133 
 //     Use it for Testing or Development purposes. NEVER for production machine.
134 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
135 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
134 
+//#define DUMMY_THERMISTOR_998_VALUE 25
135 
+//#define DUMMY_THERMISTOR_999_VALUE 100
136 
 // :{ '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" }
 136 
 // :{ '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" }
137 
 #define TEMP_SENSOR_0 1
 137 
 #define TEMP_SENSOR_0 1
138 
 #define TEMP_SENSOR_1 1
 138 
 #define TEMP_SENSOR_1 1
273 
 // @section machine
 273 
 // @section machine
274
274
275 
 // Uncomment this option to enable CoreXY kinematics
 275 
 // Uncomment this option to enable CoreXY kinematics
276 
-// #define COREXY
276 
+//#define COREXY
277
277
278 
 // Uncomment this option to enable CoreXZ kinematics
 278 
 // Uncomment this option to enable CoreXZ kinematics
279 
-// #define COREXZ
279 
+//#define COREXZ
280
280
281 
 // Enable this option for Toshiba steppers
 281 
 // Enable this option for Toshiba steppers
282 
 //#define CONFIG_STEPPERS_TOSHIBA
 282 
 //#define CONFIG_STEPPERS_TOSHIBA
288
288
289 
 #if DISABLED(ENDSTOPPULLUPS)
 289 
 #if DISABLED(ENDSTOPPULLUPS)
290 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 290 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
291 
-  // #define ENDSTOPPULLUP_XMAX
292 
-  // #define ENDSTOPPULLUP_YMAX
293 
-  // #define ENDSTOPPULLUP_ZMAX
294 
-  // #define ENDSTOPPULLUP_XMIN
295 
-  // #define ENDSTOPPULLUP_YMIN
296 
-  // #define ENDSTOPPULLUP_ZMIN
297 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
291 
+  //#define ENDSTOPPULLUP_XMAX
292 
+  //#define ENDSTOPPULLUP_YMAX
293 
+  //#define ENDSTOPPULLUP_ZMAX
294 
+  //#define ENDSTOPPULLUP_XMIN
295 
+  //#define ENDSTOPPULLUP_YMIN
296 
+  //#define ENDSTOPPULLUP_ZMIN
297 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
298 
 #endif
 298 
 #endif
299
299
300 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 300 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
371 
 //=========================== Manual Bed Leveling ===========================
 371 
 //=========================== Manual Bed Leveling ===========================
372 
 //===========================================================================
 372 
 //===========================================================================
373
373
374 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
375 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
374 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
375 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
376
376
377 
 #if ENABLED(MANUAL_BED_LEVELING)
 377 
 #if ENABLED(MANUAL_BED_LEVELING)
378 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 378 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
457 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 457 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
458 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 458 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
459
459
460 
-//   #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.
460 
+//#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.
461 
                                                                             // Useful to retract a deployable Z probe.
 461 
                                                                             // Useful to retract a deployable Z probe.
462
462
463 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 463 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
547 
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
 547 
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
548 
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
 548 
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
549 
 // For the other hotends it is their distance from the extruder 0 hotend.
 549 
 // For the other hotends it is their distance from the extruder 0 hotend.
550 
-// #define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
551 
-// #define EXTRUDER_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
550 
+//#define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
551 
+//#define EXTRUDER_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
552
552
553 
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
 553 
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
554 
 #define DEFAULT_XYJERK                10   // (mm/sec)
 554 
 #define DEFAULT_XYJERK                10   // (mm/sec)
675
675
676 
 // The MakerLab Mini Panel with graphic controller and SD support
 676 
 // The MakerLab Mini Panel with graphic controller and SD support
677 
 // http://reprap.org/wiki/Mini_panel
 677 
 // http://reprap.org/wiki/Mini_panel
678 
-// #define MINIPANEL
678 
+//#define MINIPANEL
679
679
680 
 /**
 680 
 /**
681 
  * I2C Panels
 681 
  * I2C Panels
723
723
724 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 724 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
725 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 725 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
726 
-// #define PHOTOGRAPH_PIN     23
726 
+//#define PHOTOGRAPH_PIN     23
727
727
728 
 // SF send wrong arc g-codes when using Arc Point as fillet procedure
 728 
 // SF send wrong arc g-codes when using Arc Point as fillet procedure
729 
 //#define SF_ARC_FIX
 729 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/Felix/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
475 
 //#define HAVE_TMCDRIVER
 475 
 //#define HAVE_TMCDRIVER
476 
 #if ENABLED(HAVE_TMCDRIVER)
 476 
 #if ENABLED(HAVE_TMCDRIVER)
477
477
478 
-//  #define X_IS_TMC
478 
+//#define X_IS_TMC
479 
   #define X_MAX_CURRENT 1000  //in mA
 479 
   #define X_MAX_CURRENT 1000  //in mA
480 
   #define X_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X_SENSE_RESISTOR 91 //in mOhms
481 
   #define X_MICROSTEPS 16     //number of microsteps
 481 
   #define X_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define X2_IS_TMC
483 
+//#define X2_IS_TMC
484 
   #define X2_MAX_CURRENT 1000  //in mA
 484 
   #define X2_MAX_CURRENT 1000  //in mA
485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
486 
   #define X2_MICROSTEPS 16     //number of microsteps
 486 
   #define X2_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y_IS_TMC
488 
+//#define Y_IS_TMC
489 
   #define Y_MAX_CURRENT 1000  //in mA
 489 
   #define Y_MAX_CURRENT 1000  //in mA
490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y_MICROSTEPS 16     //number of microsteps
 491 
   #define Y_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y2_IS_TMC
493 
+//#define Y2_IS_TMC
494 
   #define Y2_MAX_CURRENT 1000  //in mA
 494 
   #define Y2_MAX_CURRENT 1000  //in mA
495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z_IS_TMC
498 
+//#define Z_IS_TMC
499 
   #define Z_MAX_CURRENT 1000  //in mA
 499 
   #define Z_MAX_CURRENT 1000  //in mA
500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z_MICROSTEPS 16     //number of microsteps
 501 
   #define Z_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z2_IS_TMC
503 
+//#define Z2_IS_TMC
504 
   #define Z2_MAX_CURRENT 1000  //in mA
 504 
   #define Z2_MAX_CURRENT 1000  //in mA
505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z2_MICROSTEPS 16     //number of microsteps
 506 
   #define Z2_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E0_IS_TMC
508 
+//#define E0_IS_TMC
509 
   #define E0_MAX_CURRENT 1000  //in mA
 509 
   #define E0_MAX_CURRENT 1000  //in mA
510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
511 
   #define E0_MICROSTEPS 16     //number of microsteps
 511 
   #define E0_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E1_IS_TMC
513 
+//#define E1_IS_TMC
514 
   #define E1_MAX_CURRENT 1000  //in mA
 514 
   #define E1_MAX_CURRENT 1000  //in mA
515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
516 
   #define E1_MICROSTEPS 16     //number of microsteps
516 
   #define E1_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E2_IS_TMC
518 
+//#define E2_IS_TMC
519 
   #define E2_MAX_CURRENT 1000  //in mA
 519 
   #define E2_MAX_CURRENT 1000  //in mA
520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
521 
   #define E2_MICROSTEPS 16     //number of microsteps
521 
   #define E2_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E3_IS_TMC
523 
+//#define E3_IS_TMC
524 
   #define E3_MAX_CURRENT 1000  //in mA
 524 
   #define E3_MAX_CURRENT 1000  //in mA
525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
526 
   #define E3_MICROSTEPS 16     //number of microsteps
526 
   #define E3_MICROSTEPS 16     //number of microsteps
537 
 //#define HAVE_L6470DRIVER
 537 
 //#define HAVE_L6470DRIVER
538 
 #if ENABLED(HAVE_L6470DRIVER)
 538 
 #if ENABLED(HAVE_L6470DRIVER)
539
539
540 
-//  #define X_IS_L6470
540 
+//#define X_IS_L6470
541 
   #define X_MICROSTEPS 16     //number of microsteps
 541 
   #define X_MICROSTEPS 16     //number of microsteps
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define X2_IS_L6470
546 
+//#define X2_IS_L6470
547 
   #define X2_MICROSTEPS 16     //number of microsteps
 547 
   #define X2_MICROSTEPS 16     //number of microsteps
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y_IS_L6470
552 
+//#define Y_IS_L6470
553 
   #define Y_MICROSTEPS 16     //number of microsteps
 553 
   #define Y_MICROSTEPS 16     //number of microsteps
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Y2_IS_L6470
558 
+//#define Y2_IS_L6470
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z_IS_L6470
564 
+//#define Z_IS_L6470
565 
   #define Z_MICROSTEPS 16     //number of microsteps
 565 
   #define Z_MICROSTEPS 16     //number of microsteps
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define Z2_IS_L6470
570 
+//#define Z2_IS_L6470
571 
   #define Z2_MICROSTEPS 16     //number of microsteps
 571 
   #define Z2_MICROSTEPS 16     //number of microsteps
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E0_IS_L6470
576 
+//#define E0_IS_L6470
577 
   #define E0_MICROSTEPS 16     //number of microsteps
 577 
   #define E0_MICROSTEPS 16     //number of microsteps
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
581
582 
-//  #define E1_IS_L6470
582 
+//#define E1_IS_L6470
583 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
 584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
588
589 
-//  #define E2_IS_L6470
589 
+//#define E2_IS_L6470
590 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
 591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
595
596 
-//  #define E3_IS_L6470
596 
+//#define E3_IS_L6470
597 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
 598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 17
- 17
Marlin/example_configurations/Hephestos/Configuration.h 查看文件

82
82
83 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 83 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
84 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 84 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
85 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
85 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
86
86
87 
 // This defines the number of extruders
 87 
 // This defines the number of extruders
88 
 // :[1,2,3,4]
 88 
 // :[1,2,3,4]
145 
 // 110 is Pt100 with 1k pullup (non standard)
 145 
 // 110 is Pt100 with 1k pullup (non standard)
146 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 146 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
147 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 147 
 //     Use it for Testing or Development purposes. NEVER for production machine.
148 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
149 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
148 
+//#define DUMMY_THERMISTOR_998_VALUE 25
149 
+//#define DUMMY_THERMISTOR_999_VALUE 100
150 
 // :{ '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" }
 150 
 // :{ '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" }
151 
 #define TEMP_SENSOR_0 1
 151 
 #define TEMP_SENSOR_0 1
152 
 #define TEMP_SENSOR_1 0
 152 
 #define TEMP_SENSOR_1 0
298 
 // @section machine
 298 
 // @section machine
299
299
300 
 // Uncomment this option to enable CoreXY kinematics
 300 
 // Uncomment this option to enable CoreXY kinematics
301 
-// #define COREXY
301 
+//#define COREXY
302
302
303 
 // Uncomment this option to enable CoreXZ kinematics
 303 
 // Uncomment this option to enable CoreXZ kinematics
304 
-// #define COREXZ
304 
+//#define COREXZ
305
305
306 
 // Enable this option for Toshiba steppers
 306 
 // Enable this option for Toshiba steppers
307 
 //#define CONFIG_STEPPERS_TOSHIBA
 307 
 //#define CONFIG_STEPPERS_TOSHIBA
313
313
314 
 #if DISABLED(ENDSTOPPULLUPS)
 314 
 #if DISABLED(ENDSTOPPULLUPS)
315 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 315 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
316 
-  // #define ENDSTOPPULLUP_XMAX
317 
-  // #define ENDSTOPPULLUP_YMAX
318 
-  // #define ENDSTOPPULLUP_ZMAX
319 
-  // #define ENDSTOPPULLUP_XMIN
320 
-  // #define ENDSTOPPULLUP_YMIN
321 
-  // #define ENDSTOPPULLUP_ZMIN
322 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
316 
+  //#define ENDSTOPPULLUP_XMAX
317 
+  //#define ENDSTOPPULLUP_YMAX
318 
+  //#define ENDSTOPPULLUP_ZMAX
319 
+  //#define ENDSTOPPULLUP_XMIN
320 
+  //#define ENDSTOPPULLUP_YMIN
321 
+  //#define ENDSTOPPULLUP_ZMIN
322 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
323 
 #endif
 323 
 #endif
324
324
325 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 325 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
411 
 //=========================== Manual Bed Leveling ===========================
 411 
 //=========================== Manual Bed Leveling ===========================
412 
 //===========================================================================
 412 
 //===========================================================================
413
413
414 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
415 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
414 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
415 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
416
416
417 
 #if ENABLED(MANUAL_BED_LEVELING)
 417 
 #if ENABLED(MANUAL_BED_LEVELING)
418 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 418 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
497 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 497 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
498 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 498 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
499
499
500 
-//   #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.
500 
+//#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.
501 
                                                                             // Useful to retract a deployable Z probe.
 501 
                                                                             // Useful to retract a deployable Z probe.
502
502
503 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 503 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
715
715
716 
 // The MakerLab Mini Panel with graphic controller and SD support
 716 
 // The MakerLab Mini Panel with graphic controller and SD support
717 
 // http://reprap.org/wiki/Mini_panel
 717 
 // http://reprap.org/wiki/Mini_panel
718 
-// #define MINIPANEL
718 
+//#define MINIPANEL
719
719
720 
 /**
 720 
 /**
721 
  * I2C Panels
 721 
  * I2C Panels
769
769
770 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 770 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
771 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 771 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
772 
-// #define PHOTOGRAPH_PIN     23
772 
+//#define PHOTOGRAPH_PIN     23
773
773
774 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 774 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
775 
 //#define SF_ARC_FIX
 775 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/Hephestos/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
475 
 //#define HAVE_TMCDRIVER
 475 
 //#define HAVE_TMCDRIVER
476 
 #if ENABLED(HAVE_TMCDRIVER)
 476 
 #if ENABLED(HAVE_TMCDRIVER)
477
477
478 
-//  #define X_IS_TMC
478 
+//#define X_IS_TMC
479 
   #define X_MAX_CURRENT 1000  //in mA
 479 
   #define X_MAX_CURRENT 1000  //in mA
480 
   #define X_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X_SENSE_RESISTOR 91 //in mOhms
481 
   #define X_MICROSTEPS 16     //number of microsteps
 481 
   #define X_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define X2_IS_TMC
483 
+//#define X2_IS_TMC
484 
   #define X2_MAX_CURRENT 1000  //in mA
 484 
   #define X2_MAX_CURRENT 1000  //in mA
485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
486 
   #define X2_MICROSTEPS 16     //number of microsteps
 486 
   #define X2_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y_IS_TMC
488 
+//#define Y_IS_TMC
489 
   #define Y_MAX_CURRENT 1000  //in mA
 489 
   #define Y_MAX_CURRENT 1000  //in mA
490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y_MICROSTEPS 16     //number of microsteps
 491 
   #define Y_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y2_IS_TMC
493 
+//#define Y2_IS_TMC
494 
   #define Y2_MAX_CURRENT 1000  //in mA
 494 
   #define Y2_MAX_CURRENT 1000  //in mA
495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z_IS_TMC
498 
+//#define Z_IS_TMC
499 
   #define Z_MAX_CURRENT 1000  //in mA
 499 
   #define Z_MAX_CURRENT 1000  //in mA
500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z_MICROSTEPS 16     //number of microsteps
 501 
   #define Z_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z2_IS_TMC
503 
+//#define Z2_IS_TMC
504 
   #define Z2_MAX_CURRENT 1000  //in mA
 504 
   #define Z2_MAX_CURRENT 1000  //in mA
505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z2_MICROSTEPS 16     //number of microsteps
 506 
   #define Z2_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E0_IS_TMC
508 
+//#define E0_IS_TMC
509 
   #define E0_MAX_CURRENT 1000  //in mA
 509 
   #define E0_MAX_CURRENT 1000  //in mA
510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
511 
   #define E0_MICROSTEPS 16     //number of microsteps
 511 
   #define E0_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E1_IS_TMC
513 
+//#define E1_IS_TMC
514 
   #define E1_MAX_CURRENT 1000  //in mA
 514 
   #define E1_MAX_CURRENT 1000  //in mA
515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
516 
   #define E1_MICROSTEPS 16     //number of microsteps
516 
   #define E1_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E2_IS_TMC
518 
+//#define E2_IS_TMC
519 
   #define E2_MAX_CURRENT 1000  //in mA
 519 
   #define E2_MAX_CURRENT 1000  //in mA
520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
521 
   #define E2_MICROSTEPS 16     //number of microsteps
521 
   #define E2_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E3_IS_TMC
523 
+//#define E3_IS_TMC
524 
   #define E3_MAX_CURRENT 1000  //in mA
 524 
   #define E3_MAX_CURRENT 1000  //in mA
525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
526 
   #define E3_MICROSTEPS 16     //number of microsteps
526 
   #define E3_MICROSTEPS 16     //number of microsteps
537 
 //#define HAVE_L6470DRIVER
 537 
 //#define HAVE_L6470DRIVER
538 
 #if ENABLED(HAVE_L6470DRIVER)
 538 
 #if ENABLED(HAVE_L6470DRIVER)
539
539
540 
-//  #define X_IS_L6470
540 
+//#define X_IS_L6470
541 
   #define X_MICROSTEPS 16     //number of microsteps
 541 
   #define X_MICROSTEPS 16     //number of microsteps
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define X2_IS_L6470
546 
+//#define X2_IS_L6470
547 
   #define X2_MICROSTEPS 16     //number of microsteps
 547 
   #define X2_MICROSTEPS 16     //number of microsteps
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y_IS_L6470
552 
+//#define Y_IS_L6470
553 
   #define Y_MICROSTEPS 16     //number of microsteps
 553 
   #define Y_MICROSTEPS 16     //number of microsteps
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Y2_IS_L6470
558 
+//#define Y2_IS_L6470
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z_IS_L6470
564 
+//#define Z_IS_L6470
565 
   #define Z_MICROSTEPS 16     //number of microsteps
 565 
   #define Z_MICROSTEPS 16     //number of microsteps
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define Z2_IS_L6470
570 
+//#define Z2_IS_L6470
571 
   #define Z2_MICROSTEPS 16     //number of microsteps
 571 
   #define Z2_MICROSTEPS 16     //number of microsteps
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E0_IS_L6470
576 
+//#define E0_IS_L6470
577 
   #define E0_MICROSTEPS 16     //number of microsteps
 577 
   #define E0_MICROSTEPS 16     //number of microsteps
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
581
582 
-//  #define E1_IS_L6470
582 
+//#define E1_IS_L6470
583 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
 584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
588
589 
-//  #define E2_IS_L6470
589 
+//#define E2_IS_L6470
590 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
 591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
595
596 
-//  #define E3_IS_L6470
596 
+//#define E3_IS_L6470
597 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
 598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 15
- 15
Marlin/example_configurations/K8200/Configuration.h 查看文件

80
80
81 
 // Optional custom name for your RepStrap or other custom machine
 81 
 // Optional custom name for your RepStrap or other custom machine
82 
 // Displayed in the LCD "Ready" message
 82 
 // Displayed in the LCD "Ready" message
83 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
83 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
84
84
85 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 85 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
86 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 86 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
87 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
87 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
88
88
89 
 // This defines the number of extruders
 89 
 // This defines the number of extruders
90 
 // :[1,2,3,4]
 90 
 // :[1,2,3,4]
147 
 // 110 is Pt100 with 1k pullup (non standard)
 147 
 // 110 is Pt100 with 1k pullup (non standard)
148 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 148 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
149 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 149 
 //     Use it for Testing or Development purposes. NEVER for production machine.
150 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
151 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
150 
+//#define DUMMY_THERMISTOR_998_VALUE 25
151 
+//#define DUMMY_THERMISTOR_999_VALUE 100
152 
 // :{ '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" }
 152 
 // :{ '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" }
153 
 #define TEMP_SENSOR_0 5
 153 
 #define TEMP_SENSOR_0 5
154 
 #define TEMP_SENSOR_1 0
 154 
 #define TEMP_SENSOR_1 0
294 
 // @section machine
 294 
 // @section machine
295
295
296 
 // Uncomment this option to enable CoreXY kinematics
 296 
 // Uncomment this option to enable CoreXY kinematics
297 
-// #define COREXY
297 
+//#define COREXY
298
298
299 
 // Uncomment this option to enable CoreXZ kinematics
 299 
 // Uncomment this option to enable CoreXZ kinematics
300 
-// #define COREXZ
300 
+//#define COREXZ
301
301
302 
 // Enable this option for Toshiba steppers
 302 
 // Enable this option for Toshiba steppers
303 
 //#define CONFIG_STEPPERS_TOSHIBA
 303 
 //#define CONFIG_STEPPERS_TOSHIBA
309
309
310 
 #if DISABLED(ENDSTOPPULLUPS)
 310 
 #if DISABLED(ENDSTOPPULLUPS)
311 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 311 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
312 
-  // #define ENDSTOPPULLUP_XMAX
313 
-  // #define ENDSTOPPULLUP_YMAX
314 
-  // #define ENDSTOPPULLUP_ZMAX
312 
+  //#define ENDSTOPPULLUP_XMAX
313 
+  //#define ENDSTOPPULLUP_YMAX
314 
+  //#define ENDSTOPPULLUP_ZMAX
315 
   #define ENDSTOPPULLUP_XMIN
 315 
   #define ENDSTOPPULLUP_XMIN
316 
   #define ENDSTOPPULLUP_YMIN
 316 
   #define ENDSTOPPULLUP_YMIN
317 
   #define ENDSTOPPULLUP_ZMIN
 317 
   #define ENDSTOPPULLUP_ZMIN
318 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
318 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
319 
 #endif
 319 
 #endif
320
320
321 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 321 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
407 
 //=========================== Manual Bed Leveling ===========================
 407 
 //=========================== Manual Bed Leveling ===========================
408 
 //===========================================================================
 408 
 //===========================================================================
409
409
410 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
411 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
410 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
411 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
412
412
413 
 #if ENABLED(MANUAL_BED_LEVELING)
 413 
 #if ENABLED(MANUAL_BED_LEVELING)
414 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 414 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
492 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 492 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
493 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 493 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
494
494
495 
-//   #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.
495 
+//#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.
496 
                                                                             // Useful to retract a deployable Z probe.
 496 
                                                                             // Useful to retract a deployable Z probe.
497
497
498 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 498 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
710
710
711 
 // The MakerLab Mini Panel with graphic controller and SD support
 711 
 // The MakerLab Mini Panel with graphic controller and SD support
712 
 // http://reprap.org/wiki/Mini_panel
 712 
 // http://reprap.org/wiki/Mini_panel
713 
-// #define MINIPANEL
713 
+//#define MINIPANEL
714
714
715 
 /**
 715 
 /**
716 
  * I2C Panels
 716 
  * I2C Panels
764
764
765 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 765 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
766 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 766 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
767 
-// #define PHOTOGRAPH_PIN     23
767 
+//#define PHOTOGRAPH_PIN     23
768
768
769 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 769 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
770 
 //#define SF_ARC_FIX
 770 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/K8200/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
475 
 //#define HAVE_TMCDRIVER
 475 
 //#define HAVE_TMCDRIVER
476 
 #if ENABLED(HAVE_TMCDRIVER)
 476 
 #if ENABLED(HAVE_TMCDRIVER)
477
477
478 
-//  #define X_IS_TMC
478 
+//#define X_IS_TMC
479 
   #define X_MAX_CURRENT 1000  //in mA
 479 
   #define X_MAX_CURRENT 1000  //in mA
480 
   #define X_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X_SENSE_RESISTOR 91 //in mOhms
481 
   #define X_MICROSTEPS 16     //number of microsteps
 481 
   #define X_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define X2_IS_TMC
483 
+//#define X2_IS_TMC
484 
   #define X2_MAX_CURRENT 1000  //in mA
 484 
   #define X2_MAX_CURRENT 1000  //in mA
485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
486 
   #define X2_MICROSTEPS 16     //number of microsteps
 486 
   #define X2_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y_IS_TMC
488 
+//#define Y_IS_TMC
489 
   #define Y_MAX_CURRENT 1000  //in mA
 489 
   #define Y_MAX_CURRENT 1000  //in mA
490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y_MICROSTEPS 16     //number of microsteps
 491 
   #define Y_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y2_IS_TMC
493 
+//#define Y2_IS_TMC
494 
   #define Y2_MAX_CURRENT 1000  //in mA
 494 
   #define Y2_MAX_CURRENT 1000  //in mA
495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z_IS_TMC
498 
+//#define Z_IS_TMC
499 
   #define Z_MAX_CURRENT 1000  //in mA
 499 
   #define Z_MAX_CURRENT 1000  //in mA
500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z_MICROSTEPS 16     //number of microsteps
 501 
   #define Z_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z2_IS_TMC
503 
+//#define Z2_IS_TMC
504 
   #define Z2_MAX_CURRENT 1000  //in mA
 504 
   #define Z2_MAX_CURRENT 1000  //in mA
505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z2_MICROSTEPS 16     //number of microsteps
 506 
   #define Z2_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E0_IS_TMC
508 
+//#define E0_IS_TMC
509 
   #define E0_MAX_CURRENT 1000  //in mA
 509 
   #define E0_MAX_CURRENT 1000  //in mA
510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
511 
   #define E0_MICROSTEPS 16     //number of microsteps
 511 
   #define E0_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E1_IS_TMC
513 
+//#define E1_IS_TMC
514 
   #define E1_MAX_CURRENT 1000  //in mA
 514 
   #define E1_MAX_CURRENT 1000  //in mA
515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
516 
   #define E1_MICROSTEPS 16     //number of microsteps
516 
   #define E1_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E2_IS_TMC
518 
+//#define E2_IS_TMC
519 
   #define E2_MAX_CURRENT 1000  //in mA
 519 
   #define E2_MAX_CURRENT 1000  //in mA
520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
521 
   #define E2_MICROSTEPS 16     //number of microsteps
521 
   #define E2_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E3_IS_TMC
523 
+//#define E3_IS_TMC
524 
   #define E3_MAX_CURRENT 1000  //in mA
 524 
   #define E3_MAX_CURRENT 1000  //in mA
525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
526 
   #define E3_MICROSTEPS 16     //number of microsteps
526 
   #define E3_MICROSTEPS 16     //number of microsteps
537 
 //#define HAVE_L6470DRIVER
 537 
 //#define HAVE_L6470DRIVER
538 
 #if ENABLED(HAVE_L6470DRIVER)
 538 
 #if ENABLED(HAVE_L6470DRIVER)
539
539
540 
-//  #define X_IS_L6470
540 
+//#define X_IS_L6470
541 
   #define X_MICROSTEPS 16     //number of microsteps
 541 
   #define X_MICROSTEPS 16     //number of microsteps
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define X2_IS_L6470
546 
+//#define X2_IS_L6470
547 
   #define X2_MICROSTEPS 16     //number of microsteps
 547 
   #define X2_MICROSTEPS 16     //number of microsteps
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y_IS_L6470
552 
+//#define Y_IS_L6470
553 
   #define Y_MICROSTEPS 16     //number of microsteps
 553 
   #define Y_MICROSTEPS 16     //number of microsteps
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Y2_IS_L6470
558 
+//#define Y2_IS_L6470
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z_IS_L6470
564 
+//#define Z_IS_L6470
565 
   #define Z_MICROSTEPS 16     //number of microsteps
 565 
   #define Z_MICROSTEPS 16     //number of microsteps
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define Z2_IS_L6470
570 
+//#define Z2_IS_L6470
571 
   #define Z2_MICROSTEPS 16     //number of microsteps
 571 
   #define Z2_MICROSTEPS 16     //number of microsteps
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E0_IS_L6470
576 
+//#define E0_IS_L6470
577 
   #define E0_MICROSTEPS 16     //number of microsteps
 577 
   #define E0_MICROSTEPS 16     //number of microsteps
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
581
582 
-//  #define E1_IS_L6470
582 
+//#define E1_IS_L6470
583 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
 584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
588
589 
-//  #define E2_IS_L6470
589 
+//#define E2_IS_L6470
590 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
 591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
595
596 
-//  #define E3_IS_L6470
596 
+//#define E3_IS_L6470
597 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
 598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 18
- 18
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1
 148 
 #define TEMP_SENSOR_0 1
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
306 
 // @section machine
 306 
 // @section machine
307
307
308 
 // Uncomment this option to enable CoreXY kinematics
 308 
 // Uncomment this option to enable CoreXY kinematics
309 
-// #define COREXY
309 
+//#define COREXY
310
310
311 
 // Uncomment this option to enable CoreXZ kinematics
 311 
 // Uncomment this option to enable CoreXZ kinematics
312 
-// #define COREXZ
312 
+//#define COREXZ
313
313
314 
 // Enable this option for Toshiba steppers
 314 
 // Enable this option for Toshiba steppers
315 
 //#define CONFIG_STEPPERS_TOSHIBA
 315 
 //#define CONFIG_STEPPERS_TOSHIBA
321
321
322 
 #if DISABLED(ENDSTOPPULLUPS)
 322 
 #if DISABLED(ENDSTOPPULLUPS)
323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
324 
-  // #define ENDSTOPPULLUP_XMAX
325 
-  // #define ENDSTOPPULLUP_YMAX
326 
-  // #define ENDSTOPPULLUP_ZMAX
327 
-  // #define ENDSTOPPULLUP_XMIN
328 
-  // #define ENDSTOPPULLUP_YMIN
329 
-  // #define ENDSTOPPULLUP_ZMIN
330 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
324 
+  //#define ENDSTOPPULLUP_XMAX
325 
+  //#define ENDSTOPPULLUP_YMAX
326 
+  //#define ENDSTOPPULLUP_ZMAX
327 
+  //#define ENDSTOPPULLUP_XMIN
328 
+  //#define ENDSTOPPULLUP_YMIN
329 
+  //#define ENDSTOPPULLUP_ZMIN
330 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
331 
 #endif
 331 
 #endif
332
332
333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
419 
 //=========================== Manual Bed Leveling ===========================
 419 
 //=========================== Manual Bed Leveling ===========================
420 
 //===========================================================================
 420 
 //===========================================================================
421
421
422 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
422 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
424
424
425 
 #if ENABLED(MANUAL_BED_LEVELING)
 425 
 #if ENABLED(MANUAL_BED_LEVELING)
426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
505 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 505 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
506 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 506 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
507
507
508 
-//   #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.
508 
+//#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.
509 
                                                                             // Useful to retract a deployable Z probe.
 509 
                                                                             // Useful to retract a deployable Z probe.
510
510
511 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 511 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
723
723
724 
 // The MakerLab Mini Panel with graphic controller and SD support
 724 
 // The MakerLab Mini Panel with graphic controller and SD support
725 
 // http://reprap.org/wiki/Mini_panel
 725 
 // http://reprap.org/wiki/Mini_panel
726 
-// #define MINIPANEL
726 
+//#define MINIPANEL
727
727
728 
 /**
 728 
 /**
729 
  * I2C Panels
 729 
  * I2C Panels
777
777
778 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 778 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
779 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 779 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
780 
-// #define PHOTOGRAPH_PIN     23
780 
+//#define PHOTOGRAPH_PIN     23
781
781
782 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 782 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
783 
 //#define SF_ARC_FIX
 783 
 //#define SF_ARC_FIX

+ 18
- 18
Marlin/example_configurations/RigidBot/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1 // DGlass3D = 5; RigidBot = 1; 3DSv6 = 5
 148 
 #define TEMP_SENSOR_0 1 // DGlass3D = 5; RigidBot = 1; 3DSv6 = 5
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
215 
   #define  DEFAULT_Kd 76.55
 215 
   #define  DEFAULT_Kd 76.55
216
216
217 
   // Base DGlass3D/E3Dv6 hotend
 217 
   // Base DGlass3D/E3Dv6 hotend
218 
-  // #define  DEFAULT_Kp 10
219 
-  // #define  DEFAULT_Ki 0.85
220 
-  // #define  DEFAULT_Kd 245
218 
+  //#define  DEFAULT_Kp 10
219 
+  //#define  DEFAULT_Ki 0.85
220 
+  //#define  DEFAULT_Kd 245
221
221
222 
 #endif // PIDTEMP
 222 
 #endif // PIDTEMP
223
223
307
307
308 
 #if DISABLED(ENDSTOPPULLUPS)
 308 
 #if DISABLED(ENDSTOPPULLUPS)
309 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 309 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
310 
-  // #define ENDSTOPPULLUP_XMAX
311 
-  // #define ENDSTOPPULLUP_YMAX
312 
-  // #define ENDSTOPPULLUP_ZMAX
313 
-  // #define ENDSTOPPULLUP_XMIN
314 
-  // #define ENDSTOPPULLUP_YMIN
315 
-  // #define ENDSTOPPULLUP_ZMIN
316 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
310 
+  //#define ENDSTOPPULLUP_XMAX
311 
+  //#define ENDSTOPPULLUP_YMAX
312 
+  //#define ENDSTOPPULLUP_ZMAX
313 
+  //#define ENDSTOPPULLUP_XMIN
314 
+  //#define ENDSTOPPULLUP_YMIN
315 
+  //#define ENDSTOPPULLUP_ZMIN
316 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
317 
 #endif
 317 
 #endif
318
318
319 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 319 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
405 
 //=========================== Manual Bed Leveling ===========================
 405 
 //=========================== Manual Bed Leveling ===========================
406 
 //===========================================================================
 406 
 //===========================================================================
407
407
408 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
409 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
408 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
409 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
410
410
411 
 #if ENABLED(MANUAL_BED_LEVELING)
 411 
 #if ENABLED(MANUAL_BED_LEVELING)
412 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 412 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
490 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 490 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
491 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 491 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
492
492
493 
-//   #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.
493 
+//#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.
494 
                                                                             // Useful to retract a deployable Z probe.
 494 
                                                                             // Useful to retract a deployable Z probe.
495
495
496 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 496 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
766
766
767 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 767 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
768 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 768 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
769 
-// #define PHOTOGRAPH_PIN     23
769 
+//#define PHOTOGRAPH_PIN     23
770
770
771 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 771 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
772 
 //#define SF_ARC_FIX
 772 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/RigidBot/Configuration_adv.h 查看文件

145 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 145 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
146 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 146 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
147
147
148 
-  // #define Z_DUAL_ENDSTOPS
148 
+  //#define Z_DUAL_ENDSTOPS
149
149
150 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 150 
   #if ENABLED(Z_DUAL_ENDSTOPS)
151 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 151 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
217 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 217 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
218
218
219 
 // When G28 is called, this option will make Y home before X
 219 
 // When G28 is called, this option will make Y home before X
220 
-// #define HOME_Y_BEFORE_X
220 
+//#define HOME_Y_BEFORE_X
221
221
222 
 // @section machine
 222 
 // @section machine
223
223
433 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 433 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
434 
 // the moves are than replaced by the firmware controlled ones.
 434 
 // the moves are than replaced by the firmware controlled ones.
435
435
436 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
436 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
437 
 #if ENABLED(FWRETRACT)
 437 
 #if ENABLED(FWRETRACT)
438 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 438 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
439 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 439 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
470 
 //#define HAVE_TMCDRIVER
 470 
 //#define HAVE_TMCDRIVER
471 
 #if ENABLED(HAVE_TMCDRIVER)
 471 
 #if ENABLED(HAVE_TMCDRIVER)
472
472
473 
-//  #define X_IS_TMC
473 
+//#define X_IS_TMC
474 
   #define X_MAX_CURRENT 1000  //in mA
 474 
   #define X_MAX_CURRENT 1000  //in mA
475 
   #define X_SENSE_RESISTOR 91 //in mOhms
 475 
   #define X_SENSE_RESISTOR 91 //in mOhms
476 
   #define X_MICROSTEPS 16     //number of microsteps
 476 
   #define X_MICROSTEPS 16     //number of microsteps
477
477
478 
-//  #define X2_IS_TMC
478 
+//#define X2_IS_TMC
479 
   #define X2_MAX_CURRENT 1000  //in mA
 479 
   #define X2_MAX_CURRENT 1000  //in mA
480 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X2_SENSE_RESISTOR 91 //in mOhms
481 
   #define X2_MICROSTEPS 16     //number of microsteps
 481 
   #define X2_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define Y_IS_TMC
483 
+//#define Y_IS_TMC
484 
   #define Y_MAX_CURRENT 1000  //in mA
 484 
   #define Y_MAX_CURRENT 1000  //in mA
485 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 485 
   #define Y_SENSE_RESISTOR 91 //in mOhms
486 
   #define Y_MICROSTEPS 16     //number of microsteps
 486 
   #define Y_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y2_IS_TMC
488 
+//#define Y2_IS_TMC
489 
   #define Y2_MAX_CURRENT 1000  //in mA
 489 
   #define Y2_MAX_CURRENT 1000  //in mA
490 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y2_MICROSTEPS 16     //number of microsteps
491 
   #define Y2_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Z_IS_TMC
493 
+//#define Z_IS_TMC
494 
   #define Z_MAX_CURRENT 1000  //in mA
 494 
   #define Z_MAX_CURRENT 1000  //in mA
495 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Z_SENSE_RESISTOR 91 //in mOhms
496 
   #define Z_MICROSTEPS 16     //number of microsteps
 496 
   #define Z_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z2_IS_TMC
498 
+//#define Z2_IS_TMC
499 
   #define Z2_MAX_CURRENT 1000  //in mA
 499 
   #define Z2_MAX_CURRENT 1000  //in mA
500 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z2_MICROSTEPS 16     //number of microsteps
 501 
   #define Z2_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define E0_IS_TMC
503 
+//#define E0_IS_TMC
504 
   #define E0_MAX_CURRENT 1000  //in mA
 504 
   #define E0_MAX_CURRENT 1000  //in mA
505 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 505 
   #define E0_SENSE_RESISTOR 91 //in mOhms
506 
   #define E0_MICROSTEPS 16     //number of microsteps
 506 
   #define E0_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E1_IS_TMC
508 
+//#define E1_IS_TMC
509 
   #define E1_MAX_CURRENT 1000  //in mA
 509 
   #define E1_MAX_CURRENT 1000  //in mA
510 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E1_SENSE_RESISTOR 91 //in mOhms
511 
   #define E1_MICROSTEPS 16     //number of microsteps
511 
   #define E1_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E2_IS_TMC
513 
+//#define E2_IS_TMC
514 
   #define E2_MAX_CURRENT 1000  //in mA
 514 
   #define E2_MAX_CURRENT 1000  //in mA
515 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E2_SENSE_RESISTOR 91 //in mOhms
516 
   #define E2_MICROSTEPS 16     //number of microsteps
516 
   #define E2_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E3_IS_TMC
518 
+//#define E3_IS_TMC
519 
   #define E3_MAX_CURRENT 1000  //in mA
 519 
   #define E3_MAX_CURRENT 1000  //in mA
520 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E3_SENSE_RESISTOR 91 //in mOhms
521 
   #define E3_MICROSTEPS 16     //number of microsteps
521 
   #define E3_MICROSTEPS 16     //number of microsteps
532 
 //#define HAVE_L6470DRIVER
 532 
 //#define HAVE_L6470DRIVER
533 
 #if ENABLED(HAVE_L6470DRIVER)
 533 
 #if ENABLED(HAVE_L6470DRIVER)
534
534
535 
-//  #define X_IS_L6470
535 
+//#define X_IS_L6470
536 
   #define X_MICROSTEPS 16     //number of microsteps
 536 
   #define X_MICROSTEPS 16     //number of microsteps
537 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
537 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
538 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 538 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 539 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
540
541 
-//  #define X2_IS_L6470
541 
+//#define X2_IS_L6470
542 
   #define X2_MICROSTEPS 16     //number of microsteps
 542 
   #define X2_MICROSTEPS 16     //number of microsteps
543 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 544 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 545 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
546
547 
-//  #define Y_IS_L6470
547 
+//#define Y_IS_L6470
548 
   #define Y_MICROSTEPS 16     //number of microsteps
 548 
   #define Y_MICROSTEPS 16     //number of microsteps
549 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 550 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 551 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
552
553 
-//  #define Y2_IS_L6470
553 
+//#define Y2_IS_L6470
554 
   #define Y2_MICROSTEPS 16     //number of microsteps
554 
   #define Y2_MICROSTEPS 16     //number of microsteps
555 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 556 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
558
559 
-//  #define Z_IS_L6470
559 
+//#define Z_IS_L6470
560 
   #define Z_MICROSTEPS 16     //number of microsteps
 560 
   #define Z_MICROSTEPS 16     //number of microsteps
561 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 562 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 563 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
564
565 
-//  #define Z2_IS_L6470
565 
+//#define Z2_IS_L6470
566 
   #define Z2_MICROSTEPS 16     //number of microsteps
 566 
   #define Z2_MICROSTEPS 16     //number of microsteps
567 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 568 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 569 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
570
571 
-//  #define E0_IS_L6470
571 
+//#define E0_IS_L6470
572 
   #define E0_MICROSTEPS 16     //number of microsteps
 572 
   #define E0_MICROSTEPS 16     //number of microsteps
573 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 574 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 575 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
576
577 
-//  #define E1_IS_L6470
577 
+//#define E1_IS_L6470
578 
   #define E1_MICROSTEPS 16     //number of microsteps
578 
   #define E1_MICROSTEPS 16     //number of microsteps
579 
   #define E1_MICROSTEPS 16     //number of microsteps
 579 
   #define E1_MICROSTEPS 16     //number of microsteps
580 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 581 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 582 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
583
584 
-//  #define E2_IS_L6470
584 
+//#define E2_IS_L6470
585 
   #define E2_MICROSTEPS 16     //number of microsteps
585 
   #define E2_MICROSTEPS 16     //number of microsteps
586 
   #define E2_MICROSTEPS 16     //number of microsteps
 586 
   #define E2_MICROSTEPS 16     //number of microsteps
587 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 588 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 589 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
590
591 
-//  #define E3_IS_L6470
591 
+//#define E3_IS_L6470
592 
   #define E3_MICROSTEPS 16     //number of microsteps
592 
   #define E3_MICROSTEPS 16     //number of microsteps
593 
   #define E3_MICROSTEPS 16     //number of microsteps
 593 
   #define E3_MICROSTEPS 16     //number of microsteps
594 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 16
- 16
Marlin/example_configurations/SCARA/Configuration.h 查看文件

100
100
101 
 // Optional custom name for your RepStrap or other custom machine
 101 
 // Optional custom name for your RepStrap or other custom machine
102 
 // Displayed in the LCD "Ready" message
 102 
 // Displayed in the LCD "Ready" message
103 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
103 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
104
104
105 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 105 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
106 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 106 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
107 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
107 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
108
108
109 
 // This defines the number of extruders
 109 
 // This defines the number of extruders
110 
 // :[1,2,3,4]
 110 
 // :[1,2,3,4]
167 
 // 110 is Pt100 with 1k pullup (non standard)
 167 
 // 110 is Pt100 with 1k pullup (non standard)
168 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 168 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
169 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 169 
 //     Use it for Testing or Development purposes. NEVER for production machine.
170 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
171 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
170 
+//#define DUMMY_THERMISTOR_998_VALUE 25
171 
+//#define DUMMY_THERMISTOR_999_VALUE 100
172 
 // :{ '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" }
 172 
 // :{ '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" }
173 
 #define TEMP_SENSOR_0 1
 173 
 #define TEMP_SENSOR_0 1
174 
 #define TEMP_SENSOR_1 0
 174 
 #define TEMP_SENSOR_1 0
314 
 // @section machine
 314 
 // @section machine
315
315
316 
 // Uncomment this option to enable CoreXY kinematics
 316 
 // Uncomment this option to enable CoreXY kinematics
317 
-// #define COREXY
317 
+//#define COREXY
318
318
319 
 // Uncomment this option to enable CoreXZ kinematics
 319 
 // Uncomment this option to enable CoreXZ kinematics
320 
-// #define COREXZ
320 
+//#define COREXZ
321
321
322 
 // Enable this option for Toshiba steppers
 322 
 // Enable this option for Toshiba steppers
323 
 //#define CONFIG_STEPPERS_TOSHIBA
 323 
 //#define CONFIG_STEPPERS_TOSHIBA
329
329
330 
 #if DISABLED(ENDSTOPPULLUPS)
 330 
 #if DISABLED(ENDSTOPPULLUPS)
331 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 331 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
332 
-  // #define ENDSTOPPULLUP_XMAX
333 
-  // #define ENDSTOPPULLUP_YMAX
332 
+  //#define ENDSTOPPULLUP_XMAX
333 
+  //#define ENDSTOPPULLUP_YMAX
334 
    #define ENDSTOPPULLUP_ZMAX  // open pin, inverted
 334 
    #define ENDSTOPPULLUP_ZMAX  // open pin, inverted
335 
    #define ENDSTOPPULLUP_XMIN  // open pin, inverted
 335 
    #define ENDSTOPPULLUP_XMIN  // open pin, inverted
336 
    #define ENDSTOPPULLUP_YMIN  // open pin, inverted
 336 
    #define ENDSTOPPULLUP_YMIN  // open pin, inverted
337 
-  // #define ENDSTOPPULLUP_ZMIN
338 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
337 
+  //#define ENDSTOPPULLUP_ZMIN
338 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
339 
 #endif
 339 
 #endif
340
340
341 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 341 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
427 
 //=========================== Manual Bed Leveling ===========================
 427 
 //=========================== Manual Bed Leveling ===========================
428 
 //===========================================================================
 428 
 //===========================================================================
429
429
430 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
431 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
430 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
431 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
432
432
433 
 #if ENABLED(MANUAL_BED_LEVELING)
 433 
 #if ENABLED(MANUAL_BED_LEVELING)
434 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 434 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
512 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 512 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
513 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 513 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
514
514
515 
-//   #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.
515 
+//#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.
516 
                                                                             // Useful to retract a deployable Z probe.
 516 
                                                                             // Useful to retract a deployable Z probe.
517
517
518 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 518 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
521 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
 521 
 // If you have enabled the bed auto leveling and are using the same Z probe for Z homing,
522 
 // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
 522 
 // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
523
523
524 
- // #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
524 
+ //#define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
525 
                           // When defined, it will:
 525 
                           // When defined, it will:
526 
                           // - Allow Z homing only after X and Y homing AND stepper drivers still enabled.
 526 
                           // - Allow Z homing only after X and Y homing AND stepper drivers still enabled.
527 
                           // - If stepper drivers timeout, it will need X and Y homing again before Z homing.
 527 
                           // - If stepper drivers timeout, it will need X and Y homing again before Z homing.
730
730
731 
 // The MakerLab Mini Panel with graphic controller and SD support
 731 
 // The MakerLab Mini Panel with graphic controller and SD support
732 
 // http://reprap.org/wiki/Mini_panel
 732 
 // http://reprap.org/wiki/Mini_panel
733 
-// #define MINIPANEL
733 
+//#define MINIPANEL
734
734
735 
 /**
 735 
 /**
736 
  * I2C Panels
 736 
  * I2C Panels
784
784
785 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 785 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
786 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 786 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
787 
-// #define PHOTOGRAPH_PIN     23
787 
+//#define PHOTOGRAPH_PIN     23
788
788
789 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 789 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
790 
 //#define SF_ARC_FIX
 790 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/SCARA/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
475 
 //#define HAVE_TMCDRIVER
 475 
 //#define HAVE_TMCDRIVER
476 
 #if ENABLED(HAVE_TMCDRIVER)
 476 
 #if ENABLED(HAVE_TMCDRIVER)
477
477
478 
-//  #define X_IS_TMC
478 
+//#define X_IS_TMC
479 
   #define X_MAX_CURRENT 1000  //in mA
 479 
   #define X_MAX_CURRENT 1000  //in mA
480 
   #define X_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X_SENSE_RESISTOR 91 //in mOhms
481 
   #define X_MICROSTEPS 16     //number of microsteps
 481 
   #define X_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define X2_IS_TMC
483 
+//#define X2_IS_TMC
484 
   #define X2_MAX_CURRENT 1000  //in mA
 484 
   #define X2_MAX_CURRENT 1000  //in mA
485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
486 
   #define X2_MICROSTEPS 16     //number of microsteps
 486 
   #define X2_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y_IS_TMC
488 
+//#define Y_IS_TMC
489 
   #define Y_MAX_CURRENT 1000  //in mA
 489 
   #define Y_MAX_CURRENT 1000  //in mA
490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y_MICROSTEPS 16     //number of microsteps
 491 
   #define Y_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y2_IS_TMC
493 
+//#define Y2_IS_TMC
494 
   #define Y2_MAX_CURRENT 1000  //in mA
 494 
   #define Y2_MAX_CURRENT 1000  //in mA
495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z_IS_TMC
498 
+//#define Z_IS_TMC
499 
   #define Z_MAX_CURRENT 1000  //in mA
 499 
   #define Z_MAX_CURRENT 1000  //in mA
500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z_MICROSTEPS 16     //number of microsteps
 501 
   #define Z_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z2_IS_TMC
503 
+//#define Z2_IS_TMC
504 
   #define Z2_MAX_CURRENT 1000  //in mA
 504 
   #define Z2_MAX_CURRENT 1000  //in mA
505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z2_MICROSTEPS 16     //number of microsteps
 506 
   #define Z2_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E0_IS_TMC
508 
+//#define E0_IS_TMC
509 
   #define E0_MAX_CURRENT 1000  //in mA
 509 
   #define E0_MAX_CURRENT 1000  //in mA
510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
511 
   #define E0_MICROSTEPS 16     //number of microsteps
 511 
   #define E0_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E1_IS_TMC
513 
+//#define E1_IS_TMC
514 
   #define E1_MAX_CURRENT 1000  //in mA
 514 
   #define E1_MAX_CURRENT 1000  //in mA
515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
516 
   #define E1_MICROSTEPS 16     //number of microsteps
516 
   #define E1_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E2_IS_TMC
518 
+//#define E2_IS_TMC
519 
   #define E2_MAX_CURRENT 1000  //in mA
 519 
   #define E2_MAX_CURRENT 1000  //in mA
520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
521 
   #define E2_MICROSTEPS 16     //number of microsteps
521 
   #define E2_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E3_IS_TMC
523 
+//#define E3_IS_TMC
524 
   #define E3_MAX_CURRENT 1000  //in mA
 524 
   #define E3_MAX_CURRENT 1000  //in mA
525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
526 
   #define E3_MICROSTEPS 16     //number of microsteps
526 
   #define E3_MICROSTEPS 16     //number of microsteps
537 
 //#define HAVE_L6470DRIVER
 537 
 //#define HAVE_L6470DRIVER
538 
 #if ENABLED(HAVE_L6470DRIVER)
 538 
 #if ENABLED(HAVE_L6470DRIVER)
539
539
540 
-//  #define X_IS_L6470
540 
+//#define X_IS_L6470
541 
   #define X_MICROSTEPS 16     //number of microsteps
 541 
   #define X_MICROSTEPS 16     //number of microsteps
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define X2_IS_L6470
546 
+//#define X2_IS_L6470
547 
   #define X2_MICROSTEPS 16     //number of microsteps
 547 
   #define X2_MICROSTEPS 16     //number of microsteps
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y_IS_L6470
552 
+//#define Y_IS_L6470
553 
   #define Y_MICROSTEPS 16     //number of microsteps
 553 
   #define Y_MICROSTEPS 16     //number of microsteps
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Y2_IS_L6470
558 
+//#define Y2_IS_L6470
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z_IS_L6470
564 
+//#define Z_IS_L6470
565 
   #define Z_MICROSTEPS 16     //number of microsteps
 565 
   #define Z_MICROSTEPS 16     //number of microsteps
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define Z2_IS_L6470
570 
+//#define Z2_IS_L6470
571 
   #define Z2_MICROSTEPS 16     //number of microsteps
 571 
   #define Z2_MICROSTEPS 16     //number of microsteps
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E0_IS_L6470
576 
+//#define E0_IS_L6470
577 
   #define E0_MICROSTEPS 16     //number of microsteps
 577 
   #define E0_MICROSTEPS 16     //number of microsteps
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
581
582 
-//  #define E1_IS_L6470
582 
+//#define E1_IS_L6470
583 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
 584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
588
589 
-//  #define E2_IS_L6470
589 
+//#define E2_IS_L6470
590 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
 591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
595
596 
-//  #define E3_IS_L6470
596 
+//#define E3_IS_L6470
597 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
 598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 8
- 8
Marlin/example_configurations/TAZ4/Configuration.h 查看文件

79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 7
 148 
 #define TEMP_SENSOR_0 7
149 
 #define TEMP_SENSOR_1 7
 149 
 #define TEMP_SENSOR_1 7
439 
 //=========================== Manual Bed Leveling ===========================
 439 
 //=========================== Manual Bed Leveling ===========================
440 
 //===========================================================================
 440 
 //===========================================================================
441
441
442 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
443 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
442 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
443 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
444
444
445 
 #if ENABLED(MANUAL_BED_LEVELING)
 445 
 #if ENABLED(MANUAL_BED_LEVELING)
446 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 446 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
523 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 523 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
524 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 524 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
525
525
526 
-//   #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.
526 
+//#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.
527 
                                                                             // Useful to retract a deployable Z probe.
 527 
                                                                             // Useful to retract a deployable Z probe.
528
528
529 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 529 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
741
741
742 
 // The MakerLab Mini Panel with graphic controller and SD support
 742 
 // The MakerLab Mini Panel with graphic controller and SD support
743 
 // http://reprap.org/wiki/Mini_panel
 743 
 // http://reprap.org/wiki/Mini_panel
744 
-// #define MINIPANEL
744 
+//#define MINIPANEL
745
745
746 
 /**
 746 
 /**
747 
  * I2C Panels
 747 
  * I2C Panels
795
795
796 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 796 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
797 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 797 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
798 
-// #define PHOTOGRAPH_PIN     23
798 
+//#define PHOTOGRAPH_PIN     23
799
799
800 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 800 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
801 
 //#define SF_ARC_FIX
 801 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/TAZ4/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 #define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 #define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
478 
 //#define HAVE_TMCDRIVER
 478 
 //#define HAVE_TMCDRIVER
479 
 #if ENABLED(HAVE_TMCDRIVER)
 479 
 #if ENABLED(HAVE_TMCDRIVER)
480
480
481 
-//  #define X_IS_TMC
481 
+//#define X_IS_TMC
482 
   #define X_MAX_CURRENT 1000  //in mA
 482 
   #define X_MAX_CURRENT 1000  //in mA
483 
   #define X_SENSE_RESISTOR 91 //in mOhms
 483 
   #define X_SENSE_RESISTOR 91 //in mOhms
484 
   #define X_MICROSTEPS 16     //number of microsteps
 484 
   #define X_MICROSTEPS 16     //number of microsteps
485
485
486 
-//  #define X2_IS_TMC
486 
+//#define X2_IS_TMC
487 
   #define X2_MAX_CURRENT 1000  //in mA
 487 
   #define X2_MAX_CURRENT 1000  //in mA
488 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 488 
   #define X2_SENSE_RESISTOR 91 //in mOhms
489 
   #define X2_MICROSTEPS 16     //number of microsteps
 489 
   #define X2_MICROSTEPS 16     //number of microsteps
490
490
491 
-//  #define Y_IS_TMC
491 
+//#define Y_IS_TMC
492 
   #define Y_MAX_CURRENT 1000  //in mA
 492 
   #define Y_MAX_CURRENT 1000  //in mA
493 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 493 
   #define Y_SENSE_RESISTOR 91 //in mOhms
494 
   #define Y_MICROSTEPS 16     //number of microsteps
 494 
   #define Y_MICROSTEPS 16     //number of microsteps
495
495
496 
-//  #define Y2_IS_TMC
496 
+//#define Y2_IS_TMC
497 
   #define Y2_MAX_CURRENT 1000  //in mA
 497 
   #define Y2_MAX_CURRENT 1000  //in mA
498 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 498 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
499 
   #define Y2_MICROSTEPS 16     //number of microsteps
499 
   #define Y2_MICROSTEPS 16     //number of microsteps
500
500
501 
-//  #define Z_IS_TMC
501 
+//#define Z_IS_TMC
502 
   #define Z_MAX_CURRENT 1000  //in mA
 502 
   #define Z_MAX_CURRENT 1000  //in mA
503 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 503 
   #define Z_SENSE_RESISTOR 91 //in mOhms
504 
   #define Z_MICROSTEPS 16     //number of microsteps
 504 
   #define Z_MICROSTEPS 16     //number of microsteps
505
505
506 
-//  #define Z2_IS_TMC
506 
+//#define Z2_IS_TMC
507 
   #define Z2_MAX_CURRENT 1000  //in mA
 507 
   #define Z2_MAX_CURRENT 1000  //in mA
508 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 508 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
509 
   #define Z2_MICROSTEPS 16     //number of microsteps
 509 
   #define Z2_MICROSTEPS 16     //number of microsteps
510
510
511 
-//  #define E0_IS_TMC
511 
+//#define E0_IS_TMC
512 
   #define E0_MAX_CURRENT 1000  //in mA
 512 
   #define E0_MAX_CURRENT 1000  //in mA
513 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 513 
   #define E0_SENSE_RESISTOR 91 //in mOhms
514 
   #define E0_MICROSTEPS 16     //number of microsteps
 514 
   #define E0_MICROSTEPS 16     //number of microsteps
515
515
516 
-//  #define E1_IS_TMC
516 
+//#define E1_IS_TMC
517 
   #define E1_MAX_CURRENT 1000  //in mA
 517 
   #define E1_MAX_CURRENT 1000  //in mA
518 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 518 
   #define E1_SENSE_RESISTOR 91 //in mOhms
519 
   #define E1_MICROSTEPS 16     //number of microsteps
519 
   #define E1_MICROSTEPS 16     //number of microsteps
520
520
521 
-//  #define E2_IS_TMC
521 
+//#define E2_IS_TMC
522 
   #define E2_MAX_CURRENT 1000  //in mA
 522 
   #define E2_MAX_CURRENT 1000  //in mA
523 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 523 
   #define E2_SENSE_RESISTOR 91 //in mOhms
524 
   #define E2_MICROSTEPS 16     //number of microsteps
524 
   #define E2_MICROSTEPS 16     //number of microsteps
525
525
526 
-//  #define E3_IS_TMC
526 
+//#define E3_IS_TMC
527 
   #define E3_MAX_CURRENT 1000  //in mA
 527 
   #define E3_MAX_CURRENT 1000  //in mA
528 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 528 
   #define E3_SENSE_RESISTOR 91 //in mOhms
529 
   #define E3_MICROSTEPS 16     //number of microsteps
529 
   #define E3_MICROSTEPS 16     //number of microsteps
540 
 //#define HAVE_L6470DRIVER
 540 
 //#define HAVE_L6470DRIVER
541 
 #if ENABLED(HAVE_L6470DRIVER)
 541 
 #if ENABLED(HAVE_L6470DRIVER)
542
542
543 
-//  #define X_IS_L6470
543 
+//#define X_IS_L6470
544 
   #define X_MICROSTEPS 16     //number of microsteps
 544 
   #define X_MICROSTEPS 16     //number of microsteps
545 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
546 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 546 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 547 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
548
549 
-//  #define X2_IS_L6470
549 
+//#define X2_IS_L6470
550 
   #define X2_MICROSTEPS 16     //number of microsteps
 550 
   #define X2_MICROSTEPS 16     //number of microsteps
551 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
552 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 552 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 553 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
554
555 
-//  #define Y_IS_L6470
555 
+//#define Y_IS_L6470
556 
   #define Y_MICROSTEPS 16     //number of microsteps
 556 
   #define Y_MICROSTEPS 16     //number of microsteps
557 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
558 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 558 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 559 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
560
561 
-//  #define Y2_IS_L6470
561 
+//#define Y2_IS_L6470
562 
   #define Y2_MICROSTEPS 16     //number of microsteps
562 
   #define Y2_MICROSTEPS 16     //number of microsteps
563 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
564 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 564 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
566
567 
-//  #define Z_IS_L6470
567 
+//#define Z_IS_L6470
568 
   #define Z_MICROSTEPS 16     //number of microsteps
 568 
   #define Z_MICROSTEPS 16     //number of microsteps
569 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
570 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 570 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 571 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
572
573 
-//  #define Z2_IS_L6470
573 
+//#define Z2_IS_L6470
574 
   #define Z2_MICROSTEPS 16     //number of microsteps
 574 
   #define Z2_MICROSTEPS 16     //number of microsteps
575 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
576 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 576 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 577 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
578
579 
-//  #define E0_IS_L6470
579 
+//#define E0_IS_L6470
580 
   #define E0_MICROSTEPS 16     //number of microsteps
 580 
   #define E0_MICROSTEPS 16     //number of microsteps
581 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
582 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 582 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 583 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
584
585 
-//  #define E1_IS_L6470
585 
+//#define E1_IS_L6470
586 
   #define E1_MICROSTEPS 16     //number of microsteps
586 
   #define E1_MICROSTEPS 16     //number of microsteps
587 
   #define E1_MICROSTEPS 16     //number of microsteps
 587 
   #define E1_MICROSTEPS 16     //number of microsteps
588 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
589 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 589 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 590 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
591
592 
-//  #define E2_IS_L6470
592 
+//#define E2_IS_L6470
593 
   #define E2_MICROSTEPS 16     //number of microsteps
593 
   #define E2_MICROSTEPS 16     //number of microsteps
594 
   #define E2_MICROSTEPS 16     //number of microsteps
 594 
   #define E2_MICROSTEPS 16     //number of microsteps
595 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
595 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
596 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 596 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 597 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
598
599 
-//  #define E3_IS_L6470
599 
+//#define E3_IS_L6470
600 
   #define E3_MICROSTEPS 16     //number of microsteps
600 
   #define E3_MICROSTEPS 16     //number of microsteps
601 
   #define E3_MICROSTEPS 16     //number of microsteps
 601 
   #define E3_MICROSTEPS 16     //number of microsteps
602 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
602 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 17
- 17
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

82
82
83 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 83 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
84 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 84 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
85 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
85 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
86
86
87 
 // This defines the number of extruders
 87 
 // This defines the number of extruders
88 
 // :[1,2,3,4]
 88 
 // :[1,2,3,4]
145 
 // 110 is Pt100 with 1k pullup (non standard)
 145 
 // 110 is Pt100 with 1k pullup (non standard)
146 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 146 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
147 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 147 
 //     Use it for Testing or Development purposes. NEVER for production machine.
148 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
149 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
148 
+//#define DUMMY_THERMISTOR_998_VALUE 25
149 
+//#define DUMMY_THERMISTOR_999_VALUE 100
150 
 // :{ '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" }
 150 
 // :{ '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" }
151 
 #define TEMP_SENSOR_0 1
 151 
 #define TEMP_SENSOR_0 1
152 
 #define TEMP_SENSOR_1 0
 152 
 #define TEMP_SENSOR_1 0
298 
 // @section machine
 298 
 // @section machine
299
299
300 
 // Uncomment this option to enable CoreXY kinematics
 300 
 // Uncomment this option to enable CoreXY kinematics
301 
-// #define COREXY
301 
+//#define COREXY
302
302
303 
 // Uncomment this option to enable CoreXZ kinematics
 303 
 // Uncomment this option to enable CoreXZ kinematics
304 
-// #define COREXZ
304 
+//#define COREXZ
305
305
306 
 // Enable this option for Toshiba steppers
 306 
 // Enable this option for Toshiba steppers
307 
 //#define CONFIG_STEPPERS_TOSHIBA
 307 
 //#define CONFIG_STEPPERS_TOSHIBA
313
313
314 
 #if DISABLED(ENDSTOPPULLUPS)
 314 
 #if DISABLED(ENDSTOPPULLUPS)
315 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 315 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
316 
-  // #define ENDSTOPPULLUP_XMAX
317 
-  // #define ENDSTOPPULLUP_YMAX
318 
-  // #define ENDSTOPPULLUP_ZMAX
319 
-  // #define ENDSTOPPULLUP_XMIN
320 
-  // #define ENDSTOPPULLUP_YMIN
321 
-  // #define ENDSTOPPULLUP_ZMIN
322 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
316 
+  //#define ENDSTOPPULLUP_XMAX
317 
+  //#define ENDSTOPPULLUP_YMAX
318 
+  //#define ENDSTOPPULLUP_ZMAX
319 
+  //#define ENDSTOPPULLUP_XMIN
320 
+  //#define ENDSTOPPULLUP_YMIN
321 
+  //#define ENDSTOPPULLUP_ZMIN
322 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
323 
 #endif
 323 
 #endif
324
324
325 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 325 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
411 
 //=========================== Manual Bed Leveling ===========================
 411 
 //=========================== Manual Bed Leveling ===========================
412 
 //===========================================================================
 412 
 //===========================================================================
413
413
414 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
415 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
414 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
415 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
416
416
417 
 #if ENABLED(MANUAL_BED_LEVELING)
 417 
 #if ENABLED(MANUAL_BED_LEVELING)
418 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 418 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
496 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 496 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
497 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 497 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
498
498
499 
-//   #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.
499 
+//#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.
500 
                                                                             // Useful to retract a deployable Z probe.
 500 
                                                                             // Useful to retract a deployable Z probe.
501
501
502 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 502 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
714
714
715 
 // The MakerLab Mini Panel with graphic controller and SD support
 715 
 // The MakerLab Mini Panel with graphic controller and SD support
716 
 // http://reprap.org/wiki/Mini_panel
 716 
 // http://reprap.org/wiki/Mini_panel
717 
-// #define MINIPANEL
717 
+//#define MINIPANEL
718
718
719 
 /**
 719 
 /**
720 
  * I2C Panels
 720 
  * I2C Panels
768
768
769 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 769 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
770 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 770 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
771 
-// #define PHOTOGRAPH_PIN     23
771 
+//#define PHOTOGRAPH_PIN     23
772
772
773 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 773 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
774 
 //#define SF_ARC_FIX
 774 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/WITBOX/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
475 
 //#define HAVE_TMCDRIVER
 475 
 //#define HAVE_TMCDRIVER
476 
 #if ENABLED(HAVE_TMCDRIVER)
 476 
 #if ENABLED(HAVE_TMCDRIVER)
477
477
478 
-//  #define X_IS_TMC
478 
+//#define X_IS_TMC
479 
   #define X_MAX_CURRENT 1000  //in mA
 479 
   #define X_MAX_CURRENT 1000  //in mA
480 
   #define X_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X_SENSE_RESISTOR 91 //in mOhms
481 
   #define X_MICROSTEPS 16     //number of microsteps
 481 
   #define X_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define X2_IS_TMC
483 
+//#define X2_IS_TMC
484 
   #define X2_MAX_CURRENT 1000  //in mA
 484 
   #define X2_MAX_CURRENT 1000  //in mA
485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
486 
   #define X2_MICROSTEPS 16     //number of microsteps
 486 
   #define X2_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y_IS_TMC
488 
+//#define Y_IS_TMC
489 
   #define Y_MAX_CURRENT 1000  //in mA
 489 
   #define Y_MAX_CURRENT 1000  //in mA
490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y_MICROSTEPS 16     //number of microsteps
 491 
   #define Y_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y2_IS_TMC
493 
+//#define Y2_IS_TMC
494 
   #define Y2_MAX_CURRENT 1000  //in mA
 494 
   #define Y2_MAX_CURRENT 1000  //in mA
495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z_IS_TMC
498 
+//#define Z_IS_TMC
499 
   #define Z_MAX_CURRENT 1000  //in mA
 499 
   #define Z_MAX_CURRENT 1000  //in mA
500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z_MICROSTEPS 16     //number of microsteps
 501 
   #define Z_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z2_IS_TMC
503 
+//#define Z2_IS_TMC
504 
   #define Z2_MAX_CURRENT 1000  //in mA
 504 
   #define Z2_MAX_CURRENT 1000  //in mA
505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z2_MICROSTEPS 16     //number of microsteps
 506 
   #define Z2_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E0_IS_TMC
508 
+//#define E0_IS_TMC
509 
   #define E0_MAX_CURRENT 1000  //in mA
 509 
   #define E0_MAX_CURRENT 1000  //in mA
510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
511 
   #define E0_MICROSTEPS 16     //number of microsteps
 511 
   #define E0_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E1_IS_TMC
513 
+//#define E1_IS_TMC
514 
   #define E1_MAX_CURRENT 1000  //in mA
 514 
   #define E1_MAX_CURRENT 1000  //in mA
515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
516 
   #define E1_MICROSTEPS 16     //number of microsteps
516 
   #define E1_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E2_IS_TMC
518 
+//#define E2_IS_TMC
519 
   #define E2_MAX_CURRENT 1000  //in mA
 519 
   #define E2_MAX_CURRENT 1000  //in mA
520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
521 
   #define E2_MICROSTEPS 16     //number of microsteps
521 
   #define E2_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E3_IS_TMC
523 
+//#define E3_IS_TMC
524 
   #define E3_MAX_CURRENT 1000  //in mA
 524 
   #define E3_MAX_CURRENT 1000  //in mA
525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
526 
   #define E3_MICROSTEPS 16     //number of microsteps
526 
   #define E3_MICROSTEPS 16     //number of microsteps
537 
 //#define HAVE_L6470DRIVER
 537 
 //#define HAVE_L6470DRIVER
538 
 #if ENABLED(HAVE_L6470DRIVER)
 538 
 #if ENABLED(HAVE_L6470DRIVER)
539
539
540 
-//  #define X_IS_L6470
540 
+//#define X_IS_L6470
541 
   #define X_MICROSTEPS 16     //number of microsteps
 541 
   #define X_MICROSTEPS 16     //number of microsteps
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define X2_IS_L6470
546 
+//#define X2_IS_L6470
547 
   #define X2_MICROSTEPS 16     //number of microsteps
 547 
   #define X2_MICROSTEPS 16     //number of microsteps
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y_IS_L6470
552 
+//#define Y_IS_L6470
553 
   #define Y_MICROSTEPS 16     //number of microsteps
 553 
   #define Y_MICROSTEPS 16     //number of microsteps
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Y2_IS_L6470
558 
+//#define Y2_IS_L6470
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z_IS_L6470
564 
+//#define Z_IS_L6470
565 
   #define Z_MICROSTEPS 16     //number of microsteps
 565 
   #define Z_MICROSTEPS 16     //number of microsteps
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define Z2_IS_L6470
570 
+//#define Z2_IS_L6470
571 
   #define Z2_MICROSTEPS 16     //number of microsteps
 571 
   #define Z2_MICROSTEPS 16     //number of microsteps
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E0_IS_L6470
576 
+//#define E0_IS_L6470
577 
   #define E0_MICROSTEPS 16     //number of microsteps
 577 
   #define E0_MICROSTEPS 16     //number of microsteps
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
581
582 
-//  #define E1_IS_L6470
582 
+//#define E1_IS_L6470
583 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
 584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
588
589 
-//  #define E2_IS_L6470
589 
+//#define E2_IS_L6470
590 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
 591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
595
596 
-//  #define E3_IS_L6470
596 
+//#define E3_IS_L6470
597 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
 598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 18
- 18
Marlin/example_configurations/adafruit/ST7565/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1
 148 
 #define TEMP_SENSOR_0 1
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
306 
 // @section machine
 306 
 // @section machine
307
307
308 
 // Uncomment this option to enable CoreXY kinematics
 308 
 // Uncomment this option to enable CoreXY kinematics
309 
-// #define COREXY
309 
+//#define COREXY
310
310
311 
 // Uncomment this option to enable CoreXZ kinematics
 311 
 // Uncomment this option to enable CoreXZ kinematics
312 
-// #define COREXZ
312 
+//#define COREXZ
313
313
314 
 // Enable this option for Toshiba steppers
 314 
 // Enable this option for Toshiba steppers
315 
 //#define CONFIG_STEPPERS_TOSHIBA
 315 
 //#define CONFIG_STEPPERS_TOSHIBA
321
321
322 
 #if DISABLED(ENDSTOPPULLUPS)
 322 
 #if DISABLED(ENDSTOPPULLUPS)
323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 323 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
324 
-  // #define ENDSTOPPULLUP_XMAX
325 
-  // #define ENDSTOPPULLUP_YMAX
326 
-  // #define ENDSTOPPULLUP_ZMAX
327 
-  // #define ENDSTOPPULLUP_XMIN
328 
-  // #define ENDSTOPPULLUP_YMIN
329 
-  // #define ENDSTOPPULLUP_ZMIN
330 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
324 
+  //#define ENDSTOPPULLUP_XMAX
325 
+  //#define ENDSTOPPULLUP_YMAX
326 
+  //#define ENDSTOPPULLUP_ZMAX
327 
+  //#define ENDSTOPPULLUP_XMIN
328 
+  //#define ENDSTOPPULLUP_YMIN
329 
+  //#define ENDSTOPPULLUP_ZMIN
330 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
331 
 #endif
 331 
 #endif
332
332
333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 333 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
419 
 //=========================== Manual Bed Leveling ===========================
 419 
 //=========================== Manual Bed Leveling ===========================
420 
 //===========================================================================
 420 
 //===========================================================================
421
421
422 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
422 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
423 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
424
424
425 
 #if ENABLED(MANUAL_BED_LEVELING)
 425 
 #if ENABLED(MANUAL_BED_LEVELING)
426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 426 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
505 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 505 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
506 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 506 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
507
507
508 
-//   #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.
508 
+//#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.
509 
                                                                             // Useful to retract a deployable Z probe.
 509 
                                                                             // Useful to retract a deployable Z probe.
510
510
511 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 511 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
723
723
724 
 // The MakerLab Mini Panel with graphic controller and SD support
 724 
 // The MakerLab Mini Panel with graphic controller and SD support
725 
 // http://reprap.org/wiki/Mini_panel
 725 
 // http://reprap.org/wiki/Mini_panel
726 
-// #define MINIPANEL
726 
+//#define MINIPANEL
727
727
728 
 /**
 728 
 /**
729 
  * I2C Panels
 729 
  * I2C Panels
777
777
778 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 778 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
779 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 779 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
780 
-// #define PHOTOGRAPH_PIN     23
780 
+//#define PHOTOGRAPH_PIN     23
781
781
782 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 782 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
783 
 //#define SF_ARC_FIX
 783 
 //#define SF_ARC_FIX

+ 17
- 17
Marlin/example_configurations/delta/biv2.5/Configuration.h 查看文件

79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 5
 148 
 #define TEMP_SENSOR_0 5
149 
 #define TEMP_SENSOR_1 5
 149 
 #define TEMP_SENSOR_1 5
306 
 // @section machine
 306 
 // @section machine
307
307
308 
 // Uncomment this option to enable CoreXY kinematics
 308 
 // Uncomment this option to enable CoreXY kinematics
309 
-// #define COREXY
309 
+//#define COREXY
310
310
311 
 // Uncomment this option to enable CoreXZ kinematics
 311 
 // Uncomment this option to enable CoreXZ kinematics
312 
-// #define COREXZ
312 
+//#define COREXZ
313
313
314 
 //===========================================================================
 314 
 //===========================================================================
315 
 //============================== Delta Settings =============================
 315 
 //============================== Delta Settings =============================
356
356
357 
 #if DISABLED(ENDSTOPPULLUPS)
 357 
 #if DISABLED(ENDSTOPPULLUPS)
358 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 358 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
359 
-  // #define ENDSTOPPULLUP_XMAX
360 
-  // #define ENDSTOPPULLUP_YMAX
361 
-  // #define ENDSTOPPULLUP_ZMAX
362 
-  // #define ENDSTOPPULLUP_XMIN
363 
-  // #define ENDSTOPPULLUP_YMIN
364 
-  // #define ENDSTOPPULLUP_ZMIN
365 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
359 
+  //#define ENDSTOPPULLUP_XMAX
360 
+  //#define ENDSTOPPULLUP_YMAX
361 
+  //#define ENDSTOPPULLUP_ZMAX
362 
+  //#define ENDSTOPPULLUP_XMIN
363 
+  //#define ENDSTOPPULLUP_YMIN
364 
+  //#define ENDSTOPPULLUP_ZMIN
365 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
366 
 #endif
 366 
 #endif
367
367
368 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 368 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
454 
 //=========================== Manual Bed Leveling ===========================
 454 
 //=========================== Manual Bed Leveling ===========================
455 
 //===========================================================================
 455 
 //===========================================================================
456
456
457 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
458 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
457 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
458 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
459
459
460 
 #if ENABLED(MANUAL_BED_LEVELING)
 460 
 #if ENABLED(MANUAL_BED_LEVELING)
461 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 461 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
543 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 543 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
544 
   #define Z_RAISE_AFTER_PROBING 50    // How much the Z axis will be raised after the last probing point.
 544 
   #define Z_RAISE_AFTER_PROBING 50    // How much the Z axis will be raised after the last probing point.
545
545
546 
-//   #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.
546 
+//#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.
547 
                                                                             // Useful to retract a deployable Z probe.
 547 
                                                                             // Useful to retract a deployable Z probe.
548
548
549 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 549 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
847 
 // See http://minow.blogspot.com/index.html#4918805519571907051
 847 
 // See http://minow.blogspot.com/index.html#4918805519571907051
848 
 // If needed, adjust the X, Y, Z calibration coordinates
 848 
 // If needed, adjust the X, Y, Z calibration coordinates
849 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
 849 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
850 
-// #define DELTA_CALIBRATION_MENU
850 
+//#define DELTA_CALIBRATION_MENU
851
851
852 
 /**
 852 
 /**
853 
  * I2C Panels
 853 
  * I2C Panels
901
901
902 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 902 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
903 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 903 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
904 
-// #define PHOTOGRAPH_PIN     23
904 
+//#define PHOTOGRAPH_PIN     23
905
905
906 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 906 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
907 
 //#define SF_ARC_FIX
 907 
 //#define SF_ARC_FIX

+ 22
- 22
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
476 
 //#define HAVE_TMCDRIVER
 476 
 //#define HAVE_TMCDRIVER
477 
 #if ENABLED(HAVE_TMCDRIVER)
 477 
 #if ENABLED(HAVE_TMCDRIVER)
478
478
479 
-//  #define X_IS_TMC
479 
+//#define X_IS_TMC
480 
   #define X_MAX_CURRENT 1000  //in mA
 480 
   #define X_MAX_CURRENT 1000  //in mA
481 
   #define X_SENSE_RESISTOR 91 //in mOhms
 481 
   #define X_SENSE_RESISTOR 91 //in mOhms
482 
   #define X_MICROSTEPS 16     //number of microsteps
 482 
   #define X_MICROSTEPS 16     //number of microsteps
483
483
484 
-//  #define X2_IS_TMC
484 
+//#define X2_IS_TMC
485 
   #define X2_MAX_CURRENT 1000  //in mA
 485 
   #define X2_MAX_CURRENT 1000  //in mA
486 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 486 
   #define X2_SENSE_RESISTOR 91 //in mOhms
487 
   #define X2_MICROSTEPS 16     //number of microsteps
 487 
   #define X2_MICROSTEPS 16     //number of microsteps
488
488
489 
-//  #define Y_IS_TMC
489 
+//#define Y_IS_TMC
490 
   #define Y_MAX_CURRENT 1000  //in mA
 490 
   #define Y_MAX_CURRENT 1000  //in mA
491 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 491 
   #define Y_SENSE_RESISTOR 91 //in mOhms
492 
   #define Y_MICROSTEPS 16     //number of microsteps
 492 
   #define Y_MICROSTEPS 16     //number of microsteps
493
493
494 
-//  #define Y2_IS_TMC
494 
+//#define Y2_IS_TMC
495 
   #define Y2_MAX_CURRENT 1000  //in mA
 495 
   #define Y2_MAX_CURRENT 1000  //in mA
496 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 496 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
497 
   #define Y2_MICROSTEPS 16     //number of microsteps
497 
   #define Y2_MICROSTEPS 16     //number of microsteps
498
498
499 
-//  #define Z_IS_TMC
499 
+//#define Z_IS_TMC
500 
   #define Z_MAX_CURRENT 1000  //in mA
 500 
   #define Z_MAX_CURRENT 1000  //in mA
501 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 501 
   #define Z_SENSE_RESISTOR 91 //in mOhms
502 
   #define Z_MICROSTEPS 16     //number of microsteps
 502 
   #define Z_MICROSTEPS 16     //number of microsteps
503
503
504 
-//  #define Z2_IS_TMC
504 
+//#define Z2_IS_TMC
505 
   #define Z2_MAX_CURRENT 1000  //in mA
 505 
   #define Z2_MAX_CURRENT 1000  //in mA
506 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 506 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
507 
   #define Z2_MICROSTEPS 16     //number of microsteps
 507 
   #define Z2_MICROSTEPS 16     //number of microsteps
508
508
509 
-//  #define E0_IS_TMC
509 
+//#define E0_IS_TMC
510 
   #define E0_MAX_CURRENT 1000  //in mA
 510 
   #define E0_MAX_CURRENT 1000  //in mA
511 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 511 
   #define E0_SENSE_RESISTOR 91 //in mOhms
512 
   #define E0_MICROSTEPS 16     //number of microsteps
 512 
   #define E0_MICROSTEPS 16     //number of microsteps
513
513
514 
-//  #define E1_IS_TMC
514 
+//#define E1_IS_TMC
515 
   #define E1_MAX_CURRENT 1000  //in mA
 515 
   #define E1_MAX_CURRENT 1000  //in mA
516 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 516 
   #define E1_SENSE_RESISTOR 91 //in mOhms
517 
   #define E1_MICROSTEPS 16     //number of microsteps
517 
   #define E1_MICROSTEPS 16     //number of microsteps
518
518
519 
-//  #define E2_IS_TMC
519 
+//#define E2_IS_TMC
520 
   #define E2_MAX_CURRENT 1000  //in mA
 520 
   #define E2_MAX_CURRENT 1000  //in mA
521 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 521 
   #define E2_SENSE_RESISTOR 91 //in mOhms
522 
   #define E2_MICROSTEPS 16     //number of microsteps
522 
   #define E2_MICROSTEPS 16     //number of microsteps
523
523
524 
-//  #define E3_IS_TMC
524 
+//#define E3_IS_TMC
525 
   #define E3_MAX_CURRENT 1000  //in mA
 525 
   #define E3_MAX_CURRENT 1000  //in mA
526 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 526 
   #define E3_SENSE_RESISTOR 91 //in mOhms
527 
   #define E3_MICROSTEPS 16     //number of microsteps
527 
   #define E3_MICROSTEPS 16     //number of microsteps
538 
 //#define HAVE_L6470DRIVER
 538 
 //#define HAVE_L6470DRIVER
539 
 #if ENABLED(HAVE_L6470DRIVER)
 539 
 #if ENABLED(HAVE_L6470DRIVER)
540
540
541 
-//  #define X_IS_L6470
541 
+//#define X_IS_L6470
542 
   #define X_MICROSTEPS 16     //number of microsteps
 542 
   #define X_MICROSTEPS 16     //number of microsteps
543 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 544 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 545 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
546
547 
-//  #define X2_IS_L6470
547 
+//#define X2_IS_L6470
548 
   #define X2_MICROSTEPS 16     //number of microsteps
 548 
   #define X2_MICROSTEPS 16     //number of microsteps
549 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 550 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 551 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
552
553 
-//  #define Y_IS_L6470
553 
+//#define Y_IS_L6470
554 
   #define Y_MICROSTEPS 16     //number of microsteps
 554 
   #define Y_MICROSTEPS 16     //number of microsteps
555 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 556 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 557 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
558
559 
-//  #define Y2_IS_L6470
559 
+//#define Y2_IS_L6470
560 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_MICROSTEPS 16     //number of microsteps
561 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 562 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
564
565 
-//  #define Z_IS_L6470
565 
+//#define Z_IS_L6470
566 
   #define Z_MICROSTEPS 16     //number of microsteps
 566 
   #define Z_MICROSTEPS 16     //number of microsteps
567 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 568 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 569 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
570
571 
-//  #define Z2_IS_L6470
571 
+//#define Z2_IS_L6470
572 
   #define Z2_MICROSTEPS 16     //number of microsteps
 572 
   #define Z2_MICROSTEPS 16     //number of microsteps
573 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 574 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 575 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
576
577 
-//  #define E0_IS_L6470
577 
+//#define E0_IS_L6470
578 
   #define E0_MICROSTEPS 16     //number of microsteps
 578 
   #define E0_MICROSTEPS 16     //number of microsteps
579 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 580 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 581 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
582
583 
-//  #define E1_IS_L6470
583 
+//#define E1_IS_L6470
584 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_MICROSTEPS 16     //number of microsteps
 585 
   #define E1_MICROSTEPS 16     //number of microsteps
586 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 587 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 588 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
589
590 
-//  #define E2_IS_L6470
590 
+//#define E2_IS_L6470
591 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_MICROSTEPS 16     //number of microsteps
 592 
   #define E2_MICROSTEPS 16     //number of microsteps
593 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 594 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
595 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 595 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
596
596
597 
-//  #define E3_IS_L6470
597 
+//#define E3_IS_L6470
598 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_MICROSTEPS 16     //number of microsteps
 599 
   #define E3_MICROSTEPS 16     //number of microsteps
600 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 18
- 18
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 -1
 148 
 #define TEMP_SENSOR_0 -1
149 
 #define TEMP_SENSOR_1 -1
 149 
 #define TEMP_SENSOR_1 -1
306 
 // @section machine
 306 
 // @section machine
307
307
308 
 // Uncomment this option to enable CoreXY kinematics
 308 
 // Uncomment this option to enable CoreXY kinematics
309 
-// #define COREXY
309 
+//#define COREXY
310
310
311 
 // Uncomment this option to enable CoreXZ kinematics
 311 
 // Uncomment this option to enable CoreXZ kinematics
312 
-// #define COREXZ
312 
+//#define COREXZ
313
313
314 
 //===========================================================================
 314 
 //===========================================================================
315 
 //============================== Delta Settings =============================
 315 
 //============================== Delta Settings =============================
356
356
357 
 #if DISABLED(ENDSTOPPULLUPS)
 357 
 #if DISABLED(ENDSTOPPULLUPS)
358 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 358 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
359 
-  // #define ENDSTOPPULLUP_XMAX
360 
-  // #define ENDSTOPPULLUP_YMAX
361 
-  // #define ENDSTOPPULLUP_ZMAX
362 
-  // #define ENDSTOPPULLUP_XMIN
363 
-  // #define ENDSTOPPULLUP_YMIN
364 
-  // #define ENDSTOPPULLUP_ZMIN
365 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
359 
+  //#define ENDSTOPPULLUP_XMAX
360 
+  //#define ENDSTOPPULLUP_YMAX
361 
+  //#define ENDSTOPPULLUP_ZMAX
362 
+  //#define ENDSTOPPULLUP_XMIN
363 
+  //#define ENDSTOPPULLUP_YMIN
364 
+  //#define ENDSTOPPULLUP_ZMIN
365 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
366 
 #endif
 366 
 #endif
367
367
368 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 368 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
454 
 //=========================== Manual Bed Leveling ===========================
 454 
 //=========================== Manual Bed Leveling ===========================
455 
 //===========================================================================
 455 
 //===========================================================================
456
456
457 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
458 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
457 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
458 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
459
459
460 
 #if ENABLED(MANUAL_BED_LEVELING)
 460 
 #if ENABLED(MANUAL_BED_LEVELING)
461 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 461 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
544 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
 544 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
545 
   #define Z_RAISE_AFTER_PROBING 50    // How much the Z axis will be raised after the last probing point.
 545 
   #define Z_RAISE_AFTER_PROBING 50    // How much the Z axis will be raised after the last probing point.
546
546
547 
-//   #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.
547 
+//#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.
548 
                                                                             // Useful to retract a deployable Z probe.
 548 
                                                                             // Useful to retract a deployable Z probe.
549
549
550 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 550 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
848 
 // See http://minow.blogspot.com/index.html#4918805519571907051
 848 
 // See http://minow.blogspot.com/index.html#4918805519571907051
849 
 // If needed, adjust the X, Y, Z calibration coordinates
 849 
 // If needed, adjust the X, Y, Z calibration coordinates
850 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
 850 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
851 
-// #define DELTA_CALIBRATION_MENU
851 
+//#define DELTA_CALIBRATION_MENU
852
852
853 
 // The MakerLab Mini Panel with graphic controller and SD support
 853 
 // The MakerLab Mini Panel with graphic controller and SD support
854 
 // http://reprap.org/wiki/Mini_panel
 854 
 // http://reprap.org/wiki/Mini_panel
855 
-// #define MINIPANEL
855 
+//#define MINIPANEL
856
856
857 
 /**
 857 
 /**
858 
  * I2C Panels
 858 
  * I2C Panels
906
906
907 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 907 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
908 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 908 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
909 
-// #define PHOTOGRAPH_PIN     23
909 
+//#define PHOTOGRAPH_PIN     23
910
910
911 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 911 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
912 
 //#define SF_ARC_FIX
 912 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/delta/generic/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
443 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 443 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
444 
 // the moves are than replaced by the firmware controlled ones.
 444 
 // the moves are than replaced by the firmware controlled ones.
445
445
446 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
446 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
447 
 #if ENABLED(FWRETRACT)
 447 
 #if ENABLED(FWRETRACT)
448 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 448 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
449 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 449 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
477 
 //#define HAVE_TMCDRIVER
 477 
 //#define HAVE_TMCDRIVER
478 
 #if ENABLED(HAVE_TMCDRIVER)
 478 
 #if ENABLED(HAVE_TMCDRIVER)
479
479
480 
-//  #define X_IS_TMC
480 
+//#define X_IS_TMC
481 
   #define X_MAX_CURRENT 1000  //in mA
 481 
   #define X_MAX_CURRENT 1000  //in mA
482 
   #define X_SENSE_RESISTOR 91 //in mOhms
 482 
   #define X_SENSE_RESISTOR 91 //in mOhms
483 
   #define X_MICROSTEPS 16     //number of microsteps
 483 
   #define X_MICROSTEPS 16     //number of microsteps
484
484
485 
-//  #define X2_IS_TMC
485 
+//#define X2_IS_TMC
486 
   #define X2_MAX_CURRENT 1000  //in mA
 486 
   #define X2_MAX_CURRENT 1000  //in mA
487 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 487 
   #define X2_SENSE_RESISTOR 91 //in mOhms
488 
   #define X2_MICROSTEPS 16     //number of microsteps
 488 
   #define X2_MICROSTEPS 16     //number of microsteps
489
489
490 
-//  #define Y_IS_TMC
490 
+//#define Y_IS_TMC
491 
   #define Y_MAX_CURRENT 1000  //in mA
 491 
   #define Y_MAX_CURRENT 1000  //in mA
492 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 492 
   #define Y_SENSE_RESISTOR 91 //in mOhms
493 
   #define Y_MICROSTEPS 16     //number of microsteps
 493 
   #define Y_MICROSTEPS 16     //number of microsteps
494
494
495 
-//  #define Y2_IS_TMC
495 
+//#define Y2_IS_TMC
496 
   #define Y2_MAX_CURRENT 1000  //in mA
 496 
   #define Y2_MAX_CURRENT 1000  //in mA
497 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 497 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
498 
   #define Y2_MICROSTEPS 16     //number of microsteps
498 
   #define Y2_MICROSTEPS 16     //number of microsteps
499
499
500 
-//  #define Z_IS_TMC
500 
+//#define Z_IS_TMC
501 
   #define Z_MAX_CURRENT 1000  //in mA
 501 
   #define Z_MAX_CURRENT 1000  //in mA
502 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 502 
   #define Z_SENSE_RESISTOR 91 //in mOhms
503 
   #define Z_MICROSTEPS 16     //number of microsteps
 503 
   #define Z_MICROSTEPS 16     //number of microsteps
504
504
505 
-//  #define Z2_IS_TMC
505 
+//#define Z2_IS_TMC
506 
   #define Z2_MAX_CURRENT 1000  //in mA
 506 
   #define Z2_MAX_CURRENT 1000  //in mA
507 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 507 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
508 
   #define Z2_MICROSTEPS 16     //number of microsteps
 508 
   #define Z2_MICROSTEPS 16     //number of microsteps
509
509
510 
-//  #define E0_IS_TMC
510 
+//#define E0_IS_TMC
511 
   #define E0_MAX_CURRENT 1000  //in mA
 511 
   #define E0_MAX_CURRENT 1000  //in mA
512 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 512 
   #define E0_SENSE_RESISTOR 91 //in mOhms
513 
   #define E0_MICROSTEPS 16     //number of microsteps
 513 
   #define E0_MICROSTEPS 16     //number of microsteps
514
514
515 
-//  #define E1_IS_TMC
515 
+//#define E1_IS_TMC
516 
   #define E1_MAX_CURRENT 1000  //in mA
 516 
   #define E1_MAX_CURRENT 1000  //in mA
517 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 517 
   #define E1_SENSE_RESISTOR 91 //in mOhms
518 
   #define E1_MICROSTEPS 16     //number of microsteps
518 
   #define E1_MICROSTEPS 16     //number of microsteps
519
519
520 
-//  #define E2_IS_TMC
520 
+//#define E2_IS_TMC
521 
   #define E2_MAX_CURRENT 1000  //in mA
 521 
   #define E2_MAX_CURRENT 1000  //in mA
522 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 522 
   #define E2_SENSE_RESISTOR 91 //in mOhms
523 
   #define E2_MICROSTEPS 16     //number of microsteps
523 
   #define E2_MICROSTEPS 16     //number of microsteps
524
524
525 
-//  #define E3_IS_TMC
525 
+//#define E3_IS_TMC
526 
   #define E3_MAX_CURRENT 1000  //in mA
 526 
   #define E3_MAX_CURRENT 1000  //in mA
527 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 527 
   #define E3_SENSE_RESISTOR 91 //in mOhms
528 
   #define E3_MICROSTEPS 16     //number of microsteps
528 
   #define E3_MICROSTEPS 16     //number of microsteps
539 
 //#define HAVE_L6470DRIVER
 539 
 //#define HAVE_L6470DRIVER
540 
 #if ENABLED(HAVE_L6470DRIVER)
 540 
 #if ENABLED(HAVE_L6470DRIVER)
541
541
542 
-//  #define X_IS_L6470
542 
+//#define X_IS_L6470
543 
   #define X_MICROSTEPS 16     //number of microsteps
 543 
   #define X_MICROSTEPS 16     //number of microsteps
544 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 545 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 546 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
547
548 
-//  #define X2_IS_L6470
548 
+//#define X2_IS_L6470
549 
   #define X2_MICROSTEPS 16     //number of microsteps
 549 
   #define X2_MICROSTEPS 16     //number of microsteps
550 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 551 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 552 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
553
554 
-//  #define Y_IS_L6470
554 
+//#define Y_IS_L6470
555 
   #define Y_MICROSTEPS 16     //number of microsteps
 555 
   #define Y_MICROSTEPS 16     //number of microsteps
556 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 557 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 558 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
559
560 
-//  #define Y2_IS_L6470
560 
+//#define Y2_IS_L6470
561 
   #define Y2_MICROSTEPS 16     //number of microsteps
561 
   #define Y2_MICROSTEPS 16     //number of microsteps
562 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 563 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
565
566 
-//  #define Z_IS_L6470
566 
+//#define Z_IS_L6470
567 
   #define Z_MICROSTEPS 16     //number of microsteps
 567 
   #define Z_MICROSTEPS 16     //number of microsteps
568 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 569 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 570 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
571
572 
-//  #define Z2_IS_L6470
572 
+//#define Z2_IS_L6470
573 
   #define Z2_MICROSTEPS 16     //number of microsteps
 573 
   #define Z2_MICROSTEPS 16     //number of microsteps
574 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 575 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 576 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
577
578 
-//  #define E0_IS_L6470
578 
+//#define E0_IS_L6470
579 
   #define E0_MICROSTEPS 16     //number of microsteps
 579 
   #define E0_MICROSTEPS 16     //number of microsteps
580 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 581 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 582 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
583
584 
-//  #define E1_IS_L6470
584 
+//#define E1_IS_L6470
585 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_MICROSTEPS 16     //number of microsteps
586 
   #define E1_MICROSTEPS 16     //number of microsteps
 586 
   #define E1_MICROSTEPS 16     //number of microsteps
587 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 588 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 589 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
590
591 
-//  #define E2_IS_L6470
591 
+//#define E2_IS_L6470
592 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_MICROSTEPS 16     //number of microsteps
593 
   #define E2_MICROSTEPS 16     //number of microsteps
 593 
   #define E2_MICROSTEPS 16     //number of microsteps
594 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
595 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 595 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 596 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
597
598 
-//  #define E3_IS_L6470
598 
+//#define E3_IS_L6470
599 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_MICROSTEPS 16     //number of microsteps
600 
   #define E3_MICROSTEPS 16     //number of microsteps
 600 
   #define E3_MICROSTEPS 16     //number of microsteps
601 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
601 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 17
- 17
Marlin/example_configurations/delta/kossel_mini/Configuration.h 查看文件

79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 7
 148 
 #define TEMP_SENSOR_0 7
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
306 
 // @section machine
 306 
 // @section machine
307
307
308 
 // Uncomment this option to enable CoreXY kinematics
 308 
 // Uncomment this option to enable CoreXY kinematics
309 
-// #define COREXY
309 
+//#define COREXY
310
310
311 
 // Uncomment this option to enable CoreXZ kinematics
 311 
 // Uncomment this option to enable CoreXZ kinematics
312 
-// #define COREXZ
312 
+//#define COREXZ
313
313
314 
 //===========================================================================
 314 
 //===========================================================================
315 
 //============================== Delta Settings =============================
 315 
 //============================== Delta Settings =============================
356
356
357 
 #if DISABLED(ENDSTOPPULLUPS)
 357 
 #if DISABLED(ENDSTOPPULLUPS)
358 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 358 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
359 
-  // #define ENDSTOPPULLUP_XMAX
360 
-  // #define ENDSTOPPULLUP_YMAX
361 
-  // #define ENDSTOPPULLUP_ZMAX
362 
-  // #define ENDSTOPPULLUP_XMIN
363 
-  // #define ENDSTOPPULLUP_YMIN
364 
-  // #define ENDSTOPPULLUP_ZMIN
365 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
359 
+  //#define ENDSTOPPULLUP_XMAX
360 
+  //#define ENDSTOPPULLUP_YMAX
361 
+  //#define ENDSTOPPULLUP_ZMAX
362 
+  //#define ENDSTOPPULLUP_XMIN
363 
+  //#define ENDSTOPPULLUP_YMIN
364 
+  //#define ENDSTOPPULLUP_ZMIN
365 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
366 
 #endif
 366 
 #endif
367
367
368 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 368 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
454 
 //=========================== Manual Bed Leveling ===========================
 454 
 //=========================== Manual Bed Leveling ===========================
455 
 //===========================================================================
 455 
 //===========================================================================
456
456
457 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
458 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
457 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
458 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
459
459
460 
 #if ENABLED(MANUAL_BED_LEVELING)
 460 
 #if ENABLED(MANUAL_BED_LEVELING)
461 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 461 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
544 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
 544 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
545 
   #define Z_RAISE_AFTER_PROBING 50    // How much the Z axis will be raised after the last probing point.
 545 
   #define Z_RAISE_AFTER_PROBING 50    // How much the Z axis will be raised after the last probing point.
546
546
547 
-//   #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.
547 
+//#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.
548 
                                                                             // Useful to retract a deployable Z probe.
 548 
                                                                             // Useful to retract a deployable Z probe.
549
549
550 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 550 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
852 
 // See http://minow.blogspot.com/index.html#4918805519571907051
 852 
 // See http://minow.blogspot.com/index.html#4918805519571907051
853 
 // If needed, adjust the X, Y, Z calibration coordinates
 853 
 // If needed, adjust the X, Y, Z calibration coordinates
854 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
 854 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
855 
-// #define DELTA_CALIBRATION_MENU
855 
+//#define DELTA_CALIBRATION_MENU
856
856
857 
 /**
 857 
 /**
858 
  * I2C Panels
 858 
  * I2C Panels
906
906
907 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 907 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
908 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 908 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
909 
-// #define PHOTOGRAPH_PIN     23
909 
+//#define PHOTOGRAPH_PIN     23
910
910
911 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 911 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
912 
 //#define SF_ARC_FIX
 912 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
442 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 442 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
443 
 // the moves are than replaced by the firmware controlled ones.
 443 
 // the moves are than replaced by the firmware controlled ones.
444
444
445 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
445 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
446 
 #if ENABLED(FWRETRACT)
 446 
 #if ENABLED(FWRETRACT)
447 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 447 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
448 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 448 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
476 
 //#define HAVE_TMCDRIVER
 476 
 //#define HAVE_TMCDRIVER
477 
 #if ENABLED(HAVE_TMCDRIVER)
 477 
 #if ENABLED(HAVE_TMCDRIVER)
478
478
479 
-//  #define X_IS_TMC
479 
+//#define X_IS_TMC
480 
   #define X_MAX_CURRENT 1000  //in mA
 480 
   #define X_MAX_CURRENT 1000  //in mA
481 
   #define X_SENSE_RESISTOR 91 //in mOhms
 481 
   #define X_SENSE_RESISTOR 91 //in mOhms
482 
   #define X_MICROSTEPS 16     //number of microsteps
 482 
   #define X_MICROSTEPS 16     //number of microsteps
483
483
484 
-//  #define X2_IS_TMC
484 
+//#define X2_IS_TMC
485 
   #define X2_MAX_CURRENT 1000  //in mA
 485 
   #define X2_MAX_CURRENT 1000  //in mA
486 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 486 
   #define X2_SENSE_RESISTOR 91 //in mOhms
487 
   #define X2_MICROSTEPS 16     //number of microsteps
 487 
   #define X2_MICROSTEPS 16     //number of microsteps
488
488
489 
-//  #define Y_IS_TMC
489 
+//#define Y_IS_TMC
490 
   #define Y_MAX_CURRENT 1000  //in mA
 490 
   #define Y_MAX_CURRENT 1000  //in mA
491 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 491 
   #define Y_SENSE_RESISTOR 91 //in mOhms
492 
   #define Y_MICROSTEPS 16     //number of microsteps
 492 
   #define Y_MICROSTEPS 16     //number of microsteps
493
493
494 
-//  #define Y2_IS_TMC
494 
+//#define Y2_IS_TMC
495 
   #define Y2_MAX_CURRENT 1000  //in mA
 495 
   #define Y2_MAX_CURRENT 1000  //in mA
496 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 496 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
497 
   #define Y2_MICROSTEPS 16     //number of microsteps
497 
   #define Y2_MICROSTEPS 16     //number of microsteps
498
498
499 
-//  #define Z_IS_TMC
499 
+//#define Z_IS_TMC
500 
   #define Z_MAX_CURRENT 1000  //in mA
 500 
   #define Z_MAX_CURRENT 1000  //in mA
501 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 501 
   #define Z_SENSE_RESISTOR 91 //in mOhms
502 
   #define Z_MICROSTEPS 16     //number of microsteps
 502 
   #define Z_MICROSTEPS 16     //number of microsteps
503
503
504 
-//  #define Z2_IS_TMC
504 
+//#define Z2_IS_TMC
505 
   #define Z2_MAX_CURRENT 1000  //in mA
 505 
   #define Z2_MAX_CURRENT 1000  //in mA
506 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 506 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
507 
   #define Z2_MICROSTEPS 16     //number of microsteps
 507 
   #define Z2_MICROSTEPS 16     //number of microsteps
508
508
509 
-//  #define E0_IS_TMC
509 
+//#define E0_IS_TMC
510 
   #define E0_MAX_CURRENT 1000  //in mA
 510 
   #define E0_MAX_CURRENT 1000  //in mA
511 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 511 
   #define E0_SENSE_RESISTOR 91 //in mOhms
512 
   #define E0_MICROSTEPS 16     //number of microsteps
 512 
   #define E0_MICROSTEPS 16     //number of microsteps
513
513
514 
-//  #define E1_IS_TMC
514 
+//#define E1_IS_TMC
515 
   #define E1_MAX_CURRENT 1000  //in mA
 515 
   #define E1_MAX_CURRENT 1000  //in mA
516 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 516 
   #define E1_SENSE_RESISTOR 91 //in mOhms
517 
   #define E1_MICROSTEPS 16     //number of microsteps
517 
   #define E1_MICROSTEPS 16     //number of microsteps
518
518
519 
-//  #define E2_IS_TMC
519 
+//#define E2_IS_TMC
520 
   #define E2_MAX_CURRENT 1000  //in mA
 520 
   #define E2_MAX_CURRENT 1000  //in mA
521 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 521 
   #define E2_SENSE_RESISTOR 91 //in mOhms
522 
   #define E2_MICROSTEPS 16     //number of microsteps
522 
   #define E2_MICROSTEPS 16     //number of microsteps
523
523
524 
-//  #define E3_IS_TMC
524 
+//#define E3_IS_TMC
525 
   #define E3_MAX_CURRENT 1000  //in mA
 525 
   #define E3_MAX_CURRENT 1000  //in mA
526 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 526 
   #define E3_SENSE_RESISTOR 91 //in mOhms
527 
   #define E3_MICROSTEPS 16     //number of microsteps
527 
   #define E3_MICROSTEPS 16     //number of microsteps
538 
 //#define HAVE_L6470DRIVER
 538 
 //#define HAVE_L6470DRIVER
539 
 #if ENABLED(HAVE_L6470DRIVER)
 539 
 #if ENABLED(HAVE_L6470DRIVER)
540
540
541 
-//  #define X_IS_L6470
541 
+//#define X_IS_L6470
542 
   #define X_MICROSTEPS 16     //number of microsteps
 542 
   #define X_MICROSTEPS 16     //number of microsteps
543 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 544 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 545 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
546
547 
-//  #define X2_IS_L6470
547 
+//#define X2_IS_L6470
548 
   #define X2_MICROSTEPS 16     //number of microsteps
 548 
   #define X2_MICROSTEPS 16     //number of microsteps
549 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 550 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 551 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
552
553 
-//  #define Y_IS_L6470
553 
+//#define Y_IS_L6470
554 
   #define Y_MICROSTEPS 16     //number of microsteps
 554 
   #define Y_MICROSTEPS 16     //number of microsteps
555 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 556 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 557 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
558
559 
-//  #define Y2_IS_L6470
559 
+//#define Y2_IS_L6470
560 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_MICROSTEPS 16     //number of microsteps
561 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 562 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
564
565 
-//  #define Z_IS_L6470
565 
+//#define Z_IS_L6470
566 
   #define Z_MICROSTEPS 16     //number of microsteps
 566 
   #define Z_MICROSTEPS 16     //number of microsteps
567 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 568 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 569 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
570
571 
-//  #define Z2_IS_L6470
571 
+//#define Z2_IS_L6470
572 
   #define Z2_MICROSTEPS 16     //number of microsteps
 572 
   #define Z2_MICROSTEPS 16     //number of microsteps
573 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 574 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 575 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
576
577 
-//  #define E0_IS_L6470
577 
+//#define E0_IS_L6470
578 
   #define E0_MICROSTEPS 16     //number of microsteps
 578 
   #define E0_MICROSTEPS 16     //number of microsteps
579 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 580 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 581 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
582
583 
-//  #define E1_IS_L6470
583 
+//#define E1_IS_L6470
584 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_MICROSTEPS 16     //number of microsteps
 585 
   #define E1_MICROSTEPS 16     //number of microsteps
586 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 587 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 588 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
589
590 
-//  #define E2_IS_L6470
590 
+//#define E2_IS_L6470
591 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_MICROSTEPS 16     //number of microsteps
 592 
   #define E2_MICROSTEPS 16     //number of microsteps
593 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 594 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
595 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 595 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
596
596
597 
-//  #define E3_IS_L6470
597 
+//#define E3_IS_L6470
598 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_MICROSTEPS 16     //number of microsteps
 599 
   #define E3_MICROSTEPS 16     //number of microsteps
600 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 17
- 17
Marlin/example_configurations/delta/kossel_pro/Configuration.h 查看文件

83
83
84 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 84 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
85 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 85 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
86 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
86 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
87
87
88 
 // This defines the number of extruders
 88 
 // This defines the number of extruders
89 
 // :[1,2,3,4]
 89 
 // :[1,2,3,4]
146 
 // 110 is Pt100 with 1k pullup (non standard)
 146 
 // 110 is Pt100 with 1k pullup (non standard)
147 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 147 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
148 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 148 
 //     Use it for Testing or Development purposes. NEVER for production machine.
149 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
150 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
149 
+//#define DUMMY_THERMISTOR_998_VALUE 25
150 
+//#define DUMMY_THERMISTOR_999_VALUE 100
151 
 // :{ '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" }
 151 
 // :{ '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" }
152 
 #define TEMP_SENSOR_0 5
 152 
 #define TEMP_SENSOR_0 5
153 
 #define TEMP_SENSOR_1 0
 153 
 #define TEMP_SENSOR_1 0
293 
 // @section machine
 293 
 // @section machine
294
294
295 
 // Uncomment this option to enable CoreXY kinematics
 295 
 // Uncomment this option to enable CoreXY kinematics
296 
-// #define COREXY
296 
+//#define COREXY
297
297
298 
 // Uncomment this option to enable CoreXZ kinematics
 298 
 // Uncomment this option to enable CoreXZ kinematics
299 
-// #define COREXZ
299 
+//#define COREXZ
300
300
301 
 //===========================================================================
 301 
 //===========================================================================
302 
 //============================== Delta Settings =============================
 302 
 //============================== Delta Settings =============================
343
343
344 
 #if DISABLED(ENDSTOPPULLUPS)
 344 
 #if DISABLED(ENDSTOPPULLUPS)
345 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 345 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
346 
-  // #define ENDSTOPPULLUP_XMAX
347 
-  // #define ENDSTOPPULLUP_YMAX
348 
-  // #define ENDSTOPPULLUP_ZMAX
349 
-  // #define ENDSTOPPULLUP_XMIN
350 
-  // #define ENDSTOPPULLUP_YMIN
351 
-  // #define ENDSTOPPULLUP_ZMIN
352 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
346 
+  //#define ENDSTOPPULLUP_XMAX
347 
+  //#define ENDSTOPPULLUP_YMAX
348 
+  //#define ENDSTOPPULLUP_ZMAX
349 
+  //#define ENDSTOPPULLUP_XMIN
350 
+  //#define ENDSTOPPULLUP_YMIN
351 
+  //#define ENDSTOPPULLUP_ZMIN
352 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
353 
 #endif
 353 
 #endif
354
354
355 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 355 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
441 
 //=========================== Manual Bed Leveling ===========================
 441 
 //=========================== Manual Bed Leveling ===========================
442 
 //===========================================================================
 442 
 //===========================================================================
443
443
444 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
445 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
444 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
445 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
446
446
447 
 #if ENABLED(MANUAL_BED_LEVELING)
 447 
 #if ENABLED(MANUAL_BED_LEVELING)
448 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 448 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
533 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 533 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
534 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 534 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
535
535
536 
-//   #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.
536 
+//#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.
537 
                                                                             // Useful to retract a deployable Z probe.
 537 
                                                                             // Useful to retract a deployable Z probe.
538
538
539 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 539 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
843 
 // See http://minow.blogspot.com/index.html#4918805519571907051
 843 
 // See http://minow.blogspot.com/index.html#4918805519571907051
844 
 // If needed, adjust the X, Y, Z calibration coordinates
 844 
 // If needed, adjust the X, Y, Z calibration coordinates
845 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
 845 
 // in ultralcd.cpp@lcd_delta_calibrate_menu()
846 
-// #define DELTA_CALIBRATION_MENU
846 
+//#define DELTA_CALIBRATION_MENU
847
847
848 
 /**
 848 
 /**
849 
  * I2C Panels
 849 
  * I2C Panels
897
897
898 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 898 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
899 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 899 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
900 
-// #define PHOTOGRAPH_PIN     23
900 
+//#define PHOTOGRAPH_PIN     23
901
901
902 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 902 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
903 
 //#define SF_ARC_FIX
 903 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h 查看文件

157 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 157 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
158 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 158 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
159
159
160 
-  // #define Z_DUAL_ENDSTOPS
160 
+  //#define Z_DUAL_ENDSTOPS
161
161
162 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 162 
   #if ENABLED(Z_DUAL_ENDSTOPS)
163 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 163 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
229 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 229 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
230
230
231 
 // When G28 is called, this option will make Y home before X
 231 
 // When G28 is called, this option will make Y home before X
232 
-// #define HOME_Y_BEFORE_X
232 
+//#define HOME_Y_BEFORE_X
233
233
234 
 // @section machine
 234 
 // @section machine
235
235
446 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 446 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
447 
 // the moves are than replaced by the firmware controlled ones.
 447 
 // the moves are than replaced by the firmware controlled ones.
448
448
449 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
449 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
450 
 #if ENABLED(FWRETRACT)
 450 
 #if ENABLED(FWRETRACT)
451 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 451 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
452 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 452 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
480 
 //#define HAVE_TMCDRIVER
 480 
 //#define HAVE_TMCDRIVER
481 
 #if ENABLED(HAVE_TMCDRIVER)
 481 
 #if ENABLED(HAVE_TMCDRIVER)
482
482
483 
-//  #define X_IS_TMC
483 
+//#define X_IS_TMC
484 
   #define X_MAX_CURRENT 1000  //in mA
 484 
   #define X_MAX_CURRENT 1000  //in mA
485 
   #define X_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X_SENSE_RESISTOR 91 //in mOhms
486 
   #define X_MICROSTEPS 16     //number of microsteps
 486 
   #define X_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define X2_IS_TMC
488 
+//#define X2_IS_TMC
489 
   #define X2_MAX_CURRENT 1000  //in mA
 489 
   #define X2_MAX_CURRENT 1000  //in mA
490 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 490 
   #define X2_SENSE_RESISTOR 91 //in mOhms
491 
   #define X2_MICROSTEPS 16     //number of microsteps
 491 
   #define X2_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y_IS_TMC
493 
+//#define Y_IS_TMC
494 
   #define Y_MAX_CURRENT 1000  //in mA
 494 
   #define Y_MAX_CURRENT 1000  //in mA
495 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y_MICROSTEPS 16     //number of microsteps
 496 
   #define Y_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Y2_IS_TMC
498 
+//#define Y2_IS_TMC
499 
   #define Y2_MAX_CURRENT 1000  //in mA
 499 
   #define Y2_MAX_CURRENT 1000  //in mA
500 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
501 
   #define Y2_MICROSTEPS 16     //number of microsteps
501 
   #define Y2_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z_IS_TMC
503 
+//#define Z_IS_TMC
504 
   #define Z_MAX_CURRENT 1000  //in mA
 504 
   #define Z_MAX_CURRENT 1000  //in mA
505 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z_MICROSTEPS 16     //number of microsteps
 506 
   #define Z_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define Z2_IS_TMC
508 
+//#define Z2_IS_TMC
509 
   #define Z2_MAX_CURRENT 1000  //in mA
 509 
   #define Z2_MAX_CURRENT 1000  //in mA
510 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 510 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
511 
   #define Z2_MICROSTEPS 16     //number of microsteps
 511 
   #define Z2_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E0_IS_TMC
513 
+//#define E0_IS_TMC
514 
   #define E0_MAX_CURRENT 1000  //in mA
 514 
   #define E0_MAX_CURRENT 1000  //in mA
515 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E0_SENSE_RESISTOR 91 //in mOhms
516 
   #define E0_MICROSTEPS 16     //number of microsteps
 516 
   #define E0_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E1_IS_TMC
518 
+//#define E1_IS_TMC
519 
   #define E1_MAX_CURRENT 1000  //in mA
 519 
   #define E1_MAX_CURRENT 1000  //in mA
520 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E1_SENSE_RESISTOR 91 //in mOhms
521 
   #define E1_MICROSTEPS 16     //number of microsteps
521 
   #define E1_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E2_IS_TMC
523 
+//#define E2_IS_TMC
524 
   #define E2_MAX_CURRENT 1000  //in mA
 524 
   #define E2_MAX_CURRENT 1000  //in mA
525 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E2_SENSE_RESISTOR 91 //in mOhms
526 
   #define E2_MICROSTEPS 16     //number of microsteps
526 
   #define E2_MICROSTEPS 16     //number of microsteps
527
527
528 
-//  #define E3_IS_TMC
528 
+//#define E3_IS_TMC
529 
   #define E3_MAX_CURRENT 1000  //in mA
 529 
   #define E3_MAX_CURRENT 1000  //in mA
530 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 530 
   #define E3_SENSE_RESISTOR 91 //in mOhms
531 
   #define E3_MICROSTEPS 16     //number of microsteps
531 
   #define E3_MICROSTEPS 16     //number of microsteps
542 
 //#define HAVE_L6470DRIVER
 542 
 //#define HAVE_L6470DRIVER
543 
 #if ENABLED(HAVE_L6470DRIVER)
 543 
 #if ENABLED(HAVE_L6470DRIVER)
544
544
545 
-//  #define X_IS_L6470
545 
+//#define X_IS_L6470
546 
   #define X_MICROSTEPS 16     //number of microsteps
 546 
   #define X_MICROSTEPS 16     //number of microsteps
547 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
547 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 548 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 549 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
550
551 
-//  #define X2_IS_L6470
551 
+//#define X2_IS_L6470
552 
   #define X2_MICROSTEPS 16     //number of microsteps
 552 
   #define X2_MICROSTEPS 16     //number of microsteps
553 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
553 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 554 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 555 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
556
557 
-//  #define Y_IS_L6470
557 
+//#define Y_IS_L6470
558 
   #define Y_MICROSTEPS 16     //number of microsteps
 558 
   #define Y_MICROSTEPS 16     //number of microsteps
559 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
559 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 560 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 561 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
562
563 
-//  #define Y2_IS_L6470
563 
+//#define Y2_IS_L6470
564 
   #define Y2_MICROSTEPS 16     //number of microsteps
564 
   #define Y2_MICROSTEPS 16     //number of microsteps
565 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
565 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 566 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
567 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
568
569 
-//  #define Z_IS_L6470
569 
+//#define Z_IS_L6470
570 
   #define Z_MICROSTEPS 16     //number of microsteps
 570 
   #define Z_MICROSTEPS 16     //number of microsteps
571 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
571 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 572 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 573 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
574
575 
-//  #define Z2_IS_L6470
575 
+//#define Z2_IS_L6470
576 
   #define Z2_MICROSTEPS 16     //number of microsteps
 576 
   #define Z2_MICROSTEPS 16     //number of microsteps
577 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
577 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 578 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 579 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
580
581 
-//  #define E0_IS_L6470
581 
+//#define E0_IS_L6470
582 
   #define E0_MICROSTEPS 16     //number of microsteps
 582 
   #define E0_MICROSTEPS 16     //number of microsteps
583 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
583 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
584 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 584 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 585 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
586
587 
-//  #define E1_IS_L6470
587 
+//#define E1_IS_L6470
588 
   #define E1_MICROSTEPS 16     //number of microsteps
588 
   #define E1_MICROSTEPS 16     //number of microsteps
589 
   #define E1_MICROSTEPS 16     //number of microsteps
 589 
   #define E1_MICROSTEPS 16     //number of microsteps
590 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
590 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
591 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 591 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 592 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
593
594 
-//  #define E2_IS_L6470
594 
+//#define E2_IS_L6470
595 
   #define E2_MICROSTEPS 16     //number of microsteps
595 
   #define E2_MICROSTEPS 16     //number of microsteps
596 
   #define E2_MICROSTEPS 16     //number of microsteps
 596 
   #define E2_MICROSTEPS 16     //number of microsteps
597 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
597 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
598 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 598 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
599 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 599 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
600
600
601 
-//  #define E3_IS_L6470
601 
+//#define E3_IS_L6470
602 
   #define E3_MICROSTEPS 16     //number of microsteps
602 
   #define E3_MICROSTEPS 16     //number of microsteps
603 
   #define E3_MICROSTEPS 16     //number of microsteps
 603 
   #define E3_MICROSTEPS 16     //number of microsteps
604 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
604 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 18
- 18
Marlin/example_configurations/makibox/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 1
 148 
 #define TEMP_SENSOR_0 1
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
309 
 // @section machine
 309 
 // @section machine
310
310
311 
 // Uncomment this option to enable CoreXY kinematics
 311 
 // Uncomment this option to enable CoreXY kinematics
312 
-// #define COREXY
312 
+//#define COREXY
313
313
314 
 // Uncomment this option to enable CoreXZ kinematics
 314 
 // Uncomment this option to enable CoreXZ kinematics
315 
-// #define COREXZ
315 
+//#define COREXZ
316
316
317 
 // Enable this option for Toshiba steppers
 317 
 // Enable this option for Toshiba steppers
318 
 //#define CONFIG_STEPPERS_TOSHIBA
 318 
 //#define CONFIG_STEPPERS_TOSHIBA
324
324
325 
 #if DISABLED(ENDSTOPPULLUPS)
 325 
 #if DISABLED(ENDSTOPPULLUPS)
326 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 326 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
327 
-  // #define ENDSTOPPULLUP_XMAX
328 
-  // #define ENDSTOPPULLUP_YMAX
329 
-  // #define ENDSTOPPULLUP_ZMAX
330 
-  // #define ENDSTOPPULLUP_XMIN
331 
-  // #define ENDSTOPPULLUP_YMIN
332 
-  // #define ENDSTOPPULLUP_ZMIN
333 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
327 
+  //#define ENDSTOPPULLUP_XMAX
328 
+  //#define ENDSTOPPULLUP_YMAX
329 
+  //#define ENDSTOPPULLUP_ZMAX
330 
+  //#define ENDSTOPPULLUP_XMIN
331 
+  //#define ENDSTOPPULLUP_YMIN
332 
+  //#define ENDSTOPPULLUP_ZMIN
333 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
334 
 #endif
 334 
 #endif
335
335
336 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 336 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
422 
 //=========================== Manual Bed Leveling ===========================
 422 
 //=========================== Manual Bed Leveling ===========================
423 
 //===========================================================================
 423 
 //===========================================================================
424
424
425 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
426 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
425 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
426 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
427
427
428 
 #if ENABLED(MANUAL_BED_LEVELING)
 428 
 #if ENABLED(MANUAL_BED_LEVELING)
429 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 429 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
507 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 507 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
508 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 508 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
509
509
510 
-//   #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.
510 
+//#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.
511 
                                                                             // Useful to retract a deployable Z probe.
 511 
                                                                             // Useful to retract a deployable Z probe.
512
512
513 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 513 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
725
725
726 
 // The MakerLab Mini Panel with graphic controller and SD support
 726 
 // The MakerLab Mini Panel with graphic controller and SD support
727 
 // http://reprap.org/wiki/Mini_panel
 727 
 // http://reprap.org/wiki/Mini_panel
728 
-// #define MINIPANEL
728 
+//#define MINIPANEL
729
729
730 
 /**
 730 
 /**
731 
  * I2C Panels
 731 
  * I2C Panels
779
779
780 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 780 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
781 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 781 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
782 
-// #define PHOTOGRAPH_PIN     23
782 
+//#define PHOTOGRAPH_PIN     23
783
783
784 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 784 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
785 
 //#define SF_ARC_FIX
 785 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/makibox/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
440 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 440 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
441 
 // the moves are than replaced by the firmware controlled ones.
 441 
 // the moves are than replaced by the firmware controlled ones.
442
442
443 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
443 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
444 
 #if ENABLED(FWRETRACT)
 444 
 #if ENABLED(FWRETRACT)
445 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 445 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
446 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 446 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
474 
 //#define HAVE_TMCDRIVER
 474 
 //#define HAVE_TMCDRIVER
475 
 #if ENABLED(HAVE_TMCDRIVER)
 475 
 #if ENABLED(HAVE_TMCDRIVER)
476
476
477 
-//  #define X_IS_TMC
477 
+//#define X_IS_TMC
478 
   #define X_MAX_CURRENT 1000  //in mA
 478 
   #define X_MAX_CURRENT 1000  //in mA
479 
   #define X_SENSE_RESISTOR 91 //in mOhms
 479 
   #define X_SENSE_RESISTOR 91 //in mOhms
480 
   #define X_MICROSTEPS 16     //number of microsteps
 480 
   #define X_MICROSTEPS 16     //number of microsteps
481
481
482 
-//  #define X2_IS_TMC
482 
+//#define X2_IS_TMC
483 
   #define X2_MAX_CURRENT 1000  //in mA
 483 
   #define X2_MAX_CURRENT 1000  //in mA
484 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 484 
   #define X2_SENSE_RESISTOR 91 //in mOhms
485 
   #define X2_MICROSTEPS 16     //number of microsteps
 485 
   #define X2_MICROSTEPS 16     //number of microsteps
486
486
487 
-//  #define Y_IS_TMC
487 
+//#define Y_IS_TMC
488 
   #define Y_MAX_CURRENT 1000  //in mA
 488 
   #define Y_MAX_CURRENT 1000  //in mA
489 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 489 
   #define Y_SENSE_RESISTOR 91 //in mOhms
490 
   #define Y_MICROSTEPS 16     //number of microsteps
 490 
   #define Y_MICROSTEPS 16     //number of microsteps
491
491
492 
-//  #define Y2_IS_TMC
492 
+//#define Y2_IS_TMC
493 
   #define Y2_MAX_CURRENT 1000  //in mA
 493 
   #define Y2_MAX_CURRENT 1000  //in mA
494 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 494 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495 
   #define Y2_MICROSTEPS 16     //number of microsteps
495 
   #define Y2_MICROSTEPS 16     //number of microsteps
496
496
497 
-//  #define Z_IS_TMC
497 
+//#define Z_IS_TMC
498 
   #define Z_MAX_CURRENT 1000  //in mA
 498 
   #define Z_MAX_CURRENT 1000  //in mA
499 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 499 
   #define Z_SENSE_RESISTOR 91 //in mOhms
500 
   #define Z_MICROSTEPS 16     //number of microsteps
 500 
   #define Z_MICROSTEPS 16     //number of microsteps
501
501
502 
-//  #define Z2_IS_TMC
502 
+//#define Z2_IS_TMC
503 
   #define Z2_MAX_CURRENT 1000  //in mA
 503 
   #define Z2_MAX_CURRENT 1000  //in mA
504 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 504 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505 
   #define Z2_MICROSTEPS 16     //number of microsteps
 505 
   #define Z2_MICROSTEPS 16     //number of microsteps
506
506
507 
-//  #define E0_IS_TMC
507 
+//#define E0_IS_TMC
508 
   #define E0_MAX_CURRENT 1000  //in mA
 508 
   #define E0_MAX_CURRENT 1000  //in mA
509 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 509 
   #define E0_SENSE_RESISTOR 91 //in mOhms
510 
   #define E0_MICROSTEPS 16     //number of microsteps
 510 
   #define E0_MICROSTEPS 16     //number of microsteps
511
511
512 
-//  #define E1_IS_TMC
512 
+//#define E1_IS_TMC
513 
   #define E1_MAX_CURRENT 1000  //in mA
 513 
   #define E1_MAX_CURRENT 1000  //in mA
514 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 514 
   #define E1_SENSE_RESISTOR 91 //in mOhms
515 
   #define E1_MICROSTEPS 16     //number of microsteps
515 
   #define E1_MICROSTEPS 16     //number of microsteps
516
516
517 
-//  #define E2_IS_TMC
517 
+//#define E2_IS_TMC
518 
   #define E2_MAX_CURRENT 1000  //in mA
 518 
   #define E2_MAX_CURRENT 1000  //in mA
519 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 519 
   #define E2_SENSE_RESISTOR 91 //in mOhms
520 
   #define E2_MICROSTEPS 16     //number of microsteps
520 
   #define E2_MICROSTEPS 16     //number of microsteps
521
521
522 
-//  #define E3_IS_TMC
522 
+//#define E3_IS_TMC
523 
   #define E3_MAX_CURRENT 1000  //in mA
 523 
   #define E3_MAX_CURRENT 1000  //in mA
524 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 524 
   #define E3_SENSE_RESISTOR 91 //in mOhms
525 
   #define E3_MICROSTEPS 16     //number of microsteps
525 
   #define E3_MICROSTEPS 16     //number of microsteps
536 
 //#define HAVE_L6470DRIVER
 536 
 //#define HAVE_L6470DRIVER
537 
 #if ENABLED(HAVE_L6470DRIVER)
 537 
 #if ENABLED(HAVE_L6470DRIVER)
538
538
539 
-//  #define X_IS_L6470
539 
+//#define X_IS_L6470
540 
   #define X_MICROSTEPS 16     //number of microsteps
 540 
   #define X_MICROSTEPS 16     //number of microsteps
541 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
541 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 542 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 543 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
544
545 
-//  #define X2_IS_L6470
545 
+//#define X2_IS_L6470
546 
   #define X2_MICROSTEPS 16     //number of microsteps
 546 
   #define X2_MICROSTEPS 16     //number of microsteps
547 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
547 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 548 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 549 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
550
551 
-//  #define Y_IS_L6470
551 
+//#define Y_IS_L6470
552 
   #define Y_MICROSTEPS 16     //number of microsteps
 552 
   #define Y_MICROSTEPS 16     //number of microsteps
553 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
553 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 554 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 555 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
556
557 
-//  #define Y2_IS_L6470
557 
+//#define Y2_IS_L6470
558 
   #define Y2_MICROSTEPS 16     //number of microsteps
558 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
559 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 560 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
561 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
562
563 
-//  #define Z_IS_L6470
563 
+//#define Z_IS_L6470
564 
   #define Z_MICROSTEPS 16     //number of microsteps
 564 
   #define Z_MICROSTEPS 16     //number of microsteps
565 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
565 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 566 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 567 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
568
569 
-//  #define Z2_IS_L6470
569 
+//#define Z2_IS_L6470
570 
   #define Z2_MICROSTEPS 16     //number of microsteps
 570 
   #define Z2_MICROSTEPS 16     //number of microsteps
571 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
571 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 572 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 573 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
574
575 
-//  #define E0_IS_L6470
575 
+//#define E0_IS_L6470
576 
   #define E0_MICROSTEPS 16     //number of microsteps
 576 
   #define E0_MICROSTEPS 16     //number of microsteps
577 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
577 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 578 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 579 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
580
581 
-//  #define E1_IS_L6470
581 
+//#define E1_IS_L6470
582 
   #define E1_MICROSTEPS 16     //number of microsteps
582 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
 583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
584 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 585 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 586 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
587
588 
-//  #define E2_IS_L6470
588 
+//#define E2_IS_L6470
589 
   #define E2_MICROSTEPS 16     //number of microsteps
589 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
 590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
591 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 592 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
593 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 593 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
594
594
595 
-//  #define E3_IS_L6470
595 
+//#define E3_IS_L6470
596 
   #define E3_MICROSTEPS 16     //number of microsteps
596 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
 597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
598 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 18
- 18
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

75
75
76 
 // Optional custom name for your RepStrap or other custom machine
 76 
 // Optional custom name for your RepStrap or other custom machine
77 
 // Displayed in the LCD "Ready" message
 77 
 // Displayed in the LCD "Ready" message
78 
-// #define CUSTOM_MACHINE_NAME "3D Printer"
78 
+//#define CUSTOM_MACHINE_NAME "3D Printer"
79
79
80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 80 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 81 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
82 
-// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
82 
+//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
83
83
84 
 // This defines the number of extruders
 84 
 // This defines the number of extruders
85 
 // :[1,2,3,4]
 85 
 // :[1,2,3,4]
142 
 // 110 is Pt100 with 1k pullup (non standard)
 142 
 // 110 is Pt100 with 1k pullup (non standard)
143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
 143 
 // 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
 144 
 //     Use it for Testing or Development purposes. NEVER for production machine.
145 
-//     #define DUMMY_THERMISTOR_998_VALUE 25
146 
-//     #define DUMMY_THERMISTOR_999_VALUE 100
145 
+//#define DUMMY_THERMISTOR_998_VALUE 25
146 
+//#define DUMMY_THERMISTOR_999_VALUE 100
147 
 // :{ '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" }
 147 
 // :{ '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" }
148 
 #define TEMP_SENSOR_0 5
 148 
 #define TEMP_SENSOR_0 5
149 
 #define TEMP_SENSOR_1 0
 149 
 #define TEMP_SENSOR_1 0
296 
 // @section machine
 296 
 // @section machine
297
297
298 
 // Uncomment this option to enable CoreXY kinematics
 298 
 // Uncomment this option to enable CoreXY kinematics
299 
-// #define COREXY
299 
+//#define COREXY
300
300
301 
 // Uncomment this option to enable CoreXZ kinematics
 301 
 // Uncomment this option to enable CoreXZ kinematics
302 
-// #define COREXZ
302 
+//#define COREXZ
303
303
304 
 // Enable this option for Toshiba steppers
 304 
 // Enable this option for Toshiba steppers
305 
 #define CONFIG_STEPPERS_TOSHIBA
 305 
 #define CONFIG_STEPPERS_TOSHIBA
311
311
312 
 #if DISABLED(ENDSTOPPULLUPS)
 312 
 #if DISABLED(ENDSTOPPULLUPS)
313 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
 313 
   // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
314 
-  // #define ENDSTOPPULLUP_XMAX
315 
-  // #define ENDSTOPPULLUP_YMAX
316 
-  // #define ENDSTOPPULLUP_ZMAX
317 
-  // #define ENDSTOPPULLUP_XMIN
318 
-  // #define ENDSTOPPULLUP_YMIN
319 
-  // #define ENDSTOPPULLUP_ZMIN
320 
-  // #define ENDSTOPPULLUP_ZMIN_PROBE
314 
+  //#define ENDSTOPPULLUP_XMAX
315 
+  //#define ENDSTOPPULLUP_YMAX
316 
+  //#define ENDSTOPPULLUP_ZMAX
317 
+  //#define ENDSTOPPULLUP_XMIN
318 
+  //#define ENDSTOPPULLUP_YMIN
319 
+  //#define ENDSTOPPULLUP_ZMIN
320 
+  //#define ENDSTOPPULLUP_ZMIN_PROBE
321 
 #endif
 321 
 #endif
322
322
323 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
 323 
 // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
409 
 //=========================== Manual Bed Leveling ===========================
 409 
 //=========================== Manual Bed Leveling ===========================
410 
 //===========================================================================
 410 
 //===========================================================================
411
411
412 
-// #define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
413 
-// #define MESH_BED_LEVELING    // Enable mesh bed leveling.
412 
+//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
413 
+//#define MESH_BED_LEVELING    // Enable mesh bed leveling.
414
414
415 
 #if ENABLED(MANUAL_BED_LEVELING)
 415 
 #if ENABLED(MANUAL_BED_LEVELING)
416 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
 416 
   #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
495 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
 495 
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
496 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
 496 
   #define Z_RAISE_AFTER_PROBING 15    // How much the Z axis will be raised after the last probing point.
497
497
498 
-//   #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.
498 
+//#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.
499 
                                                                             // Useful to retract a deployable Z probe.
 499 
                                                                             // Useful to retract a deployable Z probe.
500
500
501 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
 501 
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
717
717
718 
 // The MakerLab Mini Panel with graphic controller and SD support
 718 
 // The MakerLab Mini Panel with graphic controller and SD support
719 
 // http://reprap.org/wiki/Mini_panel
 719 
 // http://reprap.org/wiki/Mini_panel
720 
-// #define MINIPANEL
720 
+//#define MINIPANEL
721
721
722 
 /**
 722 
 /**
723 
  * I2C Panels
 723 
  * I2C Panels
771
771
772 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
 772 
 // M240  Triggers a camera by emulating a Canon RC-1 Remote
773 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
 773 
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
774 
-// #define PHOTOGRAPH_PIN     23
774 
+//#define PHOTOGRAPH_PIN     23
775
775
776 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
 776 
 // SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
777 
 //#define SF_ARC_FIX
 777 
 //#define SF_ARC_FIX

+ 23
- 23
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h 查看文件

153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
 153 
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
 154 
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
155
155
156 
-  // #define Z_DUAL_ENDSTOPS
156 
+  //#define Z_DUAL_ENDSTOPS
157
157
158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 158 
   #if ENABLED(Z_DUAL_ENDSTOPS)
159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
 159 
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 225 
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
226
226
227 
 // When G28 is called, this option will make Y home before X
 227 
 // When G28 is called, this option will make Y home before X
228 
-// #define HOME_Y_BEFORE_X
228 
+//#define HOME_Y_BEFORE_X
229
229
230 
 // @section machine
 230 
 // @section machine
231
231
441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
 441 
 // until then, intended retractions can be detected by moves that only extrude and the direction.
442 
 // the moves are than replaced by the firmware controlled ones.
 442 
 // the moves are than replaced by the firmware controlled ones.
443
443
444 
-// #define FWRETRACT  //ONLY PARTIALLY TESTED
444 
+//#define FWRETRACT  //ONLY PARTIALLY TESTED
445 
 #if ENABLED(FWRETRACT)
 445 
 #if ENABLED(FWRETRACT)
446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
 446 
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
 447 
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
475 
 //#define HAVE_TMCDRIVER
 475 
 //#define HAVE_TMCDRIVER
476 
 #if ENABLED(HAVE_TMCDRIVER)
 476 
 #if ENABLED(HAVE_TMCDRIVER)
477
477
478 
-//  #define X_IS_TMC
478 
+//#define X_IS_TMC
479 
   #define X_MAX_CURRENT 1000  //in mA
 479 
   #define X_MAX_CURRENT 1000  //in mA
480 
   #define X_SENSE_RESISTOR 91 //in mOhms
 480 
   #define X_SENSE_RESISTOR 91 //in mOhms
481 
   #define X_MICROSTEPS 16     //number of microsteps
 481 
   #define X_MICROSTEPS 16     //number of microsteps
482
482
483 
-//  #define X2_IS_TMC
483 
+//#define X2_IS_TMC
484 
   #define X2_MAX_CURRENT 1000  //in mA
 484 
   #define X2_MAX_CURRENT 1000  //in mA
485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
 485 
   #define X2_SENSE_RESISTOR 91 //in mOhms
486 
   #define X2_MICROSTEPS 16     //number of microsteps
 486 
   #define X2_MICROSTEPS 16     //number of microsteps
487
487
488 
-//  #define Y_IS_TMC
488 
+//#define Y_IS_TMC
489 
   #define Y_MAX_CURRENT 1000  //in mA
 489 
   #define Y_MAX_CURRENT 1000  //in mA
490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
 490 
   #define Y_SENSE_RESISTOR 91 //in mOhms
491 
   #define Y_MICROSTEPS 16     //number of microsteps
 491 
   #define Y_MICROSTEPS 16     //number of microsteps
492
492
493 
-//  #define Y2_IS_TMC
493 
+//#define Y2_IS_TMC
494 
   #define Y2_MAX_CURRENT 1000  //in mA
 494 
   #define Y2_MAX_CURRENT 1000  //in mA
495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
 495 
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
496 
   #define Y2_MICROSTEPS 16     //number of microsteps
497
497
498 
-//  #define Z_IS_TMC
498 
+//#define Z_IS_TMC
499 
   #define Z_MAX_CURRENT 1000  //in mA
 499 
   #define Z_MAX_CURRENT 1000  //in mA
500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
 500 
   #define Z_SENSE_RESISTOR 91 //in mOhms
501 
   #define Z_MICROSTEPS 16     //number of microsteps
 501 
   #define Z_MICROSTEPS 16     //number of microsteps
502
502
503 
-//  #define Z2_IS_TMC
503 
+//#define Z2_IS_TMC
504 
   #define Z2_MAX_CURRENT 1000  //in mA
 504 
   #define Z2_MAX_CURRENT 1000  //in mA
505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
 505 
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506 
   #define Z2_MICROSTEPS 16     //number of microsteps
 506 
   #define Z2_MICROSTEPS 16     //number of microsteps
507
507
508 
-//  #define E0_IS_TMC
508 
+//#define E0_IS_TMC
509 
   #define E0_MAX_CURRENT 1000  //in mA
 509 
   #define E0_MAX_CURRENT 1000  //in mA
510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
 510 
   #define E0_SENSE_RESISTOR 91 //in mOhms
511 
   #define E0_MICROSTEPS 16     //number of microsteps
 511 
   #define E0_MICROSTEPS 16     //number of microsteps
512
512
513 
-//  #define E1_IS_TMC
513 
+//#define E1_IS_TMC
514 
   #define E1_MAX_CURRENT 1000  //in mA
 514 
   #define E1_MAX_CURRENT 1000  //in mA
515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
 515 
   #define E1_SENSE_RESISTOR 91 //in mOhms
516 
   #define E1_MICROSTEPS 16     //number of microsteps
516 
   #define E1_MICROSTEPS 16     //number of microsteps
517
517
518 
-//  #define E2_IS_TMC
518 
+//#define E2_IS_TMC
519 
   #define E2_MAX_CURRENT 1000  //in mA
 519 
   #define E2_MAX_CURRENT 1000  //in mA
520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
 520 
   #define E2_SENSE_RESISTOR 91 //in mOhms
521 
   #define E2_MICROSTEPS 16     //number of microsteps
521 
   #define E2_MICROSTEPS 16     //number of microsteps
522
522
523 
-//  #define E3_IS_TMC
523 
+//#define E3_IS_TMC
524 
   #define E3_MAX_CURRENT 1000  //in mA
 524 
   #define E3_MAX_CURRENT 1000  //in mA
525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
 525 
   #define E3_SENSE_RESISTOR 91 //in mOhms
526 
   #define E3_MICROSTEPS 16     //number of microsteps
526 
   #define E3_MICROSTEPS 16     //number of microsteps
537 
 //#define HAVE_L6470DRIVER
 537 
 //#define HAVE_L6470DRIVER
538 
 #if ENABLED(HAVE_L6470DRIVER)
 538 
 #if ENABLED(HAVE_L6470DRIVER)
539
539
540 
-//  #define X_IS_L6470
540 
+//#define X_IS_L6470
541 
   #define X_MICROSTEPS 16     //number of microsteps
 541 
   #define X_MICROSTEPS 16     //number of microsteps
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542 
   #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 543 
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 544 
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
545
546 
-//  #define X2_IS_L6470
546 
+//#define X2_IS_L6470
547 
   #define X2_MICROSTEPS 16     //number of microsteps
 547 
   #define X2_MICROSTEPS 16     //number of microsteps
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548 
   #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 549 
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 550 
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
551
552 
-//  #define Y_IS_L6470
552 
+//#define Y_IS_L6470
553 
   #define Y_MICROSTEPS 16     //number of microsteps
 553 
   #define Y_MICROSTEPS 16     //number of microsteps
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554 
   #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 555 
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 556 
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
557
558 
-//  #define Y2_IS_L6470
558 
+//#define Y2_IS_L6470
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
559 
   #define Y2_MICROSTEPS 16     //number of microsteps
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560 
   #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 561 
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562 
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
563
564 
-//  #define Z_IS_L6470
564 
+//#define Z_IS_L6470
565 
   #define Z_MICROSTEPS 16     //number of microsteps
 565 
   #define Z_MICROSTEPS 16     //number of microsteps
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566 
   #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 567 
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 568 
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
569
570 
-//  #define Z2_IS_L6470
570 
+//#define Z2_IS_L6470
571 
   #define Z2_MICROSTEPS 16     //number of microsteps
 571 
   #define Z2_MICROSTEPS 16     //number of microsteps
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572 
   #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 573 
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 574 
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
575
576 
-//  #define E0_IS_L6470
576 
+//#define E0_IS_L6470
577 
   #define E0_MICROSTEPS 16     //number of microsteps
 577 
   #define E0_MICROSTEPS 16     //number of microsteps
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578 
   #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 579 
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 580 
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
581
582 
-//  #define E1_IS_L6470
582 
+//#define E1_IS_L6470
583 
   #define E1_MICROSTEPS 16     //number of microsteps
583 
   #define E1_MICROSTEPS 16     //number of microsteps
584 
   #define E1_MICROSTEPS 16     //number of microsteps
 584 
   #define E1_MICROSTEPS 16     //number of microsteps
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585 
   #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 586 
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 587 
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
588
589 
-//  #define E2_IS_L6470
589 
+//#define E2_IS_L6470
590 
   #define E2_MICROSTEPS 16     //number of microsteps
590 
   #define E2_MICROSTEPS 16     //number of microsteps
591 
   #define E2_MICROSTEPS 16     //number of microsteps
 591 
   #define E2_MICROSTEPS 16     //number of microsteps
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592 
   #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
 593 
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
 594 
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
595
596 
-//  #define E3_IS_L6470
596 
+//#define E3_IS_L6470
597 
   #define E3_MICROSTEPS 16     //number of microsteps
597 
   #define E3_MICROSTEPS 16     //number of microsteps
598 
   #define E3_MICROSTEPS 16     //number of microsteps
 598 
   #define E3_MICROSTEPS 16     //number of microsteps
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599 
   #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high

+ 3
- 3
Marlin/pins_MEGACONTROLLER.h 查看文件

91 
     // GLCD features
 91 
     // GLCD features
92 
     //#define LCD_CONTRAST 190
 92 
     //#define LCD_CONTRAST 190
93 
     // Uncomment screen orientation
 93 
     // Uncomment screen orientation
94 
-      // #define LCD_SCREEN_ROT_90
95 
-      // #define LCD_SCREEN_ROT_180
96 
-      // #define LCD_SCREEN_ROT_270
94 
+      //#define LCD_SCREEN_ROT_90
95 
+      //#define LCD_SCREEN_ROT_180
96 
+      //#define LCD_SCREEN_ROT_270
97 
     //The encoder and click button
 97 
     //The encoder and click button
98 
     #define BTN_EN1 48
 98 
     #define BTN_EN1 48
99 
     #define BTN_EN2 11
 99 
     #define BTN_EN2 11

+ 4
- 4
Marlin/pins_RAMBO.h 查看文件

133
133
134 
     //buttons are attached to a shift register
 134 
     //buttons are attached to a shift register
135 
     // Not wired yet
 135 
     // Not wired yet
136 
-    // #define SHIFT_CLK 38
137 
-    // #define SHIFT_LD 42
138 
-    // #define SHIFT_OUT 40
139 
-    // #define SHIFT_EN 17
136 
+    //#define SHIFT_CLK 38
137 
+    //#define SHIFT_LD 42
138 
+    //#define SHIFT_OUT 40
139 
+    //#define SHIFT_EN 17
140
140
141 
     #define LCD_PINS_RS 75
 141 
     #define LCD_PINS_RS 75
142 
     #define LCD_PINS_ENABLE 17
 142 
     #define LCD_PINS_ENABLE 17

+ 7
- 7
Marlin/pins_RAMPS_13.h 查看文件

181 
        // GLCD features
 181 
        // GLCD features
182 
        //#define LCD_CONTRAST 190
 182 
        //#define LCD_CONTRAST 190
183 
        // Uncomment screen orientation
 183 
        // Uncomment screen orientation
184 
-         // #define LCD_SCREEN_ROT_90
185 
-         // #define LCD_SCREEN_ROT_180
186 
-         // #define LCD_SCREEN_ROT_270
184 
+         //#define LCD_SCREEN_ROT_90
185 
+         //#define LCD_SCREEN_ROT_180
186 
+         //#define LCD_SCREEN_ROT_270
187 
        //The encoder and click button
 187 
        //The encoder and click button
188 
        #define BTN_EN1 40
 188 
        #define BTN_EN1 40
189 
        #define BTN_EN2 63
 189 
        #define BTN_EN2 63
226
226
227 
     // Buttons are attached to a shift register
 227 
     // Buttons are attached to a shift register
228 
     // Not wired yet
 228 
     // Not wired yet
229 
-    // #define SHIFT_CLK 38
230 
-    // #define SHIFT_LD 42
231 
-    // #define SHIFT_OUT 40
232 
-    // #define SHIFT_EN 17
229 
+    //#define SHIFT_CLK 38
230 
+    //#define SHIFT_LD 42
231 
+    //#define SHIFT_OUT 40
232 
+    //#define SHIFT_EN 17
233
233
234 
     #define LCD_PINS_RS 16
 234 
     #define LCD_PINS_RS 16
235 
     #define LCD_PINS_ENABLE 17
 235 
     #define LCD_PINS_ENABLE 17

+ 2
- 2
Marlin/pins_RIGIDBOARD.h 查看文件

37 
   // Marlin can respond to UP/DOWN by default
 37 
   // Marlin can respond to UP/DOWN by default
38 
   // #undef  BTN_EN1
 38 
   // #undef  BTN_EN1
39 
   // #undef  BTN_EN2
 39 
   // #undef  BTN_EN2
40 
-  // #define BTN_EN1 -1
41 
-  // #define BTN_EN2 -1
40 
+  //#define BTN_EN1 -1
41 
+  //#define BTN_EN2 -1
42
42
43 
   #undef  BTN_ENC
 43 
   #undef  BTN_ENC
44 
   #define BTN_ENC 31
 44 
   #define BTN_ENC 31

+ 7
- 7
Marlin/pins_SANGUINOLOLU_11.h 查看文件

113
113
114 
     // Uncomment screen orientation
 114 
     // Uncomment screen orientation
115 
     #define LCD_SCREEN_ROT_0
 115 
     #define LCD_SCREEN_ROT_0
116 
-    // #define LCD_SCREEN_ROT_90
117 
-    // #define LCD_SCREEN_ROT_180
118 
-    // #define LCD_SCREEN_ROT_270
116 
+    //#define LCD_SCREEN_ROT_90
117 
+    //#define LCD_SCREEN_ROT_180
118 
+    //#define LCD_SCREEN_ROT_270
119
119
120 
   #else // !DOGLCD - Standard Hitachi LCD controller
 120 
   #else // !DOGLCD - Standard Hitachi LCD controller
121
121
157 
   #define LCD_CONTRAST           1
 157 
   #define LCD_CONTRAST           1
158 
   // Uncomment screen orientation
 158 
   // Uncomment screen orientation
159 
   #define LCD_SCREEN_ROT_0
 159 
   #define LCD_SCREEN_ROT_0
160 
-  // #define LCD_SCREEN_ROT_90
161 
-  // #define LCD_SCREEN_ROT_180
162 
-  // #define LCD_SCREEN_ROT_270
160 
+  //#define LCD_SCREEN_ROT_90
161 
+  //#define LCD_SCREEN_ROT_180
162 
+  //#define LCD_SCREEN_ROT_270
163 
   //The encoder and click button
 163 
   //The encoder and click button
164 
   #define BTN_EN1               11
 164 
   #define BTN_EN1               11
165 
   #define BTN_EN2               10
 165 
   #define BTN_EN2               10
170 
 #endif // MAKRPANEL
 170 
 #endif // MAKRPANEL
171
171
172 
 // #if FAN_PIN == 12 || FAN_PIN ==13
 172 
 // #if FAN_PIN == 12 || FAN_PIN ==13
173 
-//   #define FAN_SOFT_PWM
173 
+//#define FAN_SOFT_PWM
174 
 // #endif
 174 
 // #endif

撰写 预览
正在加载...
取消
保存