瀏覽代碼

Fix Hephestos 2 and other configs

Scott Lahteine 9 年之前
父節點
當前提交
6165fd41a5

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

731
 // http://reprap.org/wiki/Mini_panel
731
 // http://reprap.org/wiki/Mini_panel
732
 //#define MINIPANEL
732
 //#define MINIPANEL
733
 
733
 
734
+// BQ SMART FULL GRAPHIC CONTROLLER
735
+//#define BQ_LCD_SMART_CONTROLLER
736
+
734
 /**
737
 /**
735
  * I2C Panels
738
  * I2C Panels
736
  */
739
  */

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

443
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
443
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
444
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
444
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
445
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
445
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
446
-  #define RETRACT_FEEDRATE 80*60         //default feedrate for retracting (mm/s)
446
+  #define RETRACT_FEEDRATE 80            //default feedrate for retracting (mm/s)
447
   #define RETRACT_ZLIFT 0                //default retract Z-lift
447
   #define RETRACT_ZLIFT 0                //default retract Z-lift
448
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
448
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
449
   //#define RETRACT_RECOVER_LENGTH_SWAP 0  //default additional swap recover length (mm, added to retract length when recovering from extruder change)
449
   //#define RETRACT_RECOVER_LENGTH_SWAP 0  //default additional swap recover length (mm, added to retract length when recovering from extruder change)
450
-  #define RETRACT_RECOVER_FEEDRATE 8*60  //default feedrate for recovering from retraction (mm/s)
450
+  #define RETRACT_RECOVER_FEEDRATE 8     //default feedrate for recovering from retraction (mm/s)
451
 #endif
451
 #endif
452
 
452
 
453
 // Add support for experimental filament exchange support M600; requires display
453
 // Add support for experimental filament exchange support M600; requires display

+ 25
- 27
Marlin/example_configurations/Hephestos_2/Configuration.h 查看文件

179
 #define HEATER_3_MAXTEMP 275
179
 #define HEATER_3_MAXTEMP 275
180
 #define BED_MAXTEMP 150
180
 #define BED_MAXTEMP 150
181
 
181
 
182
-// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the
183
-// average current. The value should be an integer and the heat bed will be turned on for 1 interval of
184
-// HEATER_BED_DUTY_CYCLE_DIVIDER intervals.
185
-//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4
186
-
187
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
188
 //#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183
 //#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
189
 //#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
184
 //#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
248
 
243
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
244
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
245
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
246
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
252
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
247
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
253
   #define  DEFAULT_bedKp 10.00
248
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
249
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
250
   #define  DEFAULT_bedKd 305.4
256
 
251
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
252
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
253
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
254
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
255
   //#define  DEFAULT_bedKi 1.41
349
 #define Z_ENABLE_ON 0
344
 #define Z_ENABLE_ON 0
350
 #define E_ENABLE_ON 0 // For all extruders
345
 #define E_ENABLE_ON 0 // For all extruders
351
 
346
 
352
-// Disables axis when it's not being used.
347
+// Disables axis stepper immediately when it's not being used.
353
 // WARNING: When motors turn off there is a chance of losing position accuracy!
348
 // WARNING: When motors turn off there is a chance of losing position accuracy!
354
 #define DISABLE_X false
349
 #define DISABLE_X false
355
 #define DISABLE_Y false
350
 #define DISABLE_Y false
356
 #define DISABLE_Z false
351
 #define DISABLE_Z false
352
+// Warn on display about possibly reduced accuracy
353
+//#define DISABLE_REDUCED_ACCURACY_WARNING
357
 
354
 
358
 // @section extruder
355
 // @section extruder
359
 
356
 
411
 #endif
408
 #endif
412
 
409
 
413
 //===========================================================================
410
 //===========================================================================
414
-//=========================== Manual Bed Leveling ===========================
411
+//============================ Mesh Bed Leveling ============================
415
 //===========================================================================
412
 //===========================================================================
416
 
413
 
417
-//#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
418
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
414
 //#define MESH_BED_LEVELING    // Enable mesh bed leveling.
419
 
415
 
420
-#if ENABLED(MANUAL_BED_LEVELING)
421
-  #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
422
-#endif  // MANUAL_BED_LEVELING
423
-
424
 #if ENABLED(MESH_BED_LEVELING)
416
 #if ENABLED(MESH_BED_LEVELING)
425
   #define MESH_MIN_X 10
417
   #define MESH_MIN_X 10
426
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
418
   #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X)
429
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
421
   #define MESH_NUM_X_POINTS 3  // Don't use more than 7 points per axis, implementation limited.
430
   #define MESH_NUM_Y_POINTS 3
422
   #define MESH_NUM_Y_POINTS 3
431
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
423
   #define MESH_HOME_SEARCH_Z 4  // Z after Home, bed somewhere below but above 0.0.
424
+
425
+  //#define MANUAL_BED_LEVELING  // Add display menu option for bed leveling.
426
+
427
+  #if ENABLED(MANUAL_BED_LEVELING)
428
+    #define MBL_Z_STEP 0.025  // Step size while manually probing Z axis.
429
+  #endif  // MANUAL_BED_LEVELING
430
+
432
 #endif  // MESH_BED_LEVELING
431
 #endif  // MESH_BED_LEVELING
433
 
432
 
434
 //===========================================================================
433
 //===========================================================================
437
 
436
 
438
 // @section bedlevel
437
 // @section bedlevel
439
 
438
 
439
+
440
 #define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
440
 #define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line)
441
 //#define DEBUG_LEVELING_FEATURE
441
 //#define DEBUG_LEVELING_FEATURE
442
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
442
 #define Z_MIN_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
451
   //   This mode is preferred because there are more measurements.
451
   //   This mode is preferred because there are more measurements.
452
   //
452
   //
453
   // - "3-point" mode
453
   // - "3-point" mode
454
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
454
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
455
   //   You specify the XY coordinates of all 3 points.
455
   //   You specify the XY coordinates of all 3 points.
456
 
456
 
457
   // Enable this to sample the bed in a grid (least squares solution).
457
   // Enable this to sample the bed in a grid (least squares solution).
493
   #define Z_RAISE_BEFORE_HOMING 5       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
493
   #define Z_RAISE_BEFORE_HOMING 5       // (in mm) Raise Z axis before homing (G28) for Z probe clearance.
494
                                         // Be sure you have this distance over your Z_MAX_POS in case.
494
                                         // Be sure you have this distance over your Z_MAX_POS in case.
495
 
495
 
496
-  #define XY_TRAVEL_SPEED 8000          // X and Y axis travel speed between probes, in mm/min.
496
+  #define XY_TRAVEL_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
497
 
497
 
498
   #define Z_RAISE_BEFORE_PROBING 5    // How much the Z axis will be raised before traveling to the first probing point.
498
   #define Z_RAISE_BEFORE_PROBING 5    // How much the Z axis will be raised before traveling to the first probing point.
499
   #define Z_RAISE_BETWEEN_PROBINGS 1  // How much the Z axis will be raised when traveling from between next probing points.
499
   #define Z_RAISE_BETWEEN_PROBINGS 1  // How much the Z axis will be raised when traveling from between next probing points.
505
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
505
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
506
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
506
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
507
 
507
 
508
-
509
-  //If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
510
-  //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
508
+  // If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
509
+  // it is highly recommended you let this Z_SAFE_HOMING enabled!!!
511
 
510
 
512
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
511
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with Z probe outside the bed area.
513
                           // When defined, it will:
512
                           // When defined, it will:
661
 //#define ULTRA_LCD  //general LCD support, also 16x2
660
 //#define ULTRA_LCD  //general LCD support, also 16x2
662
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
661
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
663
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
662
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
664
-// Changed behaviour! If you need SDSUPPORT uncomment it!
665
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
666
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
663
+                  // Changed behaviour! If you need SDSUPPORT uncomment it!
664
+//#define SPI_SPEED SPI_HALF_SPEED // (also SPI_QUARTER_SPEED, SPI_EIGHTH_SPEED) Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
667
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
665
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
668
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
666
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
669
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
667
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
683
 
681
 
684
 // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
682
 // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
685
 // http://panucatt.com
683
 // http://panucatt.com
686
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
684
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
687
 //#define VIKI2
685
 //#define VIKI2
688
 //#define miniVIKI
686
 //#define miniVIKI
689
 
687
 
690
 // This is a new controller currently under development.  https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
688
 // This is a new controller currently under development.  https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
691
 //
689
 //
692
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
690
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
693
 //#define ELB_FULL_GRAPHIC_CONTROLLER
691
 //#define ELB_FULL_GRAPHIC_CONTROLLER
694
 //#define SD_DETECT_INVERTED
692
 //#define SD_DETECT_INVERTED
695
 
693
 
743
 //#define LCD_I2C_VIKI
741
 //#define LCD_I2C_VIKI
744
 
742
 
745
 // SSD1306 OLED generic display support
743
 // SSD1306 OLED generic display support
746
-// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
744
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
747
 //#define U8GLIB_SSD1306
745
 //#define U8GLIB_SSD1306
748
 
746
 
749
 // Shift register panels
747
 // Shift register panels
755
 
753
 
756
 // @section extras
754
 // @section extras
757
 
755
 
758
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
756
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
759
 //#define FAST_PWM_FAN
757
 //#define FAST_PWM_FAN
760
 
758
 
761
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
759
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
843
 #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75  //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software.  Used for sensor reading validation
841
 #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75  //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software.  Used for sensor reading validation
844
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
842
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
845
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
843
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
846
-#define MAX_MEASUREMENT_DELAY       20     //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM  and lower number saves RAM)
844
+#define MAX_MEASUREMENT_DELAY       20     //delay buffer size in bytes (1 byte = 1cm) - limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM  and lower number saves RAM)
847
 
845
 
848
 //defines used in the code
846
 //defines used in the code
849
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
847
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 46
- 44
Marlin/example_configurations/Hephestos_2/Configuration_adv.h 查看文件

112
 #define EXTRUDER_2_AUTO_FAN_PIN -1
112
 #define EXTRUDER_2_AUTO_FAN_PIN -1
113
 #define EXTRUDER_3_AUTO_FAN_PIN -1
113
 #define EXTRUDER_3_AUTO_FAN_PIN -1
114
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
114
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
115
-#define EXTRUDER_AUTO_FAN_SPEED       255  // == full speed
115
+#define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
116
 
116
 
117
 
117
 
118
 //===========================================================================
118
 //===========================================================================
232
 #define INVERT_E_STEP_PIN false
232
 #define INVERT_E_STEP_PIN false
233
 
233
 
234
 // Default stepper release if idle. Set to 0 to deactivate.
234
 // Default stepper release if idle. Set to 0 to deactivate.
235
+// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true.
236
+// Time can be set by M18 and M84.
235
 #define DEFAULT_STEPPER_DEACTIVE_TIME 60
237
 #define DEFAULT_STEPPER_DEACTIVE_TIME 60
238
+#define DISABLE_INACTIVE_X true
239
+#define DISABLE_INACTIVE_Y true
240
+#define DISABLE_INACTIVE_Z true  // set to false if the nozzle will fall down on your printed part when print has finished.
241
+#define DISABLE_INACTIVE_E true
236
 
242
 
237
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
243
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
238
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
244
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
341
   #define USE_SMALL_INFOFONT
347
   #define USE_SMALL_INFOFONT
342
 #endif // DOGLCD
348
 #endif // DOGLCD
343
 
349
 
350
+
344
 // @section more
351
 // @section more
345
 
352
 
346
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
353
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
347
 #define USE_WATCHDOG
354
 #define USE_WATCHDOG
348
 
355
 
349
 #if ENABLED(USE_WATCHDOG)
356
 #if ENABLED(USE_WATCHDOG)
350
-// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
351
-// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
352
-//  However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
353
-//#define WATCHDOG_RESET_MANUAL
357
+  // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
358
+  // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
359
+  //  However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
360
+  //#define WATCHDOG_RESET_MANUAL
354
 #endif
361
 #endif
355
 
362
 
356
 // @section lcd
363
 // @section lcd
361
 //#define BABYSTEPPING
368
 //#define BABYSTEPPING
362
 #if ENABLED(BABYSTEPPING)
369
 #if ENABLED(BABYSTEPPING)
363
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
370
   #define BABYSTEP_XY  //not only z, but also XY in the menu. more clutter, more functions
364
-                       //not implemented for CoreXY and deltabots!
365
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
371
   #define BABYSTEP_INVERT_Z false  //true for inverse movements in Z
366
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
372
   #define BABYSTEP_MULTIPLICATOR 1 //faster movements
367
 #endif
373
 #endif
380
 #if ENABLED(ADVANCE)
386
 #if ENABLED(ADVANCE)
381
   #define EXTRUDER_ADVANCE_K .0
387
   #define EXTRUDER_ADVANCE_K .0
382
   #define D_FILAMENT 2.85
388
   #define D_FILAMENT 2.85
383
-  #define STEPS_MM_E 836
384
 #endif
389
 #endif
385
 
390
 
386
 // @section extras
391
 // @section extras
389
 #define MM_PER_ARC_SEGMENT 1
394
 #define MM_PER_ARC_SEGMENT 1
390
 #define N_ARC_CORRECTION 25
395
 #define N_ARC_CORRECTION 25
391
 
396
 
392
-const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
397
+const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
393
 
398
 
394
 // @section temperature
399
 // @section temperature
395
 
400
 
454
     #define FILAMENTCHANGE_ZADD 10
459
     #define FILAMENTCHANGE_ZADD 10
455
     #define FILAMENTCHANGE_FIRSTRETRACT -2
460
     #define FILAMENTCHANGE_FIRSTRETRACT -2
456
     #define FILAMENTCHANGE_FINALRETRACT -100
461
     #define FILAMENTCHANGE_FINALRETRACT -100
457
-    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
462
+    #define AUTO_FILAMENT_CHANGE                //This extrudes filament until you press the button on LCD
458
     #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
463
     #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
459
     #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
464
     #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
460
   #endif
465
   #endif
462
 
467
 
463
 /******************************************************************************\
468
 /******************************************************************************\
464
  * enable this section if you have TMC26X motor drivers.
469
  * enable this section if you have TMC26X motor drivers.
465
- * you need to import the TMC26XStepper library into the arduino IDE for this
470
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
466
  ******************************************************************************/
471
  ******************************************************************************/
467
 
472
 
468
 // @section tmc
473
 // @section tmc
470
 //#define HAVE_TMCDRIVER
475
 //#define HAVE_TMCDRIVER
471
 #if ENABLED(HAVE_TMCDRIVER)
476
 #if ENABLED(HAVE_TMCDRIVER)
472
 
477
 
473
-//#define X_IS_TMC
478
+  //#define X_IS_TMC
474
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
475
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
476
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
477
 
482
 
478
-//#define X2_IS_TMC
483
+  //#define X2_IS_TMC
479
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
480
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
481
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
482
 
487
 
483
-//#define Y_IS_TMC
488
+  //#define Y_IS_TMC
484
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
485
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
486
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
487
 
492
 
488
-//#define Y2_IS_TMC
493
+  //#define Y2_IS_TMC
489
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
490
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
491
   #define Y2_MICROSTEPS 16     //number of microsteps
496
   #define Y2_MICROSTEPS 16     //number of microsteps
492
 
497
 
493
-//#define Z_IS_TMC
498
+  //#define Z_IS_TMC
494
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
495
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
496
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
497
 
502
 
498
-//#define Z2_IS_TMC
503
+  //#define Z2_IS_TMC
499
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
500
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
501
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
502
 
507
 
503
-//#define E0_IS_TMC
508
+  //#define E0_IS_TMC
504
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
505
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
506
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
507
 
512
 
508
-//#define E1_IS_TMC
513
+  //#define E1_IS_TMC
509
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
510
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
511
   #define E1_MICROSTEPS 16     //number of microsteps
516
   #define E1_MICROSTEPS 16     //number of microsteps
512
 
517
 
513
-//#define E2_IS_TMC
518
+  //#define E2_IS_TMC
514
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
515
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
516
   #define E2_MICROSTEPS 16     //number of microsteps
521
   #define E2_MICROSTEPS 16     //number of microsteps
517
 
522
 
518
-//#define E3_IS_TMC
523
+  //#define E3_IS_TMC
519
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
520
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
521
   #define E3_MICROSTEPS 16     //number of microsteps
526
   #define E3_MICROSTEPS 16     //number of microsteps
524
 
529
 
525
 /******************************************************************************\
530
 /******************************************************************************\
526
  * enable this section if you have L6470  motor drivers.
531
  * enable this section if you have L6470  motor drivers.
527
- * you need to import the L6470 library into the arduino IDE for this
532
+ * you need to import the L6470 library into the Arduino IDE for this
528
  ******************************************************************************/
533
  ******************************************************************************/
529
 
534
 
530
 // @section l6470
535
 // @section l6470
532
 //#define HAVE_L6470DRIVER
537
 //#define HAVE_L6470DRIVER
533
 #if ENABLED(HAVE_L6470DRIVER)
538
 #if ENABLED(HAVE_L6470DRIVER)
534
 
539
 
535
-//#define X_IS_L6470
540
+  //#define X_IS_L6470
536
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
537
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
538
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
 
545
 
541
-//#define X2_IS_L6470
546
+  //#define X2_IS_L6470
542
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
543
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
544
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
 
551
 
547
-//#define Y_IS_L6470
552
+  //#define Y_IS_L6470
548
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
549
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
550
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
 
557
 
553
-//#define Y2_IS_L6470
558
+  //#define Y2_IS_L6470
554
   #define Y2_MICROSTEPS 16     //number of microsteps
559
   #define Y2_MICROSTEPS 16     //number of microsteps
555
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
556
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
 
563
 
559
-//#define Z_IS_L6470
564
+  //#define Z_IS_L6470
560
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
561
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
562
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
 
569
 
565
-//#define Z2_IS_L6470
570
+  //#define Z2_IS_L6470
566
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
567
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
568
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
 
575
 
571
-//#define E0_IS_L6470
576
+  //#define E0_IS_L6470
572
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
573
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
574
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
 
581
 
577
-//#define E1_IS_L6470
578
-  #define E1_MICROSTEPS 16     //number of microsteps
582
+  //#define E1_IS_L6470
579
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
580
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
581
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
 
587
 
584
-//#define E2_IS_L6470
588
+  //#define E2_IS_L6470
585
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
586
-  #define E2_MICROSTEPS 16     //number of microsteps
587
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
588
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
 
593
 
591
-//#define E3_IS_L6470
592
-  #define E3_MICROSTEPS 16     //number of microsteps
594
+  //#define E3_IS_L6470
593
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
594
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
595
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
 
599
 

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

443
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
443
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
444
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
444
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
445
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
445
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
446
-  #define RETRACT_FEEDRATE 80*60            //default feedrate for retracting (mm/s)
446
+  #define RETRACT_FEEDRATE 80            //default feedrate for retracting (mm/s)
447
   #define RETRACT_ZLIFT 0                //default retract Z-lift
447
   #define RETRACT_ZLIFT 0                //default retract Z-lift
448
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
448
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
449
   //#define RETRACT_RECOVER_LENGTH_SWAP 0  //default additional swap recover length (mm, added to retract length when recovering from extruder change)
449
   //#define RETRACT_RECOVER_LENGTH_SWAP 0  //default additional swap recover length (mm, added to retract length when recovering from extruder change)
450
-  #define RETRACT_RECOVER_FEEDRATE 8*60     //default feedrate for recovering from retraction (mm/s)
450
+  #define RETRACT_RECOVER_FEEDRATE 8     //default feedrate for recovering from retraction (mm/s)
451
 #endif
451
 #endif
452
 
452
 
453
 // Add support for experimental filament exchange support M600; requires display
453
 // Add support for experimental filament exchange support M600; requires display

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

444
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
444
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
445
   #define RETRACT_LENGTH 5               //default retract length (positive mm)
445
   #define RETRACT_LENGTH 5               //default retract length (positive mm)
446
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
446
   #define RETRACT_LENGTH_SWAP 13         //default swap retract length (positive mm), for extruder change
447
-  #define RETRACT_FEEDRATE 100            //default feedrate for retracting (mm/s)
447
+  #define RETRACT_FEEDRATE 100           //default feedrate for retracting (mm/s)
448
   #define RETRACT_ZLIFT 0                //default retract Z-lift
448
   #define RETRACT_ZLIFT 0                //default retract Z-lift
449
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
449
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
450
   #define RETRACT_RECOVER_LENGTH_SWAP 0  //default additional swap recover length (mm, added to retract length when recovering from extruder change)
450
   #define RETRACT_RECOVER_LENGTH_SWAP 0  //default additional swap recover length (mm, added to retract length when recovering from extruder change)
451
-  #define RETRACT_RECOVER_FEEDRATE 100     //default feedrate for recovering from retraction (mm/s)
451
+  #define RETRACT_RECOVER_FEEDRATE 100   //default feedrate for recovering from retraction (mm/s)
452
 #endif
452
 #endif
453
 
453
 
454
 // Add support for experimental filament exchange support M600; requires display
454
 // Add support for experimental filament exchange support M600; requires display

+ 0
- 5
Marlin/example_configurations/delta/kossel_xl/Configuration.h 查看文件

201
 #define HEATER_3_MAXTEMP 275
201
 #define HEATER_3_MAXTEMP 275
202
 #define BED_MAXTEMP 150
202
 #define BED_MAXTEMP 150
203
 
203
 
204
-// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the
205
-// average current. The value should be an integer and the heat bed will be turned on for 1 interval of
206
-// HEATER_BED_DUTY_CYCLE_DIVIDER intervals.
207
-//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4
208
-
209
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
204
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
210
 //#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
205
 //#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
211
 //#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
206
 //#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R

Loading…
取消
儲存