Selaa lähdekoodia

Updates for the configurator

- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
Scott Lahteine 10 vuotta sitten
vanhempi
commit
7d2c2f1790

+ 125
- 115
Marlin/Configuration_adv.h Näytä tiedosto

@@ -312,6 +312,8 @@
312 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
313 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
314 314
 
315
+// @section lcd
316
+
315 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
316 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
317 319
 // does not respect endstops!
@@ -322,12 +324,14 @@
322 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
323 325
 #endif
324 326
 
327
+// @section extruder
328
+
325 329
 // extruder advance constant (s2/mm3)
326 330
 //
327 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
328 332
 //
329
-// Hooke's law says:		force = k * distance
330
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
331 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
332 336
 //#define ADVANCE
333 337
 
@@ -337,6 +341,8 @@
337 341
   #define STEPS_MM_E 836
338 342
 #endif
339 343
 
344
+// @section extras
345
+
340 346
 // Arc interpretation settings:
341 347
 #define MM_PER_ARC_SEGMENT 1
342 348
 #define N_ARC_CORRECTION 25
@@ -368,7 +374,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
368 374
 #define MAX_CMD_SIZE 96
369 375
 #define BUFSIZE 4
370 376
 
371
-// @section extras
377
+// @section fwretract
372 378
 
373 379
 // Firmware based and LCD controlled retract
374 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -405,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
405 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
406 412
  ******************************************************************************/
407 413
 
414
+// @section tmc
415
+
408 416
 //#define HAVE_TMCDRIVER
409 417
 #ifdef HAVE_TMCDRIVER
410 418
 
411
-//	#define X_IS_TMC
412
-	#define X_MAX_CURRENT 1000  //in mA
413
-	#define X_SENSE_RESISTOR 91 //in mOhms
414
-	#define X_MICROSTEPS 16     //number of microsteps
415
-	
416
-//	#define X2_IS_TMC
417
-	#define X2_MAX_CURRENT 1000  //in mA
418
-	#define X2_SENSE_RESISTOR 91 //in mOhms
419
-	#define X2_MICROSTEPS 16     //number of microsteps
420
-	
421
-//	#define Y_IS_TMC
422
-	#define Y_MAX_CURRENT 1000  //in mA
423
-	#define Y_SENSE_RESISTOR 91 //in mOhms
424
-	#define Y_MICROSTEPS 16     //number of microsteps
425
-	
426
-//	#define Y2_IS_TMC
427
-	#define Y2_MAX_CURRENT 1000  //in mA
428
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
429
-	#define Y2_MICROSTEPS 16     //number of microsteps	
430
-	
431
-//	#define Z_IS_TMC
432
-	#define Z_MAX_CURRENT 1000  //in mA
433
-	#define Z_SENSE_RESISTOR 91 //in mOhms
434
-	#define Z_MICROSTEPS 16     //number of microsteps
435
-	
436
-//	#define Z2_IS_TMC
437
-	#define Z2_MAX_CURRENT 1000  //in mA
438
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
439
-	#define Z2_MICROSTEPS 16     //number of microsteps
440
-	
441
-//	#define E0_IS_TMC
442
-	#define E0_MAX_CURRENT 1000  //in mA
443
-	#define E0_SENSE_RESISTOR 91 //in mOhms
444
-	#define E0_MICROSTEPS 16     //number of microsteps
445
-	
446
-//	#define E1_IS_TMC
447
-	#define E1_MAX_CURRENT 1000  //in mA
448
-	#define E1_SENSE_RESISTOR 91 //in mOhms
449
-	#define E1_MICROSTEPS 16     //number of microsteps	
450
-	
451
-//	#define E2_IS_TMC
452
-	#define E2_MAX_CURRENT 1000  //in mA
453
-	#define E2_SENSE_RESISTOR 91 //in mOhms
454
-	#define E2_MICROSTEPS 16     //number of microsteps	
455
-	
456
-//	#define E3_IS_TMC
457
-	#define E3_MAX_CURRENT 1000  //in mA
458
-	#define E3_SENSE_RESISTOR 91 //in mOhms
459
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
460 468
 
461 469
 #endif
462 470
 
@@ -465,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
465 473
  * you need to import the L6470 library into the arduino IDE for this
466 474
  ******************************************************************************/
467 475
 
476
+// @section l6470
477
+
468 478
 //#define HAVE_L6470DRIVER
469 479
 #ifdef HAVE_L6470DRIVER
470 480
 
471
-//	#define X_IS_L6470
472
-	#define X_MICROSTEPS 16     //number of microsteps
473
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
474
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
475
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
476
-	
477
-//	#define X2_IS_L6470
478
-	#define X2_MICROSTEPS 16     //number of microsteps
479
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
480
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
481
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
482
-	
483
-//	#define Y_IS_L6470
484
-	#define Y_MICROSTEPS 16     //number of microsteps
485
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
486
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
487
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
488
-	
489
-//	#define Y2_IS_L6470
490
-	#define Y2_MICROSTEPS 16     //number of microsteps	
491
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
494
-	
495
-//	#define Z_IS_L6470
496
-	#define Z_MICROSTEPS 16     //number of microsteps
497
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
498
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
499
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
500
-	
501
-//	#define Z2_IS_L6470
502
-	#define Z2_MICROSTEPS 16     //number of microsteps
503
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
504
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
505
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
506
-	
507
-//	#define E0_IS_L6470
508
-	#define E0_MICROSTEPS 16     //number of microsteps
509
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
510
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
511
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
512
-	
513
-//	#define E1_IS_L6470
514
-	#define E1_MICROSTEPS 16     //number of microsteps	
515
-	#define E1_MICROSTEPS 16     //number of microsteps
516
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
517
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
518
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
519
-	
520
-//	#define E2_IS_L6470
521
-	#define E2_MICROSTEPS 16     //number of microsteps	
522
-	#define E2_MICROSTEPS 16     //number of microsteps
523
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
524
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
525
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
526
-	
527
-//	#define E3_IS_L6470
528
-	#define E3_MICROSTEPS 16     //number of microsteps		
529
-	#define E3_MICROSTEPS 16     //number of microsteps
530
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
531
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
532
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
533
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
534 544
 #endif
535 545
 
536 546
 #include "Conditionals.h"

+ 125
- 115
Marlin/configurator/config/Configuration_adv.h Näytä tiedosto

@@ -312,6 +312,8 @@
312 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
313 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
314 314
 
315
+// @section lcd
316
+
315 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
316 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
317 319
 // does not respect endstops!
@@ -322,12 +324,14 @@
322 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
323 325
 #endif
324 326
 
327
+// @section extruder
328
+
325 329
 // extruder advance constant (s2/mm3)
326 330
 //
327 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
328 332
 //
329
-// Hooke's law says:		force = k * distance
330
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
331 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
332 336
 //#define ADVANCE
333 337
 
@@ -337,6 +341,8 @@
337 341
   #define STEPS_MM_E 836
338 342
 #endif
339 343
 
344
+// @section extras
345
+
340 346
 // Arc interpretation settings:
341 347
 #define MM_PER_ARC_SEGMENT 1
342 348
 #define N_ARC_CORRECTION 25
@@ -368,7 +374,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
368 374
 #define MAX_CMD_SIZE 96
369 375
 #define BUFSIZE 4
370 376
 
371
-// @section extras
377
+// @section fwretract
372 378
 
373 379
 // Firmware based and LCD controlled retract
374 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -405,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
405 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
406 412
  ******************************************************************************/
407 413
 
414
+// @section tmc
415
+
408 416
 //#define HAVE_TMCDRIVER
409 417
 #ifdef HAVE_TMCDRIVER
410 418
 
411
-//	#define X_IS_TMC
412
-	#define X_MAX_CURRENT 1000  //in mA
413
-	#define X_SENSE_RESISTOR 91 //in mOhms
414
-	#define X_MICROSTEPS 16     //number of microsteps
415
-	
416
-//	#define X2_IS_TMC
417
-	#define X2_MAX_CURRENT 1000  //in mA
418
-	#define X2_SENSE_RESISTOR 91 //in mOhms
419
-	#define X2_MICROSTEPS 16     //number of microsteps
420
-	
421
-//	#define Y_IS_TMC
422
-	#define Y_MAX_CURRENT 1000  //in mA
423
-	#define Y_SENSE_RESISTOR 91 //in mOhms
424
-	#define Y_MICROSTEPS 16     //number of microsteps
425
-	
426
-//	#define Y2_IS_TMC
427
-	#define Y2_MAX_CURRENT 1000  //in mA
428
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
429
-	#define Y2_MICROSTEPS 16     //number of microsteps	
430
-	
431
-//	#define Z_IS_TMC
432
-	#define Z_MAX_CURRENT 1000  //in mA
433
-	#define Z_SENSE_RESISTOR 91 //in mOhms
434
-	#define Z_MICROSTEPS 16     //number of microsteps
435
-	
436
-//	#define Z2_IS_TMC
437
-	#define Z2_MAX_CURRENT 1000  //in mA
438
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
439
-	#define Z2_MICROSTEPS 16     //number of microsteps
440
-	
441
-//	#define E0_IS_TMC
442
-	#define E0_MAX_CURRENT 1000  //in mA
443
-	#define E0_SENSE_RESISTOR 91 //in mOhms
444
-	#define E0_MICROSTEPS 16     //number of microsteps
445
-	
446
-//	#define E1_IS_TMC
447
-	#define E1_MAX_CURRENT 1000  //in mA
448
-	#define E1_SENSE_RESISTOR 91 //in mOhms
449
-	#define E1_MICROSTEPS 16     //number of microsteps	
450
-	
451
-//	#define E2_IS_TMC
452
-	#define E2_MAX_CURRENT 1000  //in mA
453
-	#define E2_SENSE_RESISTOR 91 //in mOhms
454
-	#define E2_MICROSTEPS 16     //number of microsteps	
455
-	
456
-//	#define E3_IS_TMC
457
-	#define E3_MAX_CURRENT 1000  //in mA
458
-	#define E3_SENSE_RESISTOR 91 //in mOhms
459
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
460 468
 
461 469
 #endif
462 470
 
@@ -465,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
465 473
  * you need to import the L6470 library into the arduino IDE for this
466 474
  ******************************************************************************/
467 475
 
476
+// @section l6470
477
+
468 478
 //#define HAVE_L6470DRIVER
469 479
 #ifdef HAVE_L6470DRIVER
470 480
 
471
-//	#define X_IS_L6470
472
-	#define X_MICROSTEPS 16     //number of microsteps
473
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
474
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
475
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
476
-	
477
-//	#define X2_IS_L6470
478
-	#define X2_MICROSTEPS 16     //number of microsteps
479
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
480
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
481
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
482
-	
483
-//	#define Y_IS_L6470
484
-	#define Y_MICROSTEPS 16     //number of microsteps
485
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
486
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
487
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
488
-	
489
-//	#define Y2_IS_L6470
490
-	#define Y2_MICROSTEPS 16     //number of microsteps	
491
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
494
-	
495
-//	#define Z_IS_L6470
496
-	#define Z_MICROSTEPS 16     //number of microsteps
497
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
498
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
499
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
500
-	
501
-//	#define Z2_IS_L6470
502
-	#define Z2_MICROSTEPS 16     //number of microsteps
503
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
504
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
505
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
506
-	
507
-//	#define E0_IS_L6470
508
-	#define E0_MICROSTEPS 16     //number of microsteps
509
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
510
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
511
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
512
-	
513
-//	#define E1_IS_L6470
514
-	#define E1_MICROSTEPS 16     //number of microsteps	
515
-	#define E1_MICROSTEPS 16     //number of microsteps
516
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
517
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
518
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
519
-	
520
-//	#define E2_IS_L6470
521
-	#define E2_MICROSTEPS 16     //number of microsteps	
522
-	#define E2_MICROSTEPS 16     //number of microsteps
523
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
524
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
525
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
526
-	
527
-//	#define E3_IS_L6470
528
-	#define E3_MICROSTEPS 16     //number of microsteps		
529
-	#define E3_MICROSTEPS 16     //number of microsteps
530
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
531
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
532
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
533
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
534 544
 #endif
535 545
 
536 546
 #include "Conditionals.h"

+ 16
- 4
Marlin/configurator/index.html Näytä tiedosto

@@ -30,6 +30,10 @@
30 30
         <label id="tipson"><input type="checkbox" checked /> ?</label>
31 31
         <a href="" class="download-all">Download Zip</a>
32 32
 
33
+        <fieldset id="info">
34
+          <legend>Info</legend>
35
+        </fieldset>
36
+
33 37
         <fieldset id="machine">
34 38
           <legend>Machine</legend>
35 39
 
@@ -84,12 +88,20 @@
84 88
           <legend>Bed Leveling</legend>
85 89
         </fieldset>
86 90
 
87
-        <fieldset id="extras">
88
-          <legend>Extras</legend>
91
+        <fieldset id="fwretract">
92
+          <legend>FW Retract</legend>
89 93
         </fieldset>
90 94
 
91
-        <fieldset id="info">
92
-          <legend>Info</legend>
95
+        <fieldset id="tmc">
96
+          <legend>TMC</legend>
97
+        </fieldset>
98
+
99
+        <fieldset id="l6470">
100
+          <legend>L6470</legend>
101
+        </fieldset>
102
+
103
+        <fieldset id="extras">
104
+          <legend>Extras</legend>
93 105
         </fieldset>
94 106
 
95 107
         <fieldset id="more">

+ 59
- 42
Marlin/configurator/js/configurator.js Näytä tiedosto

@@ -1268,56 +1268,73 @@ window.configuratorApp = (function(){
1268 1268
         if (info.line.search(find) >= 0)
1269 1269
           eoltip = tooltip = info.line.replace(find, '$1');
1270 1270
 
1271
-        // Get all the comments immediately before the item
1271
+        // Get all the comments immediately before the item, also include #define lines preceding it
1272 1272
         var s;
1273
-        find = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})' + info.line.regEsc(), 'g');
1273
+        // find = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})' + info.line.regEsc(), 'g');
1274
+        find = new RegExp('(([ \\t]*//+[^\n]+\n)+([ \\t]*(//)?#define[^\n]+\n)*)' + info.line.regEsc(), 'g');
1274 1275
         if (r = find.exec(txt)) {
1275
-          // Get the text of the found comments
1276
+          var temp = [], tips = [];
1277
+
1278
+          // Find each line in forward order, store in reverse
1276 1279
           find = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm');
1277
-          while((s = find.exec(r[1])) !== null) {
1278
-            var tip = s[1].replace(/[ \\t]*(={5,}|(#define[ \\t]+.*|@section[ \\t]+\w+))[ \\t]*/g, '');
1279
-            if (tip.length) {
1280
-              if (tip.match(/^#define[ \\t]/) != null) tooltip = eoltip;
1281
-              // JSON data? Save as select options
1282
-              if (!info.options && tip.match(/:[\[{]/) != null) {
1283
-                // TODO
1284
-                // :[1-6] = value limits
1285
-                var o; eval('o=' + tip.substr(1));
1286
-                info.options = o;
1287
-                if (Object.prototype.toString.call(o) == "[object Array]" && o.length == 2 && !eval(''+o[0]))
1288
-                  info.type = 'toggle';
1289
-              }
1290
-              else {
1291
-                // Other lines added to the tooltip
1292
-                tooltip += ' ' + tip + '\n';
1293
-              }
1294
-            }
1295
-          }
1296
-        }
1280
+          while((s = find.exec(r[1])) !== null) temp.unshift(s[1]);
1281
+
1282
+          console.log(name+":\n"+temp.join('\n'));
1283
+
1284
+          // Go through the reversed lines and add comment lines on
1285
+          $.each(temp, function(i,v) {
1286
+            // @ annotation breaks the comment chain
1287
+            if (v.match(/^[ \\t]*\/\/+[ \\t]*@/)) return false;
1288
+            // A #define breaks the chain, after a good tip
1289
+            if (v.match(/^[ \\t]*(\/\/+)?[ \\t]*#define/)) return (tips.length < 1);
1290
+            // Skip unwanted lines
1291
+            if (v.match(/^[ \\t]*(={5,}|#define[ \\t]+.*)/g)) return true;
1292
+            tips.unshift(v);
1293
+          });
1297 1294
 
1298
-        // Add .tooltip and .lineNum properties to the info
1299
-        find = new RegExp('^'+name); // Strip the name from the tooltip
1300
-        var lineNum = this.getLineNumberOfText(info.line, txt);
1301
-
1302
-        // See if this define is enabled conditionally
1303
-        var enable_cond = '';
1304
-        $.each(dependent_groups, function(cond,dat){
1305
-          $.each(dat, function(i,o){
1306
-            if (o.cindex == cindex && lineNum > o.start && lineNum < o.end) {
1307
-              if (enable_cond != '') enable_cond += ' && ';
1308
-              enable_cond += '(' + cond + ')';
1295
+          // Build the final tooltip, extract embedded options
1296
+          $.each(tips, function(i,tip) {
1297
+            // if (tip.match(/^#define[ \\t]/) != null) tooltip = eoltip;
1298
+            // JSON data? Save as select options
1299
+            if (!info.options && tip.match(/:[\[{]/) != null) {
1300
+              // TODO
1301
+              // :[1-6] = value limits
1302
+              var o; eval('o=' + tip.substr(1));
1303
+              info.options = o;
1304
+              if (Object.prototype.toString.call(o) == "[object Array]" && o.length == 2 && !eval(''+o[0]))
1305
+                info.type = 'toggle';
1306
+            }
1307
+            else {
1308
+              // Other lines added to the tooltip
1309
+              tooltip += ' ' + tip + '\n';
1309 1310
             }
1310 1311
           });
1311
-        });
1312 1312
 
1313
-        $.extend(info, {
1314
-          tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(find,'').toHTML(),
1315
-          lineNum: lineNum,
1316
-          switchable: (info.type != 'switch' && info.line.match(/^[ \t]*\/\//)) || false, // Disabled? Mark as "switchable"
1317
-          enabled: enable_cond ? enable_cond : 'true'
1318
-        });
1313
+          // Add .tooltip and .lineNum properties to the info
1314
+          find = new RegExp('^'+name); // Strip the name from the tooltip
1315
+          var lineNum = this.getLineNumberOfText(info.line, txt);
1316
+
1317
+          // See if this define is enabled conditionally
1318
+          var enable_cond = '';
1319
+          $.each(dependent_groups, function(cond,dat){
1320
+            $.each(dat, function(i,o){
1321
+              if (o.cindex == cindex && lineNum > o.start && lineNum < o.end) {
1322
+                if (enable_cond != '') enable_cond += ' && ';
1323
+                enable_cond += '(' + cond + ')';
1324
+              }
1325
+            });
1326
+          });
1319 1327
 
1320
-      }
1328
+          $.extend(info, {
1329
+            tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(find,'').toHTML(),
1330
+            lineNum: lineNum,
1331
+            switchable: (info.type != 'switch' && info.line.match(/^[ \t]*\/\//)) || false, // Disabled? Mark as "switchable"
1332
+            enabled: enable_cond ? enable_cond : 'true'
1333
+          });
1334
+
1335
+        } // found comments
1336
+
1337
+      } // if info.type
1321 1338
       else
1322 1339
         info = null;
1323 1340
 

+ 157
- 115
Marlin/example_configurations/Felix/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
180 194
 #define Z_HOME_BUMP_MM 3
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 836
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 4
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 157
- 115
Marlin/example_configurations/Hephestos/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 //#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
180 194
 #define Z_HOME_BUMP_MM 2
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {120*60, 120*60, 18*60, 60}  // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 100.47095761381482
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 5
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 157
- 115
Marlin/example_configurations/K8200/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
180 194
 #define Z_HOME_BUMP_MM 3
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 836
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 4
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 157
- 115
Marlin/example_configurations/SCARA/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 180.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 3
179 193
 #define Y_HOME_BUMP_MM 3
180 194
 #define Z_HOME_BUMP_MM 3
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 10*60, 60}  // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 #define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 1000
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 4
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 157
- 115
Marlin/example_configurations/WITBOX/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 //#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
180 194
 #define Z_HOME_BUMP_MM 2
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {120*60, 120*60, 18*60, 60}  // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 100.47095761381482
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 5
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 156
- 114
Marlin/example_configurations/delta/generic/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,6 +186,8 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
@@ -181,8 +195,12 @@
181 195
 #define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -242,6 +264,8 @@
242 264
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
243 265
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
244 266
 
267
+// @section lcd
268
+
245 269
 #ifdef SDSUPPORT
246 270
 
247 271
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -274,6 +298,8 @@
274 298
 
275 299
 #endif // SDSUPPORT
276 300
 
301
+// @section more
302
+
277 303
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
278 304
 //#define USE_WATCHDOG
279 305
 
@@ -287,6 +313,8 @@
287 313
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
288 314
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
289 315
 
316
+// @section lcd
317
+
290 318
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
291 319
 // it can e.g. be used to change z-positions in the print startup phase in real-time
292 320
 // does not respect endstops!
@@ -297,12 +325,14 @@
297 325
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
298 326
 #endif
299 327
 
328
+// @section extruder
329
+
300 330
 // extruder advance constant (s2/mm3)
301 331
 //
302 332
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
303 333
 //
304
-// Hooke's law says:		force = k * distance
305
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
334
+// Hooke's law says:    force = k * distance
335
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
306 336
 // so: v ^ 2 is proportional to number of steps we advance the extruder
307 337
 //#define ADVANCE
308 338
 
@@ -312,12 +342,16 @@
312 342
   #define STEPS_MM_E 836
313 343
 #endif
314 344
 
345
+// @section extras
346
+
315 347
 // Arc interpretation settings:
316 348
 #define MM_PER_ARC_SEGMENT 1
317 349
 #define N_ARC_CORRECTION 25
318 350
 
319 351
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
320 352
 
353
+// @section temperature
354
+
321 355
 // Control heater 0 and heater 1 in parallel.
322 356
 //#define HEATERS_PARALLEL
323 357
 
@@ -325,6 +359,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
325 359
 //=============================Buffers           ============================
326 360
 //===========================================================================
327 361
 
362
+// @section hidden
363
+
328 364
 // The number of linear motions that can be in the plan at any give time.
329 365
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
330 366
 #ifdef SDSUPPORT
@@ -333,11 +369,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
333 369
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
334 370
 #endif
335 371
 
372
+// @section more
336 373
 
337 374
 //The ASCII buffer for receiving from the serial:
338 375
 #define MAX_CMD_SIZE 96
339 376
 #define BUFSIZE 4
340 377
 
378
+// @section fwretract
341 379
 
342 380
 // Firmware based and LCD controlled retract
343 381
 // M207 and M208 can be used to define parameters for the retraction.
@@ -374,58 +412,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
374 412
  * you need to import the TMC26XStepper library into the arduino IDE for this
375 413
  ******************************************************************************/
376 414
 
415
+// @section tmc
416
+
377 417
 //#define HAVE_TMCDRIVER
378 418
 #ifdef HAVE_TMCDRIVER
379 419
 
380
-//	#define X_IS_TMC
381
-	#define X_MAX_CURRENT 1000  //in mA
382
-	#define X_SENSE_RESISTOR 91 //in mOhms
383
-	#define X_MICROSTEPS 16     //number of microsteps
384
-	
385
-//	#define X2_IS_TMC
386
-	#define X2_MAX_CURRENT 1000  //in mA
387
-	#define X2_SENSE_RESISTOR 91 //in mOhms
388
-	#define X2_MICROSTEPS 16     //number of microsteps
389
-	
390
-//	#define Y_IS_TMC
391
-	#define Y_MAX_CURRENT 1000  //in mA
392
-	#define Y_SENSE_RESISTOR 91 //in mOhms
393
-	#define Y_MICROSTEPS 16     //number of microsteps
394
-	
395
-//	#define Y2_IS_TMC
396
-	#define Y2_MAX_CURRENT 1000  //in mA
397
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
398
-	#define Y2_MICROSTEPS 16     //number of microsteps	
399
-	
400
-//	#define Z_IS_TMC
401
-	#define Z_MAX_CURRENT 1000  //in mA
402
-	#define Z_SENSE_RESISTOR 91 //in mOhms
403
-	#define Z_MICROSTEPS 16     //number of microsteps
404
-	
405
-//	#define Z2_IS_TMC
406
-	#define Z2_MAX_CURRENT 1000  //in mA
407
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
408
-	#define Z2_MICROSTEPS 16     //number of microsteps
409
-	
410
-//	#define E0_IS_TMC
411
-	#define E0_MAX_CURRENT 1000  //in mA
412
-	#define E0_SENSE_RESISTOR 91 //in mOhms
413
-	#define E0_MICROSTEPS 16     //number of microsteps
414
-	
415
-//	#define E1_IS_TMC
416
-	#define E1_MAX_CURRENT 1000  //in mA
417
-	#define E1_SENSE_RESISTOR 91 //in mOhms
418
-	#define E1_MICROSTEPS 16     //number of microsteps	
419
-	
420
-//	#define E2_IS_TMC
421
-	#define E2_MAX_CURRENT 1000  //in mA
422
-	#define E2_SENSE_RESISTOR 91 //in mOhms
423
-	#define E2_MICROSTEPS 16     //number of microsteps	
424
-	
425
-//	#define E3_IS_TMC
426
-	#define E3_MAX_CURRENT 1000  //in mA
427
-	#define E3_SENSE_RESISTOR 91 //in mOhms
428
-	#define E3_MICROSTEPS 16     //number of microsteps		
420
+//  #define X_IS_TMC
421
+  #define X_MAX_CURRENT 1000  //in mA
422
+  #define X_SENSE_RESISTOR 91 //in mOhms
423
+  #define X_MICROSTEPS 16     //number of microsteps
424
+  
425
+//  #define X2_IS_TMC
426
+  #define X2_MAX_CURRENT 1000  //in mA
427
+  #define X2_SENSE_RESISTOR 91 //in mOhms
428
+  #define X2_MICROSTEPS 16     //number of microsteps
429
+  
430
+//  #define Y_IS_TMC
431
+  #define Y_MAX_CURRENT 1000  //in mA
432
+  #define Y_SENSE_RESISTOR 91 //in mOhms
433
+  #define Y_MICROSTEPS 16     //number of microsteps
434
+  
435
+//  #define Y2_IS_TMC
436
+  #define Y2_MAX_CURRENT 1000  //in mA
437
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
438
+  #define Y2_MICROSTEPS 16     //number of microsteps 
439
+  
440
+//  #define Z_IS_TMC
441
+  #define Z_MAX_CURRENT 1000  //in mA
442
+  #define Z_SENSE_RESISTOR 91 //in mOhms
443
+  #define Z_MICROSTEPS 16     //number of microsteps
444
+  
445
+//  #define Z2_IS_TMC
446
+  #define Z2_MAX_CURRENT 1000  //in mA
447
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
448
+  #define Z2_MICROSTEPS 16     //number of microsteps
449
+  
450
+//  #define E0_IS_TMC
451
+  #define E0_MAX_CURRENT 1000  //in mA
452
+  #define E0_SENSE_RESISTOR 91 //in mOhms
453
+  #define E0_MICROSTEPS 16     //number of microsteps
454
+  
455
+//  #define E1_IS_TMC
456
+  #define E1_MAX_CURRENT 1000  //in mA
457
+  #define E1_SENSE_RESISTOR 91 //in mOhms
458
+  #define E1_MICROSTEPS 16     //number of microsteps 
459
+  
460
+//  #define E2_IS_TMC
461
+  #define E2_MAX_CURRENT 1000  //in mA
462
+  #define E2_SENSE_RESISTOR 91 //in mOhms
463
+  #define E2_MICROSTEPS 16     //number of microsteps 
464
+  
465
+//  #define E3_IS_TMC
466
+  #define E3_MAX_CURRENT 1000  //in mA
467
+  #define E3_SENSE_RESISTOR 91 //in mOhms
468
+  #define E3_MICROSTEPS 16     //number of microsteps   
429 469
 
430 470
 #endif
431 471
 
@@ -434,72 +474,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
434 474
  * you need to import the L6470 library into the arduino IDE for this
435 475
  ******************************************************************************/
436 476
 
477
+// @section l6470
478
+
437 479
 //#define HAVE_L6470DRIVER
438 480
 #ifdef HAVE_L6470DRIVER
439 481
 
440
-//	#define X_IS_L6470
441
-	#define X_MICROSTEPS 16     //number of microsteps
442
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
443
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
444
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
445
-	
446
-//	#define X2_IS_L6470
447
-	#define X2_MICROSTEPS 16     //number of microsteps
448
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
449
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
450
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
451
-	
452
-//	#define Y_IS_L6470
453
-	#define Y_MICROSTEPS 16     //number of microsteps
454
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
455
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
456
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
457
-	
458
-//	#define Y2_IS_L6470
459
-	#define Y2_MICROSTEPS 16     //number of microsteps	
460
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
461
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
462
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
463
-	
464
-//	#define Z_IS_L6470
465
-	#define Z_MICROSTEPS 16     //number of microsteps
466
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
467
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
468
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
469
-	
470
-//	#define Z2_IS_L6470
471
-	#define Z2_MICROSTEPS 16     //number of microsteps
472
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
473
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
474
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
475
-	
476
-//	#define E0_IS_L6470
477
-	#define E0_MICROSTEPS 16     //number of microsteps
478
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
479
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
480
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
481
-	
482
-//	#define E1_IS_L6470
483
-	#define E1_MICROSTEPS 16     //number of microsteps	
484
-	#define E1_MICROSTEPS 16     //number of microsteps
485
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
486
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
487
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
488
-	
489
-//	#define E2_IS_L6470
490
-	#define E2_MICROSTEPS 16     //number of microsteps	
491
-	#define E2_MICROSTEPS 16     //number of microsteps
492
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
493
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
494
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
495
-	
496
-//	#define E3_IS_L6470
497
-	#define E3_MICROSTEPS 16     //number of microsteps		
498
-	#define E3_MICROSTEPS 16     //number of microsteps
499
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
500
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
501
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
502
-	
482
+//  #define X_IS_L6470
483
+  #define X_MICROSTEPS 16     //number of microsteps
484
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
+  
488
+//  #define X2_IS_L6470
489
+  #define X2_MICROSTEPS 16     //number of microsteps
490
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
491
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
492
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
493
+  
494
+//  #define Y_IS_L6470
495
+  #define Y_MICROSTEPS 16     //number of microsteps
496
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
497
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
498
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
499
+  
500
+//  #define Y2_IS_L6470
501
+  #define Y2_MICROSTEPS 16     //number of microsteps 
502
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
503
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
504
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
505
+  
506
+//  #define Z_IS_L6470
507
+  #define Z_MICROSTEPS 16     //number of microsteps
508
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
509
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
510
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
511
+  
512
+//  #define Z2_IS_L6470
513
+  #define Z2_MICROSTEPS 16     //number of microsteps
514
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
515
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
516
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
517
+  
518
+//  #define E0_IS_L6470
519
+  #define E0_MICROSTEPS 16     //number of microsteps
520
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
521
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
522
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
523
+  
524
+//  #define E1_IS_L6470
525
+  #define E1_MICROSTEPS 16     //number of microsteps 
526
+  #define E1_MICROSTEPS 16     //number of microsteps
527
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
528
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
529
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
530
+  
531
+//  #define E2_IS_L6470
532
+  #define E2_MICROSTEPS 16     //number of microsteps 
533
+  #define E2_MICROSTEPS 16     //number of microsteps
534
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
535
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
536
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
537
+  
538
+//  #define E3_IS_L6470
539
+  #define E3_MICROSTEPS 16     //number of microsteps   
540
+  #define E3_MICROSTEPS 16     //number of microsteps
541
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
+  
503 545
 #endif
504 546
 
505 547
 #include "Conditionals.h"

+ 156
- 114
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,6 +186,8 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
@@ -181,8 +195,12 @@
181 195
 #define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 836
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 4
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 157
- 115
Marlin/example_configurations/makibox/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
180 194
 #define Z_HOME_BUMP_MM 2
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 836
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 4
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

+ 157
- 115
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 
4 4
 #include "Conditionals.h"
5 5
 
6
+// @section temperature
7
+
6 8
 //===========================================================================
7 9
 //=============================Thermal Settings  ============================
8 10
 //===========================================================================
@@ -46,6 +48,8 @@
46 48
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.
47 49
 //#define SHOW_TEMP_ADC_VALUES
48 50
 
51
+// @section extruder
52
+
49 53
 //  extruder run-out prevention.
50 54
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
51 55
 //#define EXTRUDER_RUNOUT_PREVENT
@@ -55,6 +59,8 @@
55 59
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
56 60
 #define EXTRUDER_RUNOUT_EXTRUDE 100
57 61
 
62
+// @section temperature
63
+
58 64
 //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
59 65
 //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
60 66
 #define TEMP_SENSOR_AD595_OFFSET 0.0
@@ -72,6 +78,8 @@
72 78
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
73 79
 //#define FAN_KICKSTART_TIME 100
74 80
 
81
+// @section extruder
82
+
75 83
 // Extruder cooling fans
76 84
 // Configure fan pin outputs to automatically turn on/off when the associated
77 85
 // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
@@ -89,8 +97,12 @@
89 97
 //=============================Mechanical Settings===========================
90 98
 //===========================================================================
91 99
 
100
+// @section homing
101
+
92 102
 #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
93 103
 
104
+// @section extras
105
+
94 106
 //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
95 107
 
96 108
 // A single Z stepper driver is usually used to drive 2 stepper motors.
@@ -174,15 +186,21 @@
174 186
 
175 187
 #endif //DUAL_X_CARRIAGE
176 188
 
189
+// @section homing
190
+
177 191
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
178 192
 #define X_HOME_BUMP_MM 5
179 193
 #define Y_HOME_BUMP_MM 5
180 194
 #define Z_HOME_BUMP_MM 1
181
-#define HOMING_BUMP_DIVISOR {10, 10, 20}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
195
+#define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
182 196
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
183 197
 
198
+// @section machine
199
+
184 200
 #define AXIS_RELATIVE_MODES {false, false, false, false}
185 201
 
202
+// @section machine
203
+
186 204
 //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
187 205
 #define INVERT_X_STEP_PIN false
188 206
 #define INVERT_Y_STEP_PIN false
@@ -195,11 +213,15 @@
195 213
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
196 214
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
197 215
 
216
+// @section lcd
217
+
198 218
 #ifdef ULTIPANEL
199 219
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
200 220
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
201 221
 #endif
202 222
 
223
+// @section extras
224
+
203 225
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
204 226
 #define DEFAULT_MINSEGMENTTIME        20000
205 227
 
@@ -241,6 +263,8 @@
241 263
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
242 264
 #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
243 265
 
266
+// @section lcd
267
+
244 268
 #ifdef SDSUPPORT
245 269
 
246 270
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
@@ -273,6 +297,8 @@
273 297
 
274 298
 #endif // SDSUPPORT
275 299
 
300
+// @section more
301
+
276 302
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
277 303
 //#define USE_WATCHDOG
278 304
 
@@ -286,6 +312,8 @@
286 312
 // Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled.
287 313
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
288 314
 
315
+// @section lcd
316
+
289 317
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
290 318
 // it can e.g. be used to change z-positions in the print startup phase in real-time
291 319
 // does not respect endstops!
@@ -296,12 +324,14 @@
296 324
   #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements
297 325
 #endif
298 326
 
327
+// @section extruder
328
+
299 329
 // extruder advance constant (s2/mm3)
300 330
 //
301 331
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2
302 332
 //
303
-// Hooke's law says:		force = k * distance
304
-// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
333
+// Hooke's law says:    force = k * distance
334
+// Bernoulli's principle says:  v ^ 2 / 2 + g . h + pressure / density = constant
305 335
 // so: v ^ 2 is proportional to number of steps we advance the extruder
306 336
 //#define ADVANCE
307 337
 
@@ -311,12 +341,16 @@
311 341
   #define STEPS_MM_E 836
312 342
 #endif
313 343
 
344
+// @section extras
345
+
314 346
 // Arc interpretation settings:
315 347
 #define MM_PER_ARC_SEGMENT 1
316 348
 #define N_ARC_CORRECTION 25
317 349
 
318 350
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
319 351
 
352
+// @section temperature
353
+
320 354
 // Control heater 0 and heater 1 in parallel.
321 355
 //#define HEATERS_PARALLEL
322 356
 
@@ -324,6 +358,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
324 358
 //=============================Buffers           ============================
325 359
 //===========================================================================
326 360
 
361
+// @section hidden
362
+
327 363
 // The number of linear motions that can be in the plan at any give time.
328 364
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
329 365
 #ifdef SDSUPPORT
@@ -332,11 +368,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
332 368
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
333 369
 #endif
334 370
 
371
+// @section more
335 372
 
336 373
 //The ASCII buffer for receiving from the serial:
337 374
 #define MAX_CMD_SIZE 96
338 375
 #define BUFSIZE 4
339 376
 
377
+// @section fwretract
340 378
 
341 379
 // Firmware based and LCD controlled retract
342 380
 // M207 and M208 can be used to define parameters for the retraction.
@@ -373,58 +411,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st
373 411
  * you need to import the TMC26XStepper library into the arduino IDE for this
374 412
  ******************************************************************************/
375 413
 
414
+// @section tmc
415
+
376 416
 //#define HAVE_TMCDRIVER
377 417
 #ifdef HAVE_TMCDRIVER
378 418
 
379
-//	#define X_IS_TMC
380
-	#define X_MAX_CURRENT 1000  //in mA
381
-	#define X_SENSE_RESISTOR 91 //in mOhms
382
-	#define X_MICROSTEPS 16     //number of microsteps
383
-	
384
-//	#define X2_IS_TMC
385
-	#define X2_MAX_CURRENT 1000  //in mA
386
-	#define X2_SENSE_RESISTOR 91 //in mOhms
387
-	#define X2_MICROSTEPS 16     //number of microsteps
388
-	
389
-//	#define Y_IS_TMC
390
-	#define Y_MAX_CURRENT 1000  //in mA
391
-	#define Y_SENSE_RESISTOR 91 //in mOhms
392
-	#define Y_MICROSTEPS 16     //number of microsteps
393
-	
394
-//	#define Y2_IS_TMC
395
-	#define Y2_MAX_CURRENT 1000  //in mA
396
-	#define Y2_SENSE_RESISTOR 91 //in mOhms
397
-	#define Y2_MICROSTEPS 16     //number of microsteps	
398
-	
399
-//	#define Z_IS_TMC
400
-	#define Z_MAX_CURRENT 1000  //in mA
401
-	#define Z_SENSE_RESISTOR 91 //in mOhms
402
-	#define Z_MICROSTEPS 16     //number of microsteps
403
-	
404
-//	#define Z2_IS_TMC
405
-	#define Z2_MAX_CURRENT 1000  //in mA
406
-	#define Z2_SENSE_RESISTOR 91 //in mOhms
407
-	#define Z2_MICROSTEPS 16     //number of microsteps
408
-	
409
-//	#define E0_IS_TMC
410
-	#define E0_MAX_CURRENT 1000  //in mA
411
-	#define E0_SENSE_RESISTOR 91 //in mOhms
412
-	#define E0_MICROSTEPS 16     //number of microsteps
413
-	
414
-//	#define E1_IS_TMC
415
-	#define E1_MAX_CURRENT 1000  //in mA
416
-	#define E1_SENSE_RESISTOR 91 //in mOhms
417
-	#define E1_MICROSTEPS 16     //number of microsteps	
418
-	
419
-//	#define E2_IS_TMC
420
-	#define E2_MAX_CURRENT 1000  //in mA
421
-	#define E2_SENSE_RESISTOR 91 //in mOhms
422
-	#define E2_MICROSTEPS 16     //number of microsteps	
423
-	
424
-//	#define E3_IS_TMC
425
-	#define E3_MAX_CURRENT 1000  //in mA
426
-	#define E3_SENSE_RESISTOR 91 //in mOhms
427
-	#define E3_MICROSTEPS 16     //number of microsteps		
419
+//  #define X_IS_TMC
420
+  #define X_MAX_CURRENT 1000  //in mA
421
+  #define X_SENSE_RESISTOR 91 //in mOhms
422
+  #define X_MICROSTEPS 16     //number of microsteps
423
+  
424
+//  #define X2_IS_TMC
425
+  #define X2_MAX_CURRENT 1000  //in mA
426
+  #define X2_SENSE_RESISTOR 91 //in mOhms
427
+  #define X2_MICROSTEPS 16     //number of microsteps
428
+  
429
+//  #define Y_IS_TMC
430
+  #define Y_MAX_CURRENT 1000  //in mA
431
+  #define Y_SENSE_RESISTOR 91 //in mOhms
432
+  #define Y_MICROSTEPS 16     //number of microsteps
433
+  
434
+//  #define Y2_IS_TMC
435
+  #define Y2_MAX_CURRENT 1000  //in mA
436
+  #define Y2_SENSE_RESISTOR 91 //in mOhms
437
+  #define Y2_MICROSTEPS 16     //number of microsteps 
438
+  
439
+//  #define Z_IS_TMC
440
+  #define Z_MAX_CURRENT 1000  //in mA
441
+  #define Z_SENSE_RESISTOR 91 //in mOhms
442
+  #define Z_MICROSTEPS 16     //number of microsteps
443
+  
444
+//  #define Z2_IS_TMC
445
+  #define Z2_MAX_CURRENT 1000  //in mA
446
+  #define Z2_SENSE_RESISTOR 91 //in mOhms
447
+  #define Z2_MICROSTEPS 16     //number of microsteps
448
+  
449
+//  #define E0_IS_TMC
450
+  #define E0_MAX_CURRENT 1000  //in mA
451
+  #define E0_SENSE_RESISTOR 91 //in mOhms
452
+  #define E0_MICROSTEPS 16     //number of microsteps
453
+  
454
+//  #define E1_IS_TMC
455
+  #define E1_MAX_CURRENT 1000  //in mA
456
+  #define E1_SENSE_RESISTOR 91 //in mOhms
457
+  #define E1_MICROSTEPS 16     //number of microsteps 
458
+  
459
+//  #define E2_IS_TMC
460
+  #define E2_MAX_CURRENT 1000  //in mA
461
+  #define E2_SENSE_RESISTOR 91 //in mOhms
462
+  #define E2_MICROSTEPS 16     //number of microsteps 
463
+  
464
+//  #define E3_IS_TMC
465
+  #define E3_MAX_CURRENT 1000  //in mA
466
+  #define E3_SENSE_RESISTOR 91 //in mOhms
467
+  #define E3_MICROSTEPS 16     //number of microsteps   
428 468
 
429 469
 #endif
430 470
 
@@ -433,72 +473,74 @@ const unsigned int dropsegments=5; //everything with less than this number of st
433 473
  * you need to import the L6470 library into the arduino IDE for this
434 474
  ******************************************************************************/
435 475
 
476
+// @section l6470
477
+
436 478
 //#define HAVE_L6470DRIVER
437 479
 #ifdef HAVE_L6470DRIVER
438 480
 
439
-//	#define X_IS_L6470
440
-	#define X_MICROSTEPS 16     //number of microsteps
441
-	#define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
442
-	#define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
443
-	#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
444
-	
445
-//	#define X2_IS_L6470
446
-	#define X2_MICROSTEPS 16     //number of microsteps
447
-	#define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
448
-	#define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
449
-	#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
450
-	
451
-//	#define Y_IS_L6470
452
-	#define Y_MICROSTEPS 16     //number of microsteps
453
-	#define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
454
-	#define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
455
-	#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
456
-	
457
-//	#define Y2_IS_L6470
458
-	#define Y2_MICROSTEPS 16     //number of microsteps	
459
-	#define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
460
-	#define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
461
-	#define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall	
462
-	
463
-//	#define Z_IS_L6470
464
-	#define Z_MICROSTEPS 16     //number of microsteps
465
-	#define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
466
-	#define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
467
-	#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
468
-	
469
-//	#define Z2_IS_L6470
470
-	#define Z2_MICROSTEPS 16     //number of microsteps
471
-	#define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
472
-	#define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
473
-	#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
474
-	
475
-//	#define E0_IS_L6470
476
-	#define E0_MICROSTEPS 16     //number of microsteps
477
-	#define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
478
-	#define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
479
-	#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
480
-	
481
-//	#define E1_IS_L6470
482
-	#define E1_MICROSTEPS 16     //number of microsteps	
483
-	#define E1_MICROSTEPS 16     //number of microsteps
484
-	#define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
485
-	#define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
486
-	#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
487
-	
488
-//	#define E2_IS_L6470
489
-	#define E2_MICROSTEPS 16     //number of microsteps	
490
-	#define E2_MICROSTEPS 16     //number of microsteps
491
-	#define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
492
-	#define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
493
-	#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
494
-	
495
-//	#define E3_IS_L6470
496
-	#define E3_MICROSTEPS 16     //number of microsteps		
497
-	#define E3_MICROSTEPS 16     //number of microsteps
498
-	#define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
499
-	#define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
500
-	#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
501
-	
481
+//  #define X_IS_L6470
482
+  #define X_MICROSTEPS 16     //number of microsteps
483
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
484
+  #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
485
+  #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
486
+  
487
+//  #define X2_IS_L6470
488
+  #define X2_MICROSTEPS 16     //number of microsteps
489
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
490
+  #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
491
+  #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
492
+  
493
+//  #define Y_IS_L6470
494
+  #define Y_MICROSTEPS 16     //number of microsteps
495
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
496
+  #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
497
+  #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
498
+  
499
+//  #define Y2_IS_L6470
500
+  #define Y2_MICROSTEPS 16     //number of microsteps 
501
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
502
+  #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
503
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
504
+  
505
+//  #define Z_IS_L6470
506
+  #define Z_MICROSTEPS 16     //number of microsteps
507
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
508
+  #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
509
+  #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
510
+  
511
+//  #define Z2_IS_L6470
512
+  #define Z2_MICROSTEPS 16     //number of microsteps
513
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
514
+  #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
515
+  #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
516
+  
517
+//  #define E0_IS_L6470
518
+  #define E0_MICROSTEPS 16     //number of microsteps
519
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
520
+  #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
521
+  #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
522
+  
523
+//  #define E1_IS_L6470
524
+  #define E1_MICROSTEPS 16     //number of microsteps 
525
+  #define E1_MICROSTEPS 16     //number of microsteps
526
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
527
+  #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
528
+  #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
529
+  
530
+//  #define E2_IS_L6470
531
+  #define E2_MICROSTEPS 16     //number of microsteps 
532
+  #define E2_MICROSTEPS 16     //number of microsteps
533
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
534
+  #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
+  #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
+  
537
+//  #define E3_IS_L6470
538
+  #define E3_MICROSTEPS 16     //number of microsteps   
539
+  #define E3_MICROSTEPS 16     //number of microsteps
540
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
+  #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
+  
502 544
 #endif
503 545
 
504 546
 #include "Conditionals.h"

Loading…
Peruuta
Tallenna