瀏覽代碼

Clean up spacing and comments

Also clean up some trailing spaces in a few other sources
Scott Lahteine 10 年之前
父節點
當前提交
a274769f4f

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

235
 // shouldn't use bed PID until someone else verifies your hardware works.
235
 // shouldn't use bed PID until someone else verifies your hardware works.
236
 // If this is enabled, find your own PID constants below.
236
 // If this is enabled, find your own PID constants below.
237
 //#define PIDTEMPBED
237
 //#define PIDTEMPBED
238
-//
238
+
239
 //#define BED_LIMIT_SWITCHING
239
 //#define BED_LIMIT_SWITCHING
240
 
240
 
241
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
241
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
406
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
406
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
407
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
407
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
408
   #define FILAMENT_RUNOUT_SCRIPT "M600"
408
   #define FILAMENT_RUNOUT_SCRIPT "M600"
409
-#endif 
409
+#endif
410
 
410
 
411
 //===========================================================================
411
 //===========================================================================
412
 //=========================== Manual Bed Leveling ===========================
412
 //=========================== Manual Bed Leveling ===========================
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 probe.
500
                                                                             //Useful to retract a deployable 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
503
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
503
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
504
 
504
 
573
 #define DEFAULT_MAX_ACCELERATION      {3000,3000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
573
 #define DEFAULT_MAX_ACCELERATION      {3000,3000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
574
 
574
 
575
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
575
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
576
-#define DEFAULT_RETRACT_ACCELERATION  3000   // E acceleration in mm/s^2 for retracts
576
+#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
577
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
577
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
578
 
578
 
579
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
579
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)

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

235
 // shouldn't use bed PID until someone else verifies your hardware works.
235
 // shouldn't use bed PID until someone else verifies your hardware works.
236
 // If this is enabled, find your own PID constants below.
236
 // If this is enabled, find your own PID constants below.
237
 //#define PIDTEMPBED
237
 //#define PIDTEMPBED
238
-//
238
+
239
 //#define BED_LIMIT_SWITCHING
239
 //#define BED_LIMIT_SWITCHING
240
 
240
 
241
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
241
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
404
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
404
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
405
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
405
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
406
   #define FILAMENT_RUNOUT_SCRIPT "M600"
406
   #define FILAMENT_RUNOUT_SCRIPT "M600"
407
-#endif 
407
+#endif
408
 
408
 
409
 //===========================================================================
409
 //===========================================================================
410
 //=========================== Manual Bed Leveling ===========================
410
 //=========================== Manual Bed Leveling ===========================

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

214
 // shouldn't use bed PID until someone else verifies your hardware works.
214
 // shouldn't use bed PID until someone else verifies your hardware works.
215
 // If this is enabled, find your own PID constants below.
215
 // If this is enabled, find your own PID constants below.
216
 #define PIDTEMPBED
216
 #define PIDTEMPBED
217
-//
217
+
218
 //#define BED_LIMIT_SWITCHING
218
 //#define BED_LIMIT_SWITCHING
219
 
219
 
220
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
220
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
355
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
355
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
356
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
356
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
357
   #define FILAMENT_RUNOUT_SCRIPT "M600"
357
   #define FILAMENT_RUNOUT_SCRIPT "M600"
358
-#endif 
358
+#endif
359
   
359
   
360
 //===========================================================================
360
 //===========================================================================
361
 //=========================== Manual Bed Leveling ===========================
361
 //=========================== Manual Bed Leveling ===========================

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

214
 // shouldn't use bed PID until someone else verifies your hardware works.
214
 // shouldn't use bed PID until someone else verifies your hardware works.
215
 // If this is enabled, find your own PID constants below.
215
 // If this is enabled, find your own PID constants below.
216
 #define PIDTEMPBED
216
 #define PIDTEMPBED
217
-//
217
+
218
 //#define BED_LIMIT_SWITCHING
218
 //#define BED_LIMIT_SWITCHING
219
 
219
 
220
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
220
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
353
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
353
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
354
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
354
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
355
   #define FILAMENT_RUNOUT_SCRIPT "M600"
355
   #define FILAMENT_RUNOUT_SCRIPT "M600"
356
-#endif 
356
+#endif
357
   
357
   
358
 //===========================================================================
358
 //===========================================================================
359
 //=========================== Manual Bed Leveling ===========================
359
 //=========================== Manual Bed Leveling ===========================

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

231
 // shouldn't use bed PID until someone else verifies your hardware works.
231
 // shouldn't use bed PID until someone else verifies your hardware works.
232
 // If this is enabled, find your own PID constants below.
232
 // If this is enabled, find your own PID constants below.
233
 //#define PIDTEMPBED
233
 //#define PIDTEMPBED
234
-//
234
+
235
 //#define BED_LIMIT_SWITCHING
235
 //#define BED_LIMIT_SWITCHING
236
 
236
 
237
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
237
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
379
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
379
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
380
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
380
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
381
   #define FILAMENT_RUNOUT_SCRIPT "M600"
381
   #define FILAMENT_RUNOUT_SCRIPT "M600"
382
-#endif 
382
+#endif
383
   
383
   
384
 //===========================================================================
384
 //===========================================================================
385
 //=========================== Manual Bed Leveling ===========================
385
 //=========================== Manual Bed Leveling ===========================

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

245
 // shouldn't use bed PID until someone else verifies your hardware works.
245
 // shouldn't use bed PID until someone else verifies your hardware works.
246
 // If this is enabled, find your own PID constants below.
246
 // If this is enabled, find your own PID constants below.
247
 //#define PIDTEMPBED
247
 //#define PIDTEMPBED
248
-//
248
+
249
 //#define BED_LIMIT_SWITCHING
249
 //#define BED_LIMIT_SWITCHING
250
 
250
 
251
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
251
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
422
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
422
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
423
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
423
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
424
   #define FILAMENT_RUNOUT_SCRIPT "M600"
424
   #define FILAMENT_RUNOUT_SCRIPT "M600"
425
-#endif 
425
+#endif
426
 
426
 
427
 //===========================================================================
427
 //===========================================================================
428
 //=========================== Manual Bed Leveling ===========================
428
 //=========================== Manual Bed Leveling ===========================

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

235
 // shouldn't use bed PID until someone else verifies your hardware works.
235
 // shouldn't use bed PID until someone else verifies your hardware works.
236
 // If this is enabled, find your own PID constants below.
236
 // If this is enabled, find your own PID constants below.
237
 //#define PIDTEMPBED
237
 //#define PIDTEMPBED
238
-//
238
+
239
 //#define BED_LIMIT_SWITCHING
239
 //#define BED_LIMIT_SWITCHING
240
 
240
 
241
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
241
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
406
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
406
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
407
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
407
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
408
   #define FILAMENT_RUNOUT_SCRIPT "M600"
408
   #define FILAMENT_RUNOUT_SCRIPT "M600"
409
-#endif 
409
+#endif
410
 
410
 
411
 //===========================================================================
411
 //===========================================================================
412
 //=========================== Manual Bed Leveling ===========================
412
 //=========================== Manual Bed Leveling ===========================

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

260
 // shouldn't use bed PID until someone else verifies your hardware works.
260
 // shouldn't use bed PID until someone else verifies your hardware works.
261
 // If this is enabled, find your own PID constants below.
261
 // If this is enabled, find your own PID constants below.
262
 #define PIDTEMPBED
262
 #define PIDTEMPBED
263
-//
263
+
264
 #define BED_LIMIT_SWITCHING
264
 #define BED_LIMIT_SWITCHING
265
 
265
 
266
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
266
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
414
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
414
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
415
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
415
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
416
   #define FILAMENT_RUNOUT_SCRIPT "M600"
416
   #define FILAMENT_RUNOUT_SCRIPT "M600"
417
-#endif 
417
+#endif
418
   
418
   
419
 //===========================================================================
419
 //===========================================================================
420
 //=========================== Manual Bed Leveling ===========================
420
 //=========================== Manual Bed Leveling ===========================

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

230
 // shouldn't use bed PID until someone else verifies your hardware works.
230
 // shouldn't use bed PID until someone else verifies your hardware works.
231
 // If this is enabled, find your own PID constants below.
231
 // If this is enabled, find your own PID constants below.
232
 //#define PIDTEMPBED
232
 //#define PIDTEMPBED
233
-//
233
+
234
 //#define BED_LIMIT_SWITCHING
234
 //#define BED_LIMIT_SWITCHING
235
 
235
 
236
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
236
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
378
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
378
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
379
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
379
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
380
   #define FILAMENT_RUNOUT_SCRIPT "M600"
380
   #define FILAMENT_RUNOUT_SCRIPT "M600"
381
-#endif 
381
+#endif
382
   
382
   
383
 //===========================================================================
383
 //===========================================================================
384
 //=========================== Manual Bed Leveling ===========================
384
 //=========================== Manual Bed Leveling ===========================

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

261
 // shouldn't use bed PID until someone else verifies your hardware works.
261
 // shouldn't use bed PID until someone else verifies your hardware works.
262
 // If this is enabled, find your own PID constants below.
262
 // If this is enabled, find your own PID constants below.
263
 //#define PIDTEMPBED
263
 //#define PIDTEMPBED
264
-//
264
+
265
 //#define BED_LIMIT_SWITCHING
265
 //#define BED_LIMIT_SWITCHING
266
 
266
 
267
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
267
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
385
 #define INVERT_Z_DIR false
385
 #define INVERT_Z_DIR false
386
 
386
 
387
 // @section extruder
387
 // @section extruder
388
+
389
+// For direct drive extruder v9 set to true, for geared extruder set to false.
388
 #define INVERT_E0_DIR false
390
 #define INVERT_E0_DIR false
389
 #define INVERT_E1_DIR false
391
 #define INVERT_E1_DIR false
390
 #define INVERT_E2_DIR false
392
 #define INVERT_E2_DIR false
430
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
432
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
431
 
433
 
432
 #ifdef MANUAL_BED_LEVELING
434
 #ifdef MANUAL_BED_LEVELING
433
-  #define MBL_Z_STEP 0.025
435
+  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis
434
 #endif  // MANUAL_BED_LEVELING
436
 #endif  // MANUAL_BED_LEVELING
435
 
437
 
436
 #ifdef MESH_BED_LEVELING
438
 #ifdef MESH_BED_LEVELING
471
 
473
 
472
   #ifdef AUTO_BED_LEVELING_GRID
474
   #ifdef AUTO_BED_LEVELING_GRID
473
 
475
 
476
+    // set the rectangle in which to probe
474
     #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
477
     #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
475
-
476
     #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
478
     #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
477
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
479
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
478
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
480
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
479
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
481
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
480
-    
482
+
481
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
483
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
482
 
484
 
483
     // Non-linear bed leveling will be used.
485
     // Non-linear bed leveling will be used.
516
 
518
 
517
 //   #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.
519
 //   #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.
518
                                                                             //Useful to retract a deployable probe.
520
                                                                             //Useful to retract a deployable probe.
519
-                                                                           
521
+
520
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
522
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
521
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
523
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
522
 
524
 
523
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
525
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
524
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
526
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
525
   //#define Z_PROBE_ALLEN_KEY
527
   //#define Z_PROBE_ALLEN_KEY
528
+
526
   #ifdef Z_PROBE_ALLEN_KEY
529
   #ifdef Z_PROBE_ALLEN_KEY
527
     #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30
530
     #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30
528
     #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS
531
     #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS
533
     #define Z_PROBE_ALLEN_KEY_STOW_Z     23
536
     #define Z_PROBE_ALLEN_KEY_STOW_Z     23
534
     #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
537
     #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
535
   #endif
538
   #endif
536
-  
539
+
537
   //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
540
   //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
538
   //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
541
   //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
539
   // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
542
   // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
595
  * MOVEMENT SETTINGS
598
  * MOVEMENT SETTINGS
596
  */
599
  */
597
 
600
 
598
-
599
 // delta homing speeds must be the same on xyz
601
 // delta homing speeds must be the same on xyz
600
 #define HOMING_FEEDRATE {200*30, 200*30, 200*30, 0}  // set the homing speeds (mm/min)
602
 #define HOMING_FEEDRATE {200*30, 200*30, 200*30, 0}  // set the homing speeds (mm/min)
601
 
603
 
606
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
608
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
607
 
609
 
608
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
610
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
609
-#define DEFAULT_RETRACT_ACCELERATION  3000   // E acceleration in mm/s^2 for retracts
611
+#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
610
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
612
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
611
 
613
 
612
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
614
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
649
 
651
 
650
 #ifdef EEPROM_SETTINGS
652
 #ifdef EEPROM_SETTINGS
651
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
653
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
652
-  #define EEPROM_CHITCHAT // please keep turned on if you can.
654
+  #define EEPROM_CHITCHAT // Please keep turned on if you can.
653
 #endif
655
 #endif
654
 
656
 
655
 // @section temperature
657
 // @section temperature
667
 // @section lcd
669
 // @section lcd
668
 
670
 
669
 // Define your display language below. Replace (en) with your language code and uncomment.
671
 // Define your display language below. Replace (en) with your language code and uncomment.
670
-// en, pl, fr, de, es, ru, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, cn, test
672
+// en, pl, fr, de, es, ru, bg, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, cn, test
671
 // See also language.h
673
 // See also language.h
672
 #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
674
 #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
673
 
675
 
690
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
692
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
691
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
693
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
692
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
694
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
693
-
694
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
695
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
695
 // http://reprap.org/wiki/PanelOne
696
 // http://reprap.org/wiki/PanelOne
696
 //#define PANEL_ONE
697
 //#define PANEL_ONE
758
 // ---------------------
759
 // ---------------------
759
 // 2 wire Non-latching LCD SR from:
760
 // 2 wire Non-latching LCD SR from:
760
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
761
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
761
-
762
+// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
762
 //#define SAV_3DLCD
763
 //#define SAV_3DLCD
763
 
764
 
764
 // @section extras
765
 // @section extras
786
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
787
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
787
 // #define PHOTOGRAPH_PIN     23
788
 // #define PHOTOGRAPH_PIN     23
788
 
789
 
789
-// SF send wrong arc g-codes when using Arc Point as fillet procedure
790
+// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
790
 //#define SF_ARC_FIX
791
 //#define SF_ARC_FIX
791
 
792
 
792
 // Support for the BariCUDA Paste Extruder.
793
 // Support for the BariCUDA Paste Extruder.

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

261
 // shouldn't use bed PID until someone else verifies your hardware works.
261
 // shouldn't use bed PID until someone else verifies your hardware works.
262
 // If this is enabled, find your own PID constants below.
262
 // If this is enabled, find your own PID constants below.
263
 //#define PIDTEMPBED
263
 //#define PIDTEMPBED
264
-//
264
+
265
 //#define BED_LIMIT_SWITCHING
265
 //#define BED_LIMIT_SWITCHING
266
 
266
 
267
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
267
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
385
 #define INVERT_Z_DIR false
385
 #define INVERT_Z_DIR false
386
 
386
 
387
 // @section extruder
387
 // @section extruder
388
+
389
+// For direct drive extruder v9 set to true, for geared extruder set to false.
388
 #define INVERT_E0_DIR false
390
 #define INVERT_E0_DIR false
389
 #define INVERT_E1_DIR false
391
 #define INVERT_E1_DIR false
390
 #define INVERT_E2_DIR false
392
 #define INVERT_E2_DIR false
423
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
425
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
424
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
426
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
425
   #define FILAMENT_RUNOUT_SCRIPT "M600"
427
   #define FILAMENT_RUNOUT_SCRIPT "M600"
426
-#endif 
427
-  
428
+#endif
429
+
428
 //===========================================================================
430
 //===========================================================================
429
 //=========================== Manual Bed Leveling ===========================
431
 //=========================== Manual Bed Leveling ===========================
430
 //===========================================================================
432
 //===========================================================================
433
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
435
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
434
 
436
 
435
 #ifdef MANUAL_BED_LEVELING
437
 #ifdef MANUAL_BED_LEVELING
436
-  #define MBL_Z_STEP 0.025
438
+  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis
437
 #endif  // MANUAL_BED_LEVELING
439
 #endif  // MANUAL_BED_LEVELING
438
 
440
 
439
 #ifdef MESH_BED_LEVELING
441
 #ifdef MESH_BED_LEVELING
474
 
476
 
475
   #ifdef AUTO_BED_LEVELING_GRID
477
   #ifdef AUTO_BED_LEVELING_GRID
476
 
478
 
479
+    // set the rectangle in which to probe
477
     #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
480
     #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
478
-
479
     #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
481
     #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
480
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
482
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
481
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
483
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
482
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
484
     #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
483
-    
485
+
484
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
486
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
485
 
487
 
486
     // Non-linear bed leveling will be used.
488
     // Non-linear bed leveling will be used.
519
 
521
 
520
 //   #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.
522
 //   #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.
521
                                                                             //Useful to retract a deployable probe.
523
                                                                             //Useful to retract a deployable probe.
522
-                                                                           
524
+
523
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
525
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
524
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
526
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
525
 
527
 
526
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
528
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
527
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
529
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
528
   //#define Z_PROBE_ALLEN_KEY
530
   //#define Z_PROBE_ALLEN_KEY
531
+
529
   #ifdef Z_PROBE_ALLEN_KEY
532
   #ifdef Z_PROBE_ALLEN_KEY
530
     #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30
533
     #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30
531
     #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS
534
     #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS
536
     #define Z_PROBE_ALLEN_KEY_STOW_Z     23
539
     #define Z_PROBE_ALLEN_KEY_STOW_Z     23
537
     #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
540
     #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
538
   #endif
541
   #endif
539
-  
542
+
540
   //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
543
   //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
541
   //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
544
   //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
542
   // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
545
   // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
598
  * MOVEMENT SETTINGS
601
  * MOVEMENT SETTINGS
599
  */
602
  */
600
 
603
 
601
-
602
 // delta homing speeds must be the same on xyz
604
 // delta homing speeds must be the same on xyz
603
 #define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
605
 #define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
604
 
606
 
609
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
611
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
610
 
612
 
611
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
613
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
612
-#define DEFAULT_RETRACT_ACCELERATION  3000   // E acceleration in mm/s^2 for retracts
614
+#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
613
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
615
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
614
 
616
 
615
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
617
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
621
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
623
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
622
 #define DEFAULT_XYJERK                20.0    // (mm/sec)
624
 #define DEFAULT_XYJERK                20.0    // (mm/sec)
623
 #define DEFAULT_ZJERK                 20.0    // (mm/sec) Must be same as XY for delta
625
 #define DEFAULT_ZJERK                 20.0    // (mm/sec) Must be same as XY for delta
624
-#define DEFAULT_EJERK                 5.0    // (mm/sec)
626
+#define DEFAULT_EJERK                 5.0     // (mm/sec)
625
 
627
 
626
 
628
 
627
 //=============================================================================
629
 //=============================================================================
652
 
654
 
653
 #ifdef EEPROM_SETTINGS
655
 #ifdef EEPROM_SETTINGS
654
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
656
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
655
-  #define EEPROM_CHITCHAT // please keep turned on if you can.
657
+  #define EEPROM_CHITCHAT // Please keep turned on if you can.
656
 #endif
658
 #endif
657
 
659
 
658
 // @section temperature
660
 // @section temperature
693
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
695
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
694
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
696
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
695
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
697
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
696
-
697
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
698
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
698
 // http://reprap.org/wiki/PanelOne
699
 // http://reprap.org/wiki/PanelOne
699
 //#define PANEL_ONE
700
 //#define PANEL_ONE
761
 // ---------------------
762
 // ---------------------
762
 // 2 wire Non-latching LCD SR from:
763
 // 2 wire Non-latching LCD SR from:
763
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
764
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
764
-
765
+// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
765
 //#define SAV_3DLCD
766
 //#define SAV_3DLCD
766
 
767
 
767
 // @section extras
768
 // @section extras
789
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
790
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
790
 // #define PHOTOGRAPH_PIN     23
791
 // #define PHOTOGRAPH_PIN     23
791
 
792
 
792
-// SF send wrong arc g-codes when using Arc Point as fillet procedure
793
+// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
793
 //#define SF_ARC_FIX
794
 //#define SF_ARC_FIX
794
 
795
 
795
 // Support for the BariCUDA Paste Extruder.
796
 // Support for the BariCUDA Paste Extruder.

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

261
 // shouldn't use bed PID until someone else verifies your hardware works.
261
 // shouldn't use bed PID until someone else verifies your hardware works.
262
 // If this is enabled, find your own PID constants below.
262
 // If this is enabled, find your own PID constants below.
263
 //#define PIDTEMPBED
263
 //#define PIDTEMPBED
264
-//
264
+
265
 //#define BED_LIMIT_SWITCHING
265
 //#define BED_LIMIT_SWITCHING
266
 
266
 
267
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
267
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
435
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
435
 // #define MESH_BED_LEVELING    // Enable mesh bed leveling
436
 
436
 
437
 #ifdef MANUAL_BED_LEVELING
437
 #ifdef MANUAL_BED_LEVELING
438
-  #define MBL_Z_STEP 0.025
438
+  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis
439
 #endif  // MANUAL_BED_LEVELING
439
 #endif  // MANUAL_BED_LEVELING
440
 
440
 
441
 #ifdef MESH_BED_LEVELING
441
 #ifdef MESH_BED_LEVELING
476
 
476
 
477
   #ifdef AUTO_BED_LEVELING_GRID
477
   #ifdef AUTO_BED_LEVELING_GRID
478
 
478
 
479
+    // set the rectangle in which to probe
479
     #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
480
     #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
480
-
481
     #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
481
     #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
482
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
482
     #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
483
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
483
     #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
525
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
525
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
526
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
526
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
527
 
527
 
528
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
529
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
530
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
531
-
532
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
528
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
533
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
529
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
534
   #define Z_PROBE_ALLEN_KEY
530
   #define Z_PROBE_ALLEN_KEY
535
   #ifdef Z_PROBE_ALLEN_KEY
531
   #ifdef Z_PROBE_ALLEN_KEY
532
+    // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
533
+    // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
536
 
534
 
537
     // Kossel Mini
535
     // Kossel Mini
538
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
536
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
624
  * MOVEMENT SETTINGS
622
  * MOVEMENT SETTINGS
625
  */
623
  */
626
 
624
 
627
-
628
 // delta homing speeds must be the same on xyz
625
 // delta homing speeds must be the same on xyz
629
 #define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
626
 #define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
630
 
627
 
635
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
632
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
636
 
633
 
637
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
634
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
638
-#define DEFAULT_RETRACT_ACCELERATION  3000   // E acceleration in mm/s^2 for retracts
635
+#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration in mm/s^2 for retracts
639
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
636
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
640
 
637
 
641
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
638
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
678
 
675
 
679
 #ifdef EEPROM_SETTINGS
676
 #ifdef EEPROM_SETTINGS
680
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
677
   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
681
-  #define EEPROM_CHITCHAT // please keep turned on if you can.
678
+  #define EEPROM_CHITCHAT // Please keep turned on if you can.
682
 #endif
679
 #endif
683
 
680
 
684
 // @section temperature
681
 // @section temperature
719
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
716
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
720
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
717
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000         // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
721
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
718
                                                  // 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
722
-
723
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
719
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
724
 // http://reprap.org/wiki/PanelOne
720
 // http://reprap.org/wiki/PanelOne
725
 #define PANEL_ONE
721
 #define PANEL_ONE
787
 // ---------------------
783
 // ---------------------
788
 // 2 wire Non-latching LCD SR from:
784
 // 2 wire Non-latching LCD SR from:
789
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
785
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
790
-
786
+// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
791
 //#define SAV_3DLCD
787
 //#define SAV_3DLCD
792
 
788
 
793
 // @section extras
789
 // @section extras
815
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
811
 // Data from: http://www.doc-diy.net/photo/rc-1_hacked/
816
 // #define PHOTOGRAPH_PIN     23
812
 // #define PHOTOGRAPH_PIN     23
817
 
813
 
818
-// SF send wrong arc g-codes when using Arc Point as fillet procedure
814
+// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
819
 //#define SF_ARC_FIX
815
 //#define SF_ARC_FIX
820
 
816
 
821
 // Support for the BariCUDA Paste Extruder.
817
 // Support for the BariCUDA Paste Extruder.

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

204
   //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
204
   //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
205
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
205
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
206
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
206
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
207
-  #define PID_FUNCTIONAL_RANGE 50   // If the temperature difference between the target temperature and the actual temperature
208
-                                    // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
207
+  #define PID_FUNCTIONAL_RANGE 50 // If the temperature difference between the target temperature and the actual temperature
208
+                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
209
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
209
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
210
   #define K1 0.95 //smoothing factor within the PID
210
   #define K1 0.95 //smoothing factor within the PID
211
 
211
 
212
 // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
212
 // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
213
-
214
 // Ultimaker
213
 // Ultimaker
215
 //    #define  DEFAULT_Kp 22.2
214
 //    #define  DEFAULT_Kp 22.2
216
 //    #define  DEFAULT_Ki 1.08
215
 //    #define  DEFAULT_Ki 1.08
245
 // shouldn't use bed PID until someone else verifies your hardware works.
244
 // shouldn't use bed PID until someone else verifies your hardware works.
246
 // If this is enabled, find your own PID constants below.
245
 // If this is enabled, find your own PID constants below.
247
 #define PIDTEMPBED
246
 #define PIDTEMPBED
248
-//
247
+
249
 //#define BED_LIMIT_SWITCHING
248
 //#define BED_LIMIT_SWITCHING
250
 
249
 
251
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
250
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
306
  * The solution: Once the temperature reaches the target, start observing.
305
  * The solution: Once the temperature reaches the target, start observing.
307
  * If the temperature stays too far below the target (hysteresis) for too long,
306
  * If the temperature stays too far below the target (hysteresis) for too long,
308
  * the firmware will halt as a safety precaution.
307
  * the firmware will halt as a safety precaution.
309
- *
310
- * Note that because the countdown starts only AFTER the temperature reaches
311
- * the target, this will not catch a thermistor that is already disconnected
312
- * when the print starts!
313
- *
314
- * To enable for all extruder heaters, uncomment the two defines below:
315
  */
308
  */
316
 
309
 
317
 #define THERMAL_RUNAWAY_PROTECTION_HOTENDS // Enable thermal protection for all extruders
310
 #define THERMAL_RUNAWAY_PROTECTION_HOTENDS // Enable thermal protection for all extruders
342
 #define DELTA
335
 #define DELTA
343
 
336
 
344
 #ifdef DELTA
337
 #ifdef DELTA
338
+
345
 // Make delta curves from many straight lines (linear interpolation).
339
 // Make delta curves from many straight lines (linear interpolation).
346
 // This is a trade-off between visible corners (not enough segments)
340
 // This is a trade-off between visible corners (not enough segments)
347
 // and processor overload (too many expensive sqrt calls).
341
 // and processor overload (too many expensive sqrt calls).
494
 // @section bedlevel
488
 // @section bedlevel
495
 
489
 
496
 #define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line)
490
 #define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line)
497
-// /// #define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
491
+// #define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
498
 
492
 
499
 #ifdef ENABLE_AUTO_BED_LEVELING
493
 #ifdef ENABLE_AUTO_BED_LEVELING
500
 
494
 
538
     // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher.
532
     // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher.
539
     #define NONLINEAR_BED_LEVELING
533
     #define NONLINEAR_BED_LEVELING
540
 
534
 
541
-  #else  // not AUTO_BED_LEVELING_GRID
535
+  #else  // !AUTO_BED_LEVELING_GRID
542
 
536
 
543
       // Arbitrary points to probe. A simple cross-product
537
       // Arbitrary points to probe. A simple cross-product
544
       // is used to estimate the plane of the bed.
538
       // is used to estimate the plane of the bed.
574
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
568
   //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
575
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
569
   //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
576
 
570
 
577
-  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
578
-  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
579
-  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
580
-
581
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
571
   // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
582
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
572
   // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
583
   #define Z_PROBE_ALLEN_KEY
573
   #define Z_PROBE_ALLEN_KEY
586
     // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
576
     // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
587
     // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
577
     // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
588
 
578
 
589
-    // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
590
-    // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
591
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
579
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
592
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
580
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
593
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100
581
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100
661
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
649
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
662
   #endif
650
   #endif
663
 
651
 
652
+  //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk
653
+  //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it.
654
+  // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile.
655
+
664
 //  #define PROBE_SERVO_DEACTIVATION_DELAY 300
656
 //  #define PROBE_SERVO_DEACTIVATION_DELAY 300
665
 
657
 
666
 
658
 
679
     #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2)    // X point for Z homing when homing all axis (G28)
671
     #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2)    // X point for Z homing when homing all axis (G28)
680
     #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
672
     #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
681
 
673
 
674
+  #endif
682
 
675
 
683
   // Support for a dedicated Z PROBE endstop separate from the Z MIN endstop.
676
   // Support for a dedicated Z PROBE endstop separate from the Z MIN endstop.
684
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
677
   // If you would like to use both a Z PROBE and a Z MIN endstop together or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP and read the instructions below.
693
   // WARNING: Setting the wrong pin may have unexpected and potentially disastrous outcomes. Use with caution and do your homework.
686
   // WARNING: Setting the wrong pin may have unexpected and potentially disastrous outcomes. Use with caution and do your homework.
694
 
687
 
695
   //#define Z_PROBE_ENDSTOP
688
   //#define Z_PROBE_ENDSTOP
696
-  #endif // Z_SAFE_HOMING
697
 
689
 
698
 #endif // ENABLE_AUTO_BED_LEVELING
690
 #endif // ENABLE_AUTO_BED_LEVELING
699
 
691
 
720
 
712
 
721
   ////// #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
713
   ////// #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
722
 // set the homing speeds (mm/min)
714
 // set the homing speeds (mm/min)
723
-// delta homing speeds must be the same on xyz
715
+/// delta homing speeds must be the same on xyz
724
 #define HOMING_FEEDRATE_X (200*60)
716
 #define HOMING_FEEDRATE_X (200*60)
725
 #define HOMING_FEEDRATE_Y (200*60)
717
 #define HOMING_FEEDRATE_Y (200*60)
726
 #define HOMING_FEEDRATE_Z (200*60)
718
 #define HOMING_FEEDRATE_Z (200*60)
799
 // @section lcd
791
 // @section lcd
800
 
792
 
801
 // Define your display language below. Replace (en) with your language code and uncomment.
793
 // Define your display language below. Replace (en) with your language code and uncomment.
802
-// en, pl, fr, de, es, ru, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, cn, test
794
+// en, pl, fr, de, es, ru, bg, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, cn, test
803
 // See also language.h
795
 // See also language.h
804
 #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
796
 #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
805
 
797
 
1042
 // Servo Endstops
1034
 // Servo Endstops
1043
 //
1035
 //
1044
 // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
1036
 // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
1045
-// Use M206 command to correct for switch height offset to actual nozzle height. Store that setting with M500.
1037
+// Use M851 to set the z-probe vertical offset from the nozzle. Store that setting with M500.
1046
 //
1038
 //
1047
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
1039
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
1048
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
1040
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles

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

224
 // shouldn't use bed PID until someone else verifies your hardware works.
224
 // shouldn't use bed PID until someone else verifies your hardware works.
225
 // If this is enabled, find your own PID constants below.
225
 // If this is enabled, find your own PID constants below.
226
 //#define PIDTEMPBED
226
 //#define PIDTEMPBED
227
-//
227
+
228
 //#define BED_LIMIT_SWITCHING
228
 //#define BED_LIMIT_SWITCHING
229
 
229
 
230
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
230
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
376
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
376
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
377
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
377
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
378
   #define FILAMENT_RUNOUT_SCRIPT "M600"
378
   #define FILAMENT_RUNOUT_SCRIPT "M600"
379
-#endif 
379
+#endif
380
 //===========================================================================
380
 //===========================================================================
381
 //=========================== Manual Bed Leveling ===========================
381
 //=========================== Manual Bed Leveling ===========================
382
 //===========================================================================
382
 //===========================================================================

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

229
 // shouldn't use bed PID until someone else verifies your hardware works.
229
 // shouldn't use bed PID until someone else verifies your hardware works.
230
 // If this is enabled, find your own PID constants below.
230
 // If this is enabled, find your own PID constants below.
231
 //#define PIDTEMPBED
231
 //#define PIDTEMPBED
232
-//
232
+
233
 //#define BED_LIMIT_SWITCHING
233
 //#define BED_LIMIT_SWITCHING
234
 
234
 
235
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
235
 // This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
377
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
377
   const bool FIL_RUNOUT_INVERTING = true;  // Should be uncommented and true or false should assigned
378
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
378
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
379
   #define FILAMENT_RUNOUT_SCRIPT "M600"
379
   #define FILAMENT_RUNOUT_SCRIPT "M600"
380
-#endif 
380
+#endif
381
 
381
 
382
 //===========================================================================
382
 //===========================================================================
383
 //=========================== Manual Bed Leveling ===========================
383
 //=========================== Manual Bed Leveling ===========================

+ 3
- 3
Marlin/temperature.cpp 查看文件

422
   // update extruder auto fan states
422
   // update extruder auto fan states
423
   #if HAS_AUTO_FAN_0
423
   #if HAS_AUTO_FAN_0
424
     setExtruderAutoFanState(EXTRUDER_0_AUTO_FAN_PIN, (fanState & 1) != 0);
424
     setExtruderAutoFanState(EXTRUDER_0_AUTO_FAN_PIN, (fanState & 1) != 0);
425
-  #endif 
425
+  #endif
426
   #if HAS_AUTO_FAN_1
426
   #if HAS_AUTO_FAN_1
427
     if (EXTRUDER_1_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
427
     if (EXTRUDER_1_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
428
       setExtruderAutoFanState(EXTRUDER_1_AUTO_FAN_PIN, (fanState & 2) != 0);
428
       setExtruderAutoFanState(EXTRUDER_1_AUTO_FAN_PIN, (fanState & 2) != 0);
429
-  #endif 
429
+  #endif
430
   #if HAS_AUTO_FAN_2
430
   #if HAS_AUTO_FAN_2
431
     if (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
431
     if (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
432
         && EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
432
         && EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
1238
       static unsigned char state_timer_heater_ ## n = 0
1238
       static unsigned char state_timer_heater_ ## n = 0
1239
   #else
1239
   #else
1240
     #define ISR_STATICS(n) static unsigned char soft_pwm_ ## n
1240
     #define ISR_STATICS(n) static unsigned char soft_pwm_ ## n
1241
-  #endif 
1241
+  #endif
1242
 
1242
 
1243
   // Statics per heater
1243
   // Statics per heater
1244
   ISR_STATICS(0);
1244
   ISR_STATICS(0);

+ 1
- 1
Marlin/ultralcd.cpp 查看文件

1665
     #define encrot1 2
1665
     #define encrot1 2
1666
     #define encrot2 3
1666
     #define encrot2 3
1667
     #define encrot3 1
1667
     #define encrot3 1
1668
-  #endif 
1668
+  #endif
1669
 
1669
 
1670
   /**
1670
   /**
1671
    * Read encoder buttons from the hardware registers
1671
    * Read encoder buttons from the hardware registers

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

31
   // encoder click is directly connected
31
   // encoder click is directly connected
32
   #define BLEN_C 2 
32
   #define BLEN_C 2 
33
   #define EN_C BIT(BLEN_C) 
33
   #define EN_C BIT(BLEN_C) 
34
-#endif 
34
+#endif
35
   
35
   
36
 //
36
 //
37
 // Setup other button mappings of each panel
37
 // Setup other button mappings of each panel

Loading…
取消
儲存