Browse Source

Various minor spelling corrections

Redo of #2939 rebased against RCBugFix
Scott Lahteine 8 years ago
parent
commit
772460a7b8
40 changed files with 272 additions and 272 deletions
  1. 1
    1
      Marlin/Conditionals.h
  2. 5
    5
      Marlin/Configuration.h
  3. 12
    12
      Marlin/Configuration_adv.h
  4. 5
    5
      Marlin/Makefile
  5. 2
    2
      Marlin/Marlin.h
  6. 3
    3
      Marlin/example_configurations/Felix/Configuration.h
  7. 3
    3
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  8. 12
    12
      Marlin/example_configurations/Felix/Configuration_adv.h
  9. 5
    5
      Marlin/example_configurations/Hephestos/Configuration.h
  10. 12
    12
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  11. 5
    5
      Marlin/example_configurations/K8200/Configuration.h
  12. 12
    12
      Marlin/example_configurations/K8200/Configuration_adv.h
  13. 5
    5
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 3
    3
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 12
    12
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  16. 3
    3
      Marlin/example_configurations/SCARA/Configuration.h
  17. 12
    12
      Marlin/example_configurations/SCARA/Configuration_adv.h
  18. 5
    5
      Marlin/example_configurations/TAZ4/Configuration.h
  19. 12
    12
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  20. 5
    5
      Marlin/example_configurations/WITBOX/Configuration.h
  21. 12
    12
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  22. 5
    5
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  23. 5
    5
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  24. 12
    12
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  25. 5
    5
      Marlin/example_configurations/delta/generic/Configuration.h
  26. 12
    12
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  27. 5
    5
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  28. 12
    12
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  29. 3
    3
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  30. 12
    12
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  31. 5
    5
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  32. 12
    12
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  33. 5
    5
      Marlin/example_configurations/makibox/Configuration.h
  34. 12
    12
      Marlin/example_configurations/makibox/Configuration_adv.h
  35. 5
    5
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  36. 12
    12
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  37. 1
    1
      Marlin/language_cn.h
  38. 1
    1
      Marlin/language_en.h
  39. 1
    1
      Marlin/language_test.h
  40. 1
    1
      Marlin/planner.cpp

+ 1
- 1
Marlin/Conditionals.h View File

135
   // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
135
   // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
136
 
136
 
137
   #if ENABLED(SAV_3DLCD)
137
   #if ENABLED(SAV_3DLCD)
138
-    #define SR_LCD_2W_NL    // Non latching 2 wire shiftregister
138
+    #define SR_LCD_2W_NL    // Non latching 2 wire shift register
139
     #define ULTIPANEL
139
     #define ULTIPANEL
140
     #define NEWPANEL
140
     #define NEWPANEL
141
   #endif
141
   #endif

+ 5
- 5
Marlin/Configuration.h View File

248
 
248
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
250
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
251
+  //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)
252
   //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
253
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
254
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
255
   #define  DEFAULT_bedKd 305.4
256
 
256
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
258
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
259
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
260
   //#define  DEFAULT_bedKi 1.41
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).
751
 
751
 
752
 // @section extras
752
 // @section extras
753
 
753
 
754
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
754
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
755
 //#define FAST_PWM_FAN
755
 //#define FAST_PWM_FAN
756
 
756
 
757
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
757
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
839
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
839
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
840
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
840
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
841
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
841
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
842
-#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)
842
+#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)
843
 
843
 
844
 //defines used in the code
844
 //defines used in the code
845
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
845
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/Configuration_adv.h View File

461
 
461
 
462
 /******************************************************************************\
462
 /******************************************************************************\
463
  * enable this section if you have TMC26X motor drivers.
463
  * enable this section if you have TMC26X motor drivers.
464
- * you need to import the TMC26XStepper library into the arduino IDE for this
464
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
465
  ******************************************************************************/
465
  ******************************************************************************/
466
 
466
 
467
 // @section tmc
467
 // @section tmc
523
 
523
 
524
 /******************************************************************************\
524
 /******************************************************************************\
525
  * enable this section if you have L6470  motor drivers.
525
  * enable this section if you have L6470  motor drivers.
526
- * you need to import the L6470 library into the arduino IDE for this
526
+ * you need to import the L6470 library into the Arduino IDE for this
527
  ******************************************************************************/
527
  ******************************************************************************/
528
 
528
 
529
 // @section l6470
529
 // @section l6470
533
 
533
 
534
   //#define X_IS_L6470
534
   //#define X_IS_L6470
535
   #define X_MICROSTEPS 16     //number of microsteps
535
   #define X_MICROSTEPS 16     //number of microsteps
536
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
536
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
537
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
537
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
538
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
538
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
539
 
539
 
540
   //#define X2_IS_L6470
540
   //#define X2_IS_L6470
541
   #define X2_MICROSTEPS 16     //number of microsteps
541
   #define X2_MICROSTEPS 16     //number of microsteps
542
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
543
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
 
545
 
546
   //#define Y_IS_L6470
546
   //#define Y_IS_L6470
547
   #define Y_MICROSTEPS 16     //number of microsteps
547
   #define Y_MICROSTEPS 16     //number of microsteps
548
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
549
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
 
551
 
552
   //#define Y2_IS_L6470
552
   //#define Y2_IS_L6470
553
   #define Y2_MICROSTEPS 16     //number of microsteps
553
   #define Y2_MICROSTEPS 16     //number of microsteps
554
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
555
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
 
557
 
558
   //#define Z_IS_L6470
558
   //#define Z_IS_L6470
559
   #define Z_MICROSTEPS 16     //number of microsteps
559
   #define Z_MICROSTEPS 16     //number of microsteps
560
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
561
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
 
563
 
564
   //#define Z2_IS_L6470
564
   //#define Z2_IS_L6470
565
   #define Z2_MICROSTEPS 16     //number of microsteps
565
   #define Z2_MICROSTEPS 16     //number of microsteps
566
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
567
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
 
569
 
570
   //#define E0_IS_L6470
570
   //#define E0_IS_L6470
571
   #define E0_MICROSTEPS 16     //number of microsteps
571
   #define E0_MICROSTEPS 16     //number of microsteps
572
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
573
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
 
575
 
576
   //#define E1_IS_L6470
576
   //#define E1_IS_L6470
577
   #define E1_MICROSTEPS 16     //number of microsteps
577
   #define E1_MICROSTEPS 16     //number of microsteps
578
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
579
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
 
581
 
582
   //#define E2_IS_L6470
582
   //#define E2_IS_L6470
583
   #define E2_MICROSTEPS 16     //number of microsteps
583
   #define E2_MICROSTEPS 16     //number of microsteps
584
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
584
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
585
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
 
587
 
588
   //#define E3_IS_L6470
588
   //#define E3_IS_L6470
589
   #define E3_MICROSTEPS 16     //number of microsteps
589
   #define E3_MICROSTEPS 16     //number of microsteps
590
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
590
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
591
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
 
593
 

+ 5
- 5
Marlin/Makefile View File

12
 #
12
 #
13
 # Detailed instructions for using the makefile:
13
 # Detailed instructions for using the makefile:
14
 #
14
 #
15
-#  1. Modify the line containg "ARDUINO_INSTALL_DIR" to point to the directory that
15
+#  1. Modify the line containing "ARDUINO_INSTALL_DIR" to point to the directory that
16
 #     contains the Arduino installation (for example, under Mac OS X, this
16
 #     contains the Arduino installation (for example, under Mac OS X, this
17
 #     might be /Applications/Arduino.app/Contents/Resources/Java).
17
 #     might be /Applications/Arduino.app/Contents/Resources/Java).
18
 #
18
 #
19
 #  2. Modify the line containing "UPLOAD_PORT" to refer to the filename
19
 #  2. Modify the line containing "UPLOAD_PORT" to refer to the filename
20
 #     representing the USB or serial connection to your Arduino board
20
 #     representing the USB or serial connection to your Arduino board
21
 #     (e.g. UPLOAD_PORT = /dev/tty.USB0).  If the exact name of this file
21
 #     (e.g. UPLOAD_PORT = /dev/tty.USB0).  If the exact name of this file
22
-#     changes, you can use * as a wildcard (e.g. UPLOAD_PORT = /dev/tty.usb*).
22
+#     changes, you can use * as a wild card (e.g. UPLOAD_PORT = /dev/tty.usb*).
23
 #
23
 #
24
 #  3. Set the line containing "MCU" to match your board's processor.
24
 #  3. Set the line containing "MCU" to match your board's processor.
25
 #     Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
25
 #     Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
218
 # Set to 16Mhz if not yet set.
218
 # Set to 16Mhz if not yet set.
219
 F_CPU ?= 16000000
219
 F_CPU ?= 16000000
220
 
220
 
221
-# Arduino containd the main source code for the Arduino
221
+# Arduino contained the main source code for the Arduino
222
 # Libraries, the "hardware variant" are for boards
222
 # Libraries, the "hardware variant" are for boards
223
 # that derives from that, and their source are present in
223
 # that derives from that, and their source are present in
224
 # the main Marlin source directory
224
 # the main Marlin source directory
300
 CXXSRC += Wire.cpp
300
 CXXSRC += Wire.cpp
301
 endif
301
 endif
302
 
302
 
303
-#Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
303
+#Check for Arduino 1.0.0 or higher and use the correct source files for that version
304
 ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
304
 ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
305
 CXXSRC += main.cpp
305
 CXXSRC += main.cpp
306
 else
306
 else
421
 sym: $(BUILD_DIR)/$(TARGET).sym
421
 sym: $(BUILD_DIR)/$(TARGET).sym
422
 
422
 
423
 # Program the device.
423
 # Program the device.
424
-# Do not try to reset an arduino if it's not one
424
+# Do not try to reset an Arduino if it's not one
425
 upload: $(BUILD_DIR)/$(TARGET).hex
425
 upload: $(BUILD_DIR)/$(TARGET).hex
426
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
426
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
427
 	stty hup < $(UPLOAD_PORT); true
427
 	stty hup < $(UPLOAD_PORT); true

+ 2
- 2
Marlin/Marlin.h View File

6
 
6
 
7
 #define  FORCE_INLINE __attribute__((always_inline)) inline
7
 #define  FORCE_INLINE __attribute__((always_inline)) inline
8
 /**
8
 /**
9
- * Compiler warning on unused varable.
9
+ * Compiler warning on unused variable.
10
  */
10
  */
11
 #define UNUSED(x) (void) (x)
11
 #define UNUSED(x) (void) (x)
12
 
12
 
320
 #endif
320
 #endif
321
 
321
 
322
 #if ENABLED(FILAMENT_SENSOR)
322
 #if ENABLED(FILAMENT_SENSOR)
323
-  extern float filament_width_nominal;  //holds the theoretical filament diameter ie., 3.00 or 1.75
323
+  extern float filament_width_nominal;  //holds the theoretical filament diameter i.e., 3.00 or 1.75
324
   extern bool filament_sensor;  //indicates that filament sensor readings should control extrusion
324
   extern bool filament_sensor;  //indicates that filament sensor readings should control extrusion
325
   extern float filament_width_meas; //holds the filament diameter as accurately measured
325
   extern float filament_width_meas; //holds the filament diameter as accurately measured
326
   extern signed char measurement_delay[];  //ring buffer to delay measurement
326
   extern signed char measurement_delay[];  //ring buffer to delay measurement

+ 3
- 3
Marlin/example_configurations/Felix/Configuration.h View File

433
   //   This mode is preferred because there are more measurements.
433
   //   This mode is preferred because there are more measurements.
434
   //
434
   //
435
   // - "3-point" mode
435
   // - "3-point" mode
436
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
436
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
437
   //   You specify the XY coordinates of all 3 points.
437
   //   You specify the XY coordinates of all 3 points.
438
 
438
 
439
   // Enable this to sample the bed in a grid (least squares solution).
439
   // Enable this to sample the bed in a grid (least squares solution).
733
 
733
 
734
 // @section extras
734
 // @section extras
735
 
735
 
736
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
736
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
737
 #define FAST_PWM_FAN
737
 #define FAST_PWM_FAN
738
 
738
 
739
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
739
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
821
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
821
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
822
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
822
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
823
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
823
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
824
-#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)
824
+#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)
825
 
825
 
826
 //defines used in the code
826
 //defines used in the code
827
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
827
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 3
- 3
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

404
   //   This mode is preferred because there are more measurements.
404
   //   This mode is preferred because there are more measurements.
405
   //
405
   //
406
   // - "3-point" mode
406
   // - "3-point" mode
407
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
407
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
408
   //   You specify the XY coordinates of all 3 points.
408
   //   You specify the XY coordinates of all 3 points.
409
 
409
 
410
   // Enable this to sample the bed in a grid (least squares solution).
410
   // Enable this to sample the bed in a grid (least squares solution).
697
 
697
 
698
 //#define SAV_3DLCD
698
 //#define SAV_3DLCD
699
 
699
 
700
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
700
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
701
 #define FAST_PWM_FAN
701
 #define FAST_PWM_FAN
702
 
702
 
703
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
703
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
785
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
785
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
786
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
786
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
787
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
787
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
788
-#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)
788
+#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)
789
 
789
 
790
 //defines used in the code
790
 //defines used in the code
791
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
791
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/Felix/Configuration_adv.h View File

458
 
458
 
459
 /******************************************************************************\
459
 /******************************************************************************\
460
  * enable this section if you have TMC26X motor drivers.
460
  * enable this section if you have TMC26X motor drivers.
461
- * you need to import the TMC26XStepper library into the arduino IDE for this
461
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
462
  ******************************************************************************/
462
  ******************************************************************************/
463
 
463
 
464
 // @section tmc
464
 // @section tmc
520
 
520
 
521
 /******************************************************************************\
521
 /******************************************************************************\
522
  * enable this section if you have L6470  motor drivers.
522
  * enable this section if you have L6470  motor drivers.
523
- * you need to import the L6470 library into the arduino IDE for this
523
+ * you need to import the L6470 library into the Arduino IDE for this
524
  ******************************************************************************/
524
  ******************************************************************************/
525
 
525
 
526
 // @section l6470
526
 // @section l6470
530
 
530
 
531
   //#define X_IS_L6470
531
   //#define X_IS_L6470
532
   #define X_MICROSTEPS 16     //number of microsteps
532
   #define X_MICROSTEPS 16     //number of microsteps
533
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
533
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
 
536
 
537
   //#define X2_IS_L6470
537
   //#define X2_IS_L6470
538
   #define X2_MICROSTEPS 16     //number of microsteps
538
   #define X2_MICROSTEPS 16     //number of microsteps
539
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
539
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
 
542
 
543
   //#define Y_IS_L6470
543
   //#define Y_IS_L6470
544
   #define Y_MICROSTEPS 16     //number of microsteps
544
   #define Y_MICROSTEPS 16     //number of microsteps
545
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
 
548
 
549
   //#define Y2_IS_L6470
549
   //#define Y2_IS_L6470
550
   #define Y2_MICROSTEPS 16     //number of microsteps
550
   #define Y2_MICROSTEPS 16     //number of microsteps
551
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
 
554
 
555
   //#define Z_IS_L6470
555
   //#define Z_IS_L6470
556
   #define Z_MICROSTEPS 16     //number of microsteps
556
   #define Z_MICROSTEPS 16     //number of microsteps
557
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
 
560
 
561
   //#define Z2_IS_L6470
561
   //#define Z2_IS_L6470
562
   #define Z2_MICROSTEPS 16     //number of microsteps
562
   #define Z2_MICROSTEPS 16     //number of microsteps
563
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
 
566
 
567
   //#define E0_IS_L6470
567
   //#define E0_IS_L6470
568
   #define E0_MICROSTEPS 16     //number of microsteps
568
   #define E0_MICROSTEPS 16     //number of microsteps
569
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
 
572
 
573
   //#define E1_IS_L6470
573
   //#define E1_IS_L6470
574
   #define E1_MICROSTEPS 16     //number of microsteps
574
   #define E1_MICROSTEPS 16     //number of microsteps
575
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
 
578
 
579
   //#define E2_IS_L6470
579
   //#define E2_IS_L6470
580
   #define E2_MICROSTEPS 16     //number of microsteps
580
   #define E2_MICROSTEPS 16     //number of microsteps
581
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
 
584
 
585
   //#define E3_IS_L6470
585
   //#define E3_IS_L6470
586
   #define E3_MICROSTEPS 16     //number of microsteps
586
   #define E3_MICROSTEPS 16     //number of microsteps
587
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
 
590
 

+ 5
- 5
Marlin/example_configurations/Hephestos/Configuration.h View File

240
 
240
 
241
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
241
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
242
 
242
 
243
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
243
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
244
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
244
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
245
   #define  DEFAULT_bedKp 10.00
245
   #define  DEFAULT_bedKp 10.00
246
   #define  DEFAULT_bedKi .023
246
   #define  DEFAULT_bedKi .023
247
   #define  DEFAULT_bedKd 305.4
247
   #define  DEFAULT_bedKd 305.4
248
 
248
 
249
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
249
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
250
   //from pidautotune
250
   //from pidautotune
251
   //#define  DEFAULT_bedKp 97.1
251
   //#define  DEFAULT_bedKp 97.1
252
   //#define  DEFAULT_bedKi 1.41
252
   //#define  DEFAULT_bedKi 1.41
444
   //   This mode is preferred because there are more measurements.
444
   //   This mode is preferred because there are more measurements.
445
   //
445
   //
446
   // - "3-point" mode
446
   // - "3-point" mode
447
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
447
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
448
   //   You specify the XY coordinates of all 3 points.
448
   //   You specify the XY coordinates of all 3 points.
449
 
449
 
450
   // Enable this to sample the bed in a grid (least squares solution).
450
   // Enable this to sample the bed in a grid (least squares solution).
743
 
743
 
744
 // @section extras
744
 // @section extras
745
 
745
 
746
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
746
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
747
 //#define FAST_PWM_FAN
747
 //#define FAST_PWM_FAN
748
 
748
 
749
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
749
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
831
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
831
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
832
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
832
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
833
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
833
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
834
-#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)
834
+#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)
835
 
835
 
836
 //defines used in the code
836
 //defines used in the code
837
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
837
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

458
 
458
 
459
 /******************************************************************************\
459
 /******************************************************************************\
460
  * enable this section if you have TMC26X motor drivers.
460
  * enable this section if you have TMC26X motor drivers.
461
- * you need to import the TMC26XStepper library into the arduino IDE for this
461
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
462
  ******************************************************************************/
462
  ******************************************************************************/
463
 
463
 
464
 // @section tmc
464
 // @section tmc
520
 
520
 
521
 /******************************************************************************\
521
 /******************************************************************************\
522
  * enable this section if you have L6470  motor drivers.
522
  * enable this section if you have L6470  motor drivers.
523
- * you need to import the L6470 library into the arduino IDE for this
523
+ * you need to import the L6470 library into the Arduino IDE for this
524
  ******************************************************************************/
524
  ******************************************************************************/
525
 
525
 
526
 // @section l6470
526
 // @section l6470
530
 
530
 
531
   //#define X_IS_L6470
531
   //#define X_IS_L6470
532
   #define X_MICROSTEPS 16     //number of microsteps
532
   #define X_MICROSTEPS 16     //number of microsteps
533
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
533
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
 
536
 
537
   //#define X2_IS_L6470
537
   //#define X2_IS_L6470
538
   #define X2_MICROSTEPS 16     //number of microsteps
538
   #define X2_MICROSTEPS 16     //number of microsteps
539
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
539
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
 
542
 
543
   //#define Y_IS_L6470
543
   //#define Y_IS_L6470
544
   #define Y_MICROSTEPS 16     //number of microsteps
544
   #define Y_MICROSTEPS 16     //number of microsteps
545
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
 
548
 
549
   //#define Y2_IS_L6470
549
   //#define Y2_IS_L6470
550
   #define Y2_MICROSTEPS 16     //number of microsteps
550
   #define Y2_MICROSTEPS 16     //number of microsteps
551
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
 
554
 
555
   //#define Z_IS_L6470
555
   //#define Z_IS_L6470
556
   #define Z_MICROSTEPS 16     //number of microsteps
556
   #define Z_MICROSTEPS 16     //number of microsteps
557
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
 
560
 
561
   //#define Z2_IS_L6470
561
   //#define Z2_IS_L6470
562
   #define Z2_MICROSTEPS 16     //number of microsteps
562
   #define Z2_MICROSTEPS 16     //number of microsteps
563
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
 
566
 
567
   //#define E0_IS_L6470
567
   //#define E0_IS_L6470
568
   #define E0_MICROSTEPS 16     //number of microsteps
568
   #define E0_MICROSTEPS 16     //number of microsteps
569
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
 
572
 
573
   //#define E1_IS_L6470
573
   //#define E1_IS_L6470
574
   #define E1_MICROSTEPS 16     //number of microsteps
574
   #define E1_MICROSTEPS 16     //number of microsteps
575
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
 
578
 
579
   //#define E2_IS_L6470
579
   //#define E2_IS_L6470
580
   #define E2_MICROSTEPS 16     //number of microsteps
580
   #define E2_MICROSTEPS 16     //number of microsteps
581
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
 
584
 
585
   //#define E3_IS_L6470
585
   //#define E3_IS_L6470
586
   #define E3_MICROSTEPS 16     //number of microsteps
586
   #define E3_MICROSTEPS 16     //number of microsteps
587
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
 
590
 

+ 5
- 5
Marlin/example_configurations/K8200/Configuration.h View File

257
 
257
 
258
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
258
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
259
 
259
 
260
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
261
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
261
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
262
   //#define  DEFAULT_bedKp 10.00
262
   //#define  DEFAULT_bedKp 10.00
263
   //#define  DEFAULT_bedKi .023
263
   //#define  DEFAULT_bedKi .023
264
   //#define  DEFAULT_bedKd 305.4
264
   //#define  DEFAULT_bedKd 305.4
265
 
265
 
266
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
266
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
267
   //from pidautotune
267
   //from pidautotune
268
   //#define  DEFAULT_bedKp 97.1
268
   //#define  DEFAULT_bedKp 97.1
269
   //#define  DEFAULT_bedKi 1.41
269
   //#define  DEFAULT_bedKi 1.41
466
   //   This mode is preferred because there are more measurements.
466
   //   This mode is preferred because there are more measurements.
467
   //
467
   //
468
   // - "3-point" mode
468
   // - "3-point" mode
469
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
469
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
470
   //   You specify the XY coordinates of all 3 points.
470
   //   You specify the XY coordinates of all 3 points.
471
 
471
 
472
   // Enable this to sample the bed in a grid (least squares solution).
472
   // Enable this to sample the bed in a grid (least squares solution).
767
 
767
 
768
 // @section extras
768
 // @section extras
769
 
769
 
770
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
770
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
771
 //#define FAST_PWM_FAN
771
 //#define FAST_PWM_FAN
772
 
772
 
773
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
773
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
855
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
855
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
856
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
856
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
857
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
857
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
858
-#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)
858
+#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)
859
 
859
 
860
 //defines used in the code
860
 //defines used in the code
861
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
861
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/K8200/Configuration_adv.h View File

466
 
466
 
467
 /******************************************************************************\
467
 /******************************************************************************\
468
  * enable this section if you have TMC26X motor drivers.
468
  * enable this section if you have TMC26X motor drivers.
469
- * you need to import the TMC26XStepper library into the arduino IDE for this
469
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
470
  ******************************************************************************/
470
  ******************************************************************************/
471
 
471
 
472
 // @section tmc
472
 // @section tmc
528
 
528
 
529
 /******************************************************************************\
529
 /******************************************************************************\
530
  * enable this section if you have L6470  motor drivers.
530
  * enable this section if you have L6470  motor drivers.
531
- * you need to import the L6470 library into the arduino IDE for this
531
+ * you need to import the L6470 library into the Arduino IDE for this
532
  ******************************************************************************/
532
  ******************************************************************************/
533
 
533
 
534
 // @section l6470
534
 // @section l6470
538
 
538
 
539
   //#define X_IS_L6470
539
   //#define X_IS_L6470
540
   #define X_MICROSTEPS 16     //number of microsteps
540
   #define X_MICROSTEPS 16     //number of microsteps
541
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
541
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
542
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
 
544
 
545
   //#define X2_IS_L6470
545
   //#define X2_IS_L6470
546
   #define X2_MICROSTEPS 16     //number of microsteps
546
   #define X2_MICROSTEPS 16     //number of microsteps
547
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
547
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
548
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
548
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
549
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
 
550
 
551
   //#define Y_IS_L6470
551
   //#define Y_IS_L6470
552
   #define Y_MICROSTEPS 16     //number of microsteps
552
   #define Y_MICROSTEPS 16     //number of microsteps
553
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
553
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
554
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
554
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
555
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
 
556
 
557
   //#define Y2_IS_L6470
557
   //#define Y2_IS_L6470
558
   #define Y2_MICROSTEPS 16     //number of microsteps
558
   #define Y2_MICROSTEPS 16     //number of microsteps
559
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
559
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
560
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
560
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
561
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
 
562
 
563
   //#define Z_IS_L6470
563
   //#define Z_IS_L6470
564
   #define Z_MICROSTEPS 16     //number of microsteps
564
   #define Z_MICROSTEPS 16     //number of microsteps
565
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
565
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
566
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
566
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
567
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
 
568
 
569
   //#define Z2_IS_L6470
569
   //#define Z2_IS_L6470
570
   #define Z2_MICROSTEPS 16     //number of microsteps
570
   #define Z2_MICROSTEPS 16     //number of microsteps
571
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
571
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
572
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
572
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
573
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
 
574
 
575
   //#define E0_IS_L6470
575
   //#define E0_IS_L6470
576
   #define E0_MICROSTEPS 16     //number of microsteps
576
   #define E0_MICROSTEPS 16     //number of microsteps
577
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
577
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
578
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
578
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
579
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
 
580
 
581
   //#define E1_IS_L6470
581
   //#define E1_IS_L6470
582
   #define E1_MICROSTEPS 16     //number of microsteps
582
   #define E1_MICROSTEPS 16     //number of microsteps
583
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
583
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
584
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
584
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
585
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
 
586
 
587
   //#define E2_IS_L6470
587
   //#define E2_IS_L6470
588
   #define E2_MICROSTEPS 16     //number of microsteps
588
   #define E2_MICROSTEPS 16     //number of microsteps
589
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
589
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
590
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
 
592
 
593
   //#define E3_IS_L6470
593
   //#define E3_IS_L6470
594
   #define E3_MICROSTEPS 16     //number of microsteps
594
   #define E3_MICROSTEPS 16     //number of microsteps
595
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
595
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
596
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
 
598
 

+ 5
- 5
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

248
 
248
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
250
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
251
+  //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)
252
   //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
253
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
254
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
255
   #define  DEFAULT_bedKd 305.4
256
 
256
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
258
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
259
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
260
   //#define  DEFAULT_bedKi 1.41
452
   //   This mode is preferred because there are more measurements.
452
   //   This mode is preferred because there are more measurements.
453
   //
453
   //
454
   // - "3-point" mode
454
   // - "3-point" mode
455
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
455
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
456
   //   You specify the XY coordinates of all 3 points.
456
   //   You specify the XY coordinates of all 3 points.
457
 
457
 
458
   // Enable this to sample the bed in a grid (least squares solution).
458
   // Enable this to sample the bed in a grid (least squares solution).
751
 
751
 
752
 // @section extras
752
 // @section extras
753
 
753
 
754
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
754
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
755
 //#define FAST_PWM_FAN
755
 //#define FAST_PWM_FAN
756
 
756
 
757
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
757
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
839
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
839
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
840
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
840
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
841
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
841
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
842
-#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)
842
+#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)
843
 
843
 
844
 //defines used in the code
844
 //defines used in the code
845
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
845
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 3
- 3
Marlin/example_configurations/RigidBot/Configuration.h View File

442
   //   This mode is preferred because there are more measurements.
442
   //   This mode is preferred because there are more measurements.
443
   //
443
   //
444
   // - "3-point" mode
444
   // - "3-point" mode
445
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
445
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
446
   //   You specify the XY coordinates of all 3 points.
446
   //   You specify the XY coordinates of all 3 points.
447
 
447
 
448
   // Enable this to sample the bed in a grid (least squares solution).
448
   // Enable this to sample the bed in a grid (least squares solution).
745
 
745
 
746
 // @section extras
746
 // @section extras
747
 
747
 
748
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
748
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
749
 //#define FAST_PWM_FAN
749
 //#define FAST_PWM_FAN
750
 
750
 
751
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
751
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
833
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
833
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
834
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
834
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
835
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
835
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
836
-#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)
836
+#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)
837
 
837
 
838
 //defines used in the code
838
 //defines used in the code
839
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
839
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

461
 
461
 
462
 /******************************************************************************\
462
 /******************************************************************************\
463
  * enable this section if you have TMC26X motor drivers.
463
  * enable this section if you have TMC26X motor drivers.
464
- * you need to import the TMC26XStepper library into the arduino IDE for this
464
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
465
  ******************************************************************************/
465
  ******************************************************************************/
466
 
466
 
467
 // @section tmc
467
 // @section tmc
523
 
523
 
524
 /******************************************************************************\
524
 /******************************************************************************\
525
  * enable this section if you have L6470  motor drivers.
525
  * enable this section if you have L6470  motor drivers.
526
- * you need to import the L6470 library into the arduino IDE for this
526
+ * you need to import the L6470 library into the Arduino IDE for this
527
  ******************************************************************************/
527
  ******************************************************************************/
528
 
528
 
529
 // @section l6470
529
 // @section l6470
533
 
533
 
534
   //#define X_IS_L6470
534
   //#define X_IS_L6470
535
   #define X_MICROSTEPS 16     //number of microsteps
535
   #define X_MICROSTEPS 16     //number of microsteps
536
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
536
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
537
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
537
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
538
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
538
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
539
 
539
 
540
   //#define X2_IS_L6470
540
   //#define X2_IS_L6470
541
   #define X2_MICROSTEPS 16     //number of microsteps
541
   #define X2_MICROSTEPS 16     //number of microsteps
542
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
543
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
 
545
 
546
   //#define Y_IS_L6470
546
   //#define Y_IS_L6470
547
   #define Y_MICROSTEPS 16     //number of microsteps
547
   #define Y_MICROSTEPS 16     //number of microsteps
548
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
549
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
 
551
 
552
   //#define Y2_IS_L6470
552
   //#define Y2_IS_L6470
553
   #define Y2_MICROSTEPS 16     //number of microsteps
553
   #define Y2_MICROSTEPS 16     //number of microsteps
554
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
555
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
 
557
 
558
   //#define Z_IS_L6470
558
   //#define Z_IS_L6470
559
   #define Z_MICROSTEPS 16     //number of microsteps
559
   #define Z_MICROSTEPS 16     //number of microsteps
560
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
561
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
 
563
 
564
   //#define Z2_IS_L6470
564
   //#define Z2_IS_L6470
565
   #define Z2_MICROSTEPS 16     //number of microsteps
565
   #define Z2_MICROSTEPS 16     //number of microsteps
566
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
567
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
 
569
 
570
   //#define E0_IS_L6470
570
   //#define E0_IS_L6470
571
   #define E0_MICROSTEPS 16     //number of microsteps
571
   #define E0_MICROSTEPS 16     //number of microsteps
572
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
573
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
 
575
 
576
   //#define E1_IS_L6470
576
   //#define E1_IS_L6470
577
   #define E1_MICROSTEPS 16     //number of microsteps
577
   #define E1_MICROSTEPS 16     //number of microsteps
578
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
579
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
 
581
 
582
   //#define E2_IS_L6470
582
   //#define E2_IS_L6470
583
   #define E2_MICROSTEPS 16     //number of microsteps
583
   #define E2_MICROSTEPS 16     //number of microsteps
584
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
584
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
585
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
 
587
 
588
   //#define E3_IS_L6470
588
   //#define E3_IS_L6470
589
   #define E3_MICROSTEPS 16     //number of microsteps
589
   #define E3_MICROSTEPS 16     //number of microsteps
590
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
590
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
591
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
 
593
 

+ 3
- 3
Marlin/example_configurations/SCARA/Configuration.h View File

459
   //   This mode is preferred because there are more measurements.
459
   //   This mode is preferred because there are more measurements.
460
   //
460
   //
461
   // - "3-point" mode
461
   // - "3-point" mode
462
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
462
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
463
   //   You specify the XY coordinates of all 3 points.
463
   //   You specify the XY coordinates of all 3 points.
464
 
464
 
465
   // Enable this to sample the bed in a grid (least squares solution).
465
   // Enable this to sample the bed in a grid (least squares solution).
758
 
758
 
759
 // @section extras
759
 // @section extras
760
 
760
 
761
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
761
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
762
 //#define FAST_PWM_FAN
762
 //#define FAST_PWM_FAN
763
 
763
 
764
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
764
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
846
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
846
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
847
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
847
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
848
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
848
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
849
-#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)
849
+#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)
850
 
850
 
851
 //defines used in the code
851
 //defines used in the code
852
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
852
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/SCARA/Configuration_adv.h View File

458
 
458
 
459
 /******************************************************************************\
459
 /******************************************************************************\
460
  * enable this section if you have TMC26X motor drivers.
460
  * enable this section if you have TMC26X motor drivers.
461
- * you need to import the TMC26XStepper library into the arduino IDE for this
461
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
462
  ******************************************************************************/
462
  ******************************************************************************/
463
 
463
 
464
 // @section tmc
464
 // @section tmc
520
 
520
 
521
 /******************************************************************************\
521
 /******************************************************************************\
522
  * enable this section if you have L6470  motor drivers.
522
  * enable this section if you have L6470  motor drivers.
523
- * you need to import the L6470 library into the arduino IDE for this
523
+ * you need to import the L6470 library into the Arduino IDE for this
524
  ******************************************************************************/
524
  ******************************************************************************/
525
 
525
 
526
 // @section l6470
526
 // @section l6470
530
 
530
 
531
   //#define X_IS_L6470
531
   //#define X_IS_L6470
532
   #define X_MICROSTEPS 16     //number of microsteps
532
   #define X_MICROSTEPS 16     //number of microsteps
533
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
533
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
 
536
 
537
   //#define X2_IS_L6470
537
   //#define X2_IS_L6470
538
   #define X2_MICROSTEPS 16     //number of microsteps
538
   #define X2_MICROSTEPS 16     //number of microsteps
539
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
539
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
 
542
 
543
   //#define Y_IS_L6470
543
   //#define Y_IS_L6470
544
   #define Y_MICROSTEPS 16     //number of microsteps
544
   #define Y_MICROSTEPS 16     //number of microsteps
545
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
 
548
 
549
   //#define Y2_IS_L6470
549
   //#define Y2_IS_L6470
550
   #define Y2_MICROSTEPS 16     //number of microsteps
550
   #define Y2_MICROSTEPS 16     //number of microsteps
551
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
 
554
 
555
   //#define Z_IS_L6470
555
   //#define Z_IS_L6470
556
   #define Z_MICROSTEPS 16     //number of microsteps
556
   #define Z_MICROSTEPS 16     //number of microsteps
557
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
 
560
 
561
   //#define Z2_IS_L6470
561
   //#define Z2_IS_L6470
562
   #define Z2_MICROSTEPS 16     //number of microsteps
562
   #define Z2_MICROSTEPS 16     //number of microsteps
563
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
 
566
 
567
   //#define E0_IS_L6470
567
   //#define E0_IS_L6470
568
   #define E0_MICROSTEPS 16     //number of microsteps
568
   #define E0_MICROSTEPS 16     //number of microsteps
569
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
 
572
 
573
   //#define E1_IS_L6470
573
   //#define E1_IS_L6470
574
   #define E1_MICROSTEPS 16     //number of microsteps
574
   #define E1_MICROSTEPS 16     //number of microsteps
575
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
 
578
 
579
   //#define E2_IS_L6470
579
   //#define E2_IS_L6470
580
   #define E2_MICROSTEPS 16     //number of microsteps
580
   #define E2_MICROSTEPS 16     //number of microsteps
581
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
 
584
 
585
   //#define E3_IS_L6470
585
   //#define E3_IS_L6470
586
   #define E3_MICROSTEPS 16     //number of microsteps
586
   #define E3_MICROSTEPS 16     //number of microsteps
587
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
 
590
 

+ 5
- 5
Marlin/example_configurations/TAZ4/Configuration.h View File

268
   //#define  DEFAULT_bedKi 60
268
   //#define  DEFAULT_bedKi 60
269
   //#define  DEFAULT_bedKd 1800
269
   //#define  DEFAULT_bedKd 1800
270
 
270
 
271
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
271
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
272
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
272
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
273
   //#define  DEFAULT_bedKp 10.00
273
   //#define  DEFAULT_bedKp 10.00
274
   //#define  DEFAULT_bedKi .023
274
   //#define  DEFAULT_bedKi .023
275
   //#define  DEFAULT_bedKd 305.4
275
   //#define  DEFAULT_bedKd 305.4
276
 
276
 
277
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
277
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
278
   //from pidautotune
278
   //from pidautotune
279
   //#define  DEFAULT_bedKp 97.1
279
   //#define  DEFAULT_bedKp 97.1
280
   //#define  DEFAULT_bedKi 1.41
280
   //#define  DEFAULT_bedKi 1.41
470
   //   This mode is preferred because there are more measurements.
470
   //   This mode is preferred because there are more measurements.
471
   //
471
   //
472
   // - "3-point" mode
472
   // - "3-point" mode
473
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
473
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
474
   //   You specify the XY coordinates of all 3 points.
474
   //   You specify the XY coordinates of all 3 points.
475
 
475
 
476
   // Enable this to sample the bed in a grid (least squares solution).
476
   // Enable this to sample the bed in a grid (least squares solution).
769
 
769
 
770
 // @section extras
770
 // @section extras
771
 
771
 
772
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
772
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
773
 #define FAST_PWM_FAN
773
 #define FAST_PWM_FAN
774
 
774
 
775
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
775
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
857
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
857
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
858
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
858
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
859
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
859
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
860
-#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)
860
+#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)
861
 
861
 
862
 //defines used in the code
862
 //defines used in the code
863
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
863
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

469
 
469
 
470
 /******************************************************************************\
470
 /******************************************************************************\
471
  * enable this section if you have TMC26X motor drivers.
471
  * enable this section if you have TMC26X motor drivers.
472
- * you need to import the TMC26XStepper library into the arduino IDE for this
472
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
473
  ******************************************************************************/
473
  ******************************************************************************/
474
 
474
 
475
 // @section tmc
475
 // @section tmc
531
 
531
 
532
 /******************************************************************************\
532
 /******************************************************************************\
533
  * enable this section if you have L6470  motor drivers.
533
  * enable this section if you have L6470  motor drivers.
534
- * you need to import the L6470 library into the arduino IDE for this
534
+ * you need to import the L6470 library into the Arduino IDE for this
535
  ******************************************************************************/
535
  ******************************************************************************/
536
 
536
 
537
 // @section l6470
537
 // @section l6470
541
 
541
 
542
   //#define X_IS_L6470
542
   //#define X_IS_L6470
543
   #define X_MICROSTEPS 16     //number of microsteps
543
   #define X_MICROSTEPS 16     //number of microsteps
544
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
545
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
 
547
 
548
   //#define X2_IS_L6470
548
   //#define X2_IS_L6470
549
   #define X2_MICROSTEPS 16     //number of microsteps
549
   #define X2_MICROSTEPS 16     //number of microsteps
550
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
551
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
 
553
 
554
   //#define Y_IS_L6470
554
   //#define Y_IS_L6470
555
   #define Y_MICROSTEPS 16     //number of microsteps
555
   #define Y_MICROSTEPS 16     //number of microsteps
556
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
557
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
 
559
 
560
   //#define Y2_IS_L6470
560
   //#define Y2_IS_L6470
561
   #define Y2_MICROSTEPS 16     //number of microsteps
561
   #define Y2_MICROSTEPS 16     //number of microsteps
562
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
563
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
 
565
 
566
   //#define Z_IS_L6470
566
   //#define Z_IS_L6470
567
   #define Z_MICROSTEPS 16     //number of microsteps
567
   #define Z_MICROSTEPS 16     //number of microsteps
568
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
569
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
 
571
 
572
   //#define Z2_IS_L6470
572
   //#define Z2_IS_L6470
573
   #define Z2_MICROSTEPS 16     //number of microsteps
573
   #define Z2_MICROSTEPS 16     //number of microsteps
574
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
575
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
 
577
 
578
   //#define E0_IS_L6470
578
   //#define E0_IS_L6470
579
   #define E0_MICROSTEPS 16     //number of microsteps
579
   #define E0_MICROSTEPS 16     //number of microsteps
580
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
581
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
 
583
 
584
   //#define E1_IS_L6470
584
   //#define E1_IS_L6470
585
   #define E1_MICROSTEPS 16     //number of microsteps
585
   #define E1_MICROSTEPS 16     //number of microsteps
586
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
587
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
 
589
 
590
   //#define E2_IS_L6470
590
   //#define E2_IS_L6470
591
   #define E2_MICROSTEPS 16     //number of microsteps
591
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
 
595
 
596
   //#define E3_IS_L6470
596
   //#define E3_IS_L6470
597
   #define E3_MICROSTEPS 16     //number of microsteps
597
   #define E3_MICROSTEPS 16     //number of microsteps
598
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
598
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
599
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
599
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
600
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
600
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
601
 
601
 

+ 5
- 5
Marlin/example_configurations/WITBOX/Configuration.h View File

240
 
240
 
241
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
241
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
242
 
242
 
243
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
243
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
244
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
244
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
245
   #define  DEFAULT_bedKp 10.00
245
   #define  DEFAULT_bedKp 10.00
246
   #define  DEFAULT_bedKi .023
246
   #define  DEFAULT_bedKi .023
247
   #define  DEFAULT_bedKd 305.4
247
   #define  DEFAULT_bedKd 305.4
248
 
248
 
249
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
249
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
250
   //from pidautotune
250
   //from pidautotune
251
   //#define  DEFAULT_bedKp 97.1
251
   //#define  DEFAULT_bedKp 97.1
252
   //#define  DEFAULT_bedKi 1.41
252
   //#define  DEFAULT_bedKi 1.41
443
   //   This mode is preferred because there are more measurements.
443
   //   This mode is preferred because there are more measurements.
444
   //
444
   //
445
   // - "3-point" mode
445
   // - "3-point" mode
446
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
446
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
447
   //   You specify the XY coordinates of all 3 points.
447
   //   You specify the XY coordinates of all 3 points.
448
 
448
 
449
   // Enable this to sample the bed in a grid (least squares solution).
449
   // Enable this to sample the bed in a grid (least squares solution).
742
 
742
 
743
 // @section extras
743
 // @section extras
744
 
744
 
745
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
745
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
746
 //#define FAST_PWM_FAN
746
 //#define FAST_PWM_FAN
747
 
747
 
748
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
748
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
830
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
830
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
831
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
831
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
832
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
832
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
833
-#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)
833
+#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)
834
 
834
 
835
 //defines used in the code
835
 //defines used in the code
836
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
836
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

458
 
458
 
459
 /******************************************************************************\
459
 /******************************************************************************\
460
  * enable this section if you have TMC26X motor drivers.
460
  * enable this section if you have TMC26X motor drivers.
461
- * you need to import the TMC26XStepper library into the arduino IDE for this
461
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
462
  ******************************************************************************/
462
  ******************************************************************************/
463
 
463
 
464
 // @section tmc
464
 // @section tmc
520
 
520
 
521
 /******************************************************************************\
521
 /******************************************************************************\
522
  * enable this section if you have L6470  motor drivers.
522
  * enable this section if you have L6470  motor drivers.
523
- * you need to import the L6470 library into the arduino IDE for this
523
+ * you need to import the L6470 library into the Arduino IDE for this
524
  ******************************************************************************/
524
  ******************************************************************************/
525
 
525
 
526
 // @section l6470
526
 // @section l6470
530
 
530
 
531
   //#define X_IS_L6470
531
   //#define X_IS_L6470
532
   #define X_MICROSTEPS 16     //number of microsteps
532
   #define X_MICROSTEPS 16     //number of microsteps
533
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
533
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
 
536
 
537
   //#define X2_IS_L6470
537
   //#define X2_IS_L6470
538
   #define X2_MICROSTEPS 16     //number of microsteps
538
   #define X2_MICROSTEPS 16     //number of microsteps
539
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
539
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
 
542
 
543
   //#define Y_IS_L6470
543
   //#define Y_IS_L6470
544
   #define Y_MICROSTEPS 16     //number of microsteps
544
   #define Y_MICROSTEPS 16     //number of microsteps
545
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
 
548
 
549
   //#define Y2_IS_L6470
549
   //#define Y2_IS_L6470
550
   #define Y2_MICROSTEPS 16     //number of microsteps
550
   #define Y2_MICROSTEPS 16     //number of microsteps
551
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
 
554
 
555
   //#define Z_IS_L6470
555
   //#define Z_IS_L6470
556
   #define Z_MICROSTEPS 16     //number of microsteps
556
   #define Z_MICROSTEPS 16     //number of microsteps
557
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
 
560
 
561
   //#define Z2_IS_L6470
561
   //#define Z2_IS_L6470
562
   #define Z2_MICROSTEPS 16     //number of microsteps
562
   #define Z2_MICROSTEPS 16     //number of microsteps
563
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
 
566
 
567
   //#define E0_IS_L6470
567
   //#define E0_IS_L6470
568
   #define E0_MICROSTEPS 16     //number of microsteps
568
   #define E0_MICROSTEPS 16     //number of microsteps
569
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
 
572
 
573
   //#define E1_IS_L6470
573
   //#define E1_IS_L6470
574
   #define E1_MICROSTEPS 16     //number of microsteps
574
   #define E1_MICROSTEPS 16     //number of microsteps
575
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
 
578
 
579
   //#define E2_IS_L6470
579
   //#define E2_IS_L6470
580
   #define E2_MICROSTEPS 16     //number of microsteps
580
   #define E2_MICROSTEPS 16     //number of microsteps
581
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
 
584
 
585
   //#define E3_IS_L6470
585
   //#define E3_IS_L6470
586
   #define E3_MICROSTEPS 16     //number of microsteps
586
   #define E3_MICROSTEPS 16     //number of microsteps
587
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
 
590
 

+ 5
- 5
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

248
 
248
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
250
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
251
+  //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)
252
   //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
253
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
254
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
255
   #define  DEFAULT_bedKd 305.4
256
 
256
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
258
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
259
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
260
   //#define  DEFAULT_bedKi 1.41
452
   //   This mode is preferred because there are more measurements.
452
   //   This mode is preferred because there are more measurements.
453
   //
453
   //
454
   // - "3-point" mode
454
   // - "3-point" mode
455
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
455
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
456
   //   You specify the XY coordinates of all 3 points.
456
   //   You specify the XY coordinates of all 3 points.
457
 
457
 
458
   // Enable this to sample the bed in a grid (least squares solution).
458
   // Enable this to sample the bed in a grid (least squares solution).
751
 
751
 
752
 // @section extras
752
 // @section extras
753
 
753
 
754
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
754
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
755
 //#define FAST_PWM_FAN
755
 //#define FAST_PWM_FAN
756
 
756
 
757
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
757
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
839
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
839
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
840
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
840
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
841
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
841
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
842
-#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)
842
+#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)
843
 
843
 
844
 //defines used in the code
844
 //defines used in the code
845
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
845
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 5
- 5
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

248
 
248
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
250
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
251
+  //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)
252
   //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
253
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
254
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
255
   #define  DEFAULT_bedKd 305.4
256
 
256
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
258
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
259
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
260
   //#define  DEFAULT_bedKi 1.41
486
   //   This mode is preferred because there are more measurements.
486
   //   This mode is preferred because there are more measurements.
487
   //
487
   //
488
   // - "3-point" mode
488
   // - "3-point" mode
489
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
489
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
490
   //   You specify the XY coordinates of all 3 points.
490
   //   You specify the XY coordinates of all 3 points.
491
 
491
 
492
   // Enable this to sample the bed in a grid (least squares solution).
492
   // Enable this to sample the bed in a grid (least squares solution).
875
 
875
 
876
 // @section extras
876
 // @section extras
877
 
877
 
878
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
878
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
879
 //#define FAST_PWM_FAN
879
 //#define FAST_PWM_FAN
880
 
880
 
881
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
881
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
963
 #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
963
 #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
964
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
964
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
965
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
965
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
966
-#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)
966
+#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)
967
 
967
 
968
 //defines used in the code
968
 //defines used in the code
969
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
969
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

459
 
459
 
460
 /******************************************************************************\
460
 /******************************************************************************\
461
  * enable this section if you have TMC26X motor drivers.
461
  * enable this section if you have TMC26X motor drivers.
462
- * you need to import the TMC26XStepper library into the arduino IDE for this
462
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
463
  ******************************************************************************/
463
  ******************************************************************************/
464
 
464
 
465
 // @section tmc
465
 // @section tmc
521
 
521
 
522
 /******************************************************************************\
522
 /******************************************************************************\
523
  * enable this section if you have L6470  motor drivers.
523
  * enable this section if you have L6470  motor drivers.
524
- * you need to import the L6470 library into the arduino IDE for this
524
+ * you need to import the L6470 library into the Arduino IDE for this
525
  ******************************************************************************/
525
  ******************************************************************************/
526
 
526
 
527
 // @section l6470
527
 // @section l6470
531
 
531
 
532
   //#define X_IS_L6470
532
   //#define X_IS_L6470
533
   #define X_MICROSTEPS 16     //number of microsteps
533
   #define X_MICROSTEPS 16     //number of microsteps
534
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
534
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
535
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
536
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
537
 
537
 
538
   //#define X2_IS_L6470
538
   //#define X2_IS_L6470
539
   #define X2_MICROSTEPS 16     //number of microsteps
539
   #define X2_MICROSTEPS 16     //number of microsteps
540
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
540
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
541
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
 
543
 
544
   //#define Y_IS_L6470
544
   //#define Y_IS_L6470
545
   #define Y_MICROSTEPS 16     //number of microsteps
545
   #define Y_MICROSTEPS 16     //number of microsteps
546
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
546
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
547
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
548
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
549
 
549
 
550
   //#define Y2_IS_L6470
550
   //#define Y2_IS_L6470
551
   #define Y2_MICROSTEPS 16     //number of microsteps
551
   #define Y2_MICROSTEPS 16     //number of microsteps
552
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
552
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
553
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
554
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
555
 
555
 
556
   //#define Z_IS_L6470
556
   //#define Z_IS_L6470
557
   #define Z_MICROSTEPS 16     //number of microsteps
557
   #define Z_MICROSTEPS 16     //number of microsteps
558
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
558
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
559
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
560
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
561
 
561
 
562
   //#define Z2_IS_L6470
562
   //#define Z2_IS_L6470
563
   #define Z2_MICROSTEPS 16     //number of microsteps
563
   #define Z2_MICROSTEPS 16     //number of microsteps
564
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
564
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
565
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
566
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
567
 
567
 
568
   //#define E0_IS_L6470
568
   //#define E0_IS_L6470
569
   #define E0_MICROSTEPS 16     //number of microsteps
569
   #define E0_MICROSTEPS 16     //number of microsteps
570
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
570
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
571
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
572
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
573
 
573
 
574
   //#define E1_IS_L6470
574
   //#define E1_IS_L6470
575
   #define E1_MICROSTEPS 16     //number of microsteps
575
   #define E1_MICROSTEPS 16     //number of microsteps
576
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
576
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
577
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
578
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
579
 
579
 
580
   //#define E2_IS_L6470
580
   //#define E2_IS_L6470
581
   #define E2_MICROSTEPS 16     //number of microsteps
581
   #define E2_MICROSTEPS 16     //number of microsteps
582
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
582
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
583
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
584
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
585
 
585
 
586
   //#define E3_IS_L6470
586
   //#define E3_IS_L6470
587
   #define E3_MICROSTEPS 16     //number of microsteps
587
   #define E3_MICROSTEPS 16     //number of microsteps
588
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
589
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
 
591
 

+ 5
- 5
Marlin/example_configurations/delta/generic/Configuration.h View File

248
 
248
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
250
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
251
+  //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)
252
   //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
253
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
254
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
255
   #define  DEFAULT_bedKd 305.4
256
 
256
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
258
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
259
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
260
   //#define  DEFAULT_bedKi 1.41
487
   //   This mode is preferred because there are more measurements.
487
   //   This mode is preferred because there are more measurements.
488
   //
488
   //
489
   // - "3-point" mode
489
   // - "3-point" mode
490
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
490
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
491
   //   You specify the XY coordinates of all 3 points.
491
   //   You specify the XY coordinates of all 3 points.
492
 
492
 
493
   // Enable this to sample the bed in a grid (least squares solution).
493
   // Enable this to sample the bed in a grid (least squares solution).
880
 
880
 
881
 // @section extras
881
 // @section extras
882
 
882
 
883
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
883
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
884
 //#define FAST_PWM_FAN
884
 //#define FAST_PWM_FAN
885
 
885
 
886
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
886
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
968
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
968
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
969
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
969
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
970
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
970
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
971
-#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)
971
+#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)
972
 
972
 
973
 //defines used in the code
973
 //defines used in the code
974
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
974
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

460
 
460
 
461
 /******************************************************************************\
461
 /******************************************************************************\
462
  * enable this section if you have TMC26X motor drivers.
462
  * enable this section if you have TMC26X motor drivers.
463
- * you need to import the TMC26XStepper library into the arduino IDE for this
463
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
464
  ******************************************************************************/
464
  ******************************************************************************/
465
 
465
 
466
 // @section tmc
466
 // @section tmc
522
 
522
 
523
 /******************************************************************************\
523
 /******************************************************************************\
524
  * enable this section if you have L6470  motor drivers.
524
  * enable this section if you have L6470  motor drivers.
525
- * you need to import the L6470 library into the arduino IDE for this
525
+ * you need to import the L6470 library into the Arduino IDE for this
526
  ******************************************************************************/
526
  ******************************************************************************/
527
 
527
 
528
 // @section l6470
528
 // @section l6470
532
 
532
 
533
   //#define X_IS_L6470
533
   //#define X_IS_L6470
534
   #define X_MICROSTEPS 16     //number of microsteps
534
   #define X_MICROSTEPS 16     //number of microsteps
535
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
535
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
536
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
536
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
537
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
537
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
538
 
538
 
539
   //#define X2_IS_L6470
539
   //#define X2_IS_L6470
540
   #define X2_MICROSTEPS 16     //number of microsteps
540
   #define X2_MICROSTEPS 16     //number of microsteps
541
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
541
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
542
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
 
544
 
545
   //#define Y_IS_L6470
545
   //#define Y_IS_L6470
546
   #define Y_MICROSTEPS 16     //number of microsteps
546
   #define Y_MICROSTEPS 16     //number of microsteps
547
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
547
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
548
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
548
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
549
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
 
550
 
551
   //#define Y2_IS_L6470
551
   //#define Y2_IS_L6470
552
   #define Y2_MICROSTEPS 16     //number of microsteps
552
   #define Y2_MICROSTEPS 16     //number of microsteps
553
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
553
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
554
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
554
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
555
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
 
556
 
557
   //#define Z_IS_L6470
557
   //#define Z_IS_L6470
558
   #define Z_MICROSTEPS 16     //number of microsteps
558
   #define Z_MICROSTEPS 16     //number of microsteps
559
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
559
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
560
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
560
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
561
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
 
562
 
563
   //#define Z2_IS_L6470
563
   //#define Z2_IS_L6470
564
   #define Z2_MICROSTEPS 16     //number of microsteps
564
   #define Z2_MICROSTEPS 16     //number of microsteps
565
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
565
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
566
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
566
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
567
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
 
568
 
569
   //#define E0_IS_L6470
569
   //#define E0_IS_L6470
570
   #define E0_MICROSTEPS 16     //number of microsteps
570
   #define E0_MICROSTEPS 16     //number of microsteps
571
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
571
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
572
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
572
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
573
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
 
574
 
575
   //#define E1_IS_L6470
575
   //#define E1_IS_L6470
576
   #define E1_MICROSTEPS 16     //number of microsteps
576
   #define E1_MICROSTEPS 16     //number of microsteps
577
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
577
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
578
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
578
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
579
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
 
580
 
581
   //#define E2_IS_L6470
581
   //#define E2_IS_L6470
582
   #define E2_MICROSTEPS 16     //number of microsteps
582
   #define E2_MICROSTEPS 16     //number of microsteps
583
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
583
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
584
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
584
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
585
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
 
586
 
587
   //#define E3_IS_L6470
587
   //#define E3_IS_L6470
588
   #define E3_MICROSTEPS 16     //number of microsteps
588
   #define E3_MICROSTEPS 16     //number of microsteps
589
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
589
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
590
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
 
592
 

+ 5
- 5
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

248
 
248
 
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
249
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
250
 
250
 
251
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
251
+  //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)
252
   //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
253
   #define  DEFAULT_bedKp 10.00
254
   #define  DEFAULT_bedKi .023
254
   #define  DEFAULT_bedKi .023
255
   #define  DEFAULT_bedKd 305.4
255
   #define  DEFAULT_bedKd 305.4
256
 
256
 
257
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
258
   //from pidautotune
258
   //from pidautotune
259
   //#define  DEFAULT_bedKp 97.1
259
   //#define  DEFAULT_bedKp 97.1
260
   //#define  DEFAULT_bedKi 1.41
260
   //#define  DEFAULT_bedKi 1.41
487
   //   This mode is preferred because there are more measurements.
487
   //   This mode is preferred because there are more measurements.
488
   //
488
   //
489
   // - "3-point" mode
489
   // - "3-point" mode
490
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
490
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
491
   //   You specify the XY coordinates of all 3 points.
491
   //   You specify the XY coordinates of all 3 points.
492
 
492
 
493
   // Enable this to sample the bed in a grid (least squares solution).
493
   // Enable this to sample the bed in a grid (least squares solution).
880
 
880
 
881
 // @section extras
881
 // @section extras
882
 
882
 
883
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
883
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
884
 //#define FAST_PWM_FAN
884
 //#define FAST_PWM_FAN
885
 
885
 
886
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
886
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
968
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
968
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
969
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
969
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
970
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
970
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
971
-#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)
971
+#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)
972
 
972
 
973
 //defines used in the code
973
 //defines used in the code
974
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
974
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

459
 
459
 
460
 /******************************************************************************\
460
 /******************************************************************************\
461
  * enable this section if you have TMC26X motor drivers.
461
  * enable this section if you have TMC26X motor drivers.
462
- * you need to import the TMC26XStepper library into the arduino IDE for this
462
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
463
  ******************************************************************************/
463
  ******************************************************************************/
464
 
464
 
465
 // @section tmc
465
 // @section tmc
521
 
521
 
522
 /******************************************************************************\
522
 /******************************************************************************\
523
  * enable this section if you have L6470  motor drivers.
523
  * enable this section if you have L6470  motor drivers.
524
- * you need to import the L6470 library into the arduino IDE for this
524
+ * you need to import the L6470 library into the Arduino IDE for this
525
  ******************************************************************************/
525
  ******************************************************************************/
526
 
526
 
527
 // @section l6470
527
 // @section l6470
531
 
531
 
532
   //#define X_IS_L6470
532
   //#define X_IS_L6470
533
   #define X_MICROSTEPS 16     //number of microsteps
533
   #define X_MICROSTEPS 16     //number of microsteps
534
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
534
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
535
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
536
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
537
 
537
 
538
   //#define X2_IS_L6470
538
   //#define X2_IS_L6470
539
   #define X2_MICROSTEPS 16     //number of microsteps
539
   #define X2_MICROSTEPS 16     //number of microsteps
540
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
540
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
541
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
 
543
 
544
   //#define Y_IS_L6470
544
   //#define Y_IS_L6470
545
   #define Y_MICROSTEPS 16     //number of microsteps
545
   #define Y_MICROSTEPS 16     //number of microsteps
546
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
546
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
547
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
548
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
549
 
549
 
550
   //#define Y2_IS_L6470
550
   //#define Y2_IS_L6470
551
   #define Y2_MICROSTEPS 16     //number of microsteps
551
   #define Y2_MICROSTEPS 16     //number of microsteps
552
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
552
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
553
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
554
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
555
 
555
 
556
   //#define Z_IS_L6470
556
   //#define Z_IS_L6470
557
   #define Z_MICROSTEPS 16     //number of microsteps
557
   #define Z_MICROSTEPS 16     //number of microsteps
558
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
558
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
559
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
560
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
561
 
561
 
562
   //#define Z2_IS_L6470
562
   //#define Z2_IS_L6470
563
   #define Z2_MICROSTEPS 16     //number of microsteps
563
   #define Z2_MICROSTEPS 16     //number of microsteps
564
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
564
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
565
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
566
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
567
 
567
 
568
   //#define E0_IS_L6470
568
   //#define E0_IS_L6470
569
   #define E0_MICROSTEPS 16     //number of microsteps
569
   #define E0_MICROSTEPS 16     //number of microsteps
570
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
570
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
571
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
572
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
573
 
573
 
574
   //#define E1_IS_L6470
574
   //#define E1_IS_L6470
575
   #define E1_MICROSTEPS 16     //number of microsteps
575
   #define E1_MICROSTEPS 16     //number of microsteps
576
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
576
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
577
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
578
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
579
 
579
 
580
   //#define E2_IS_L6470
580
   //#define E2_IS_L6470
581
   #define E2_MICROSTEPS 16     //number of microsteps
581
   #define E2_MICROSTEPS 16     //number of microsteps
582
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
582
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
583
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
584
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
585
 
585
 
586
   //#define E3_IS_L6470
586
   //#define E3_IS_L6470
587
   #define E3_MICROSTEPS 16     //number of microsteps
587
   #define E3_MICROSTEPS 16     //number of microsteps
588
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
589
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
 
591
 

+ 3
- 3
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

474
   //   This mode is preferred because there are more measurements.
474
   //   This mode is preferred because there are more measurements.
475
   //
475
   //
476
   // - "3-point" mode
476
   // - "3-point" mode
477
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
477
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
478
   //   You specify the XY coordinates of all 3 points.
478
   //   You specify the XY coordinates of all 3 points.
479
 
479
 
480
   // Enable this to sample the bed in a grid (least squares solution).
480
   // Enable this to sample the bed in a grid (least squares solution).
871
 
871
 
872
 // @section extras
872
 // @section extras
873
 
873
 
874
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
874
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
875
 //#define FAST_PWM_FAN
875
 //#define FAST_PWM_FAN
876
 
876
 
877
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
877
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
959
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
959
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
960
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
960
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
961
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
961
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
962
-#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)
962
+#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)
963
 
963
 
964
 //defines used in the code
964
 //defines used in the code
965
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
965
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

463
 
463
 
464
 /******************************************************************************\
464
 /******************************************************************************\
465
  * enable this section if you have TMC26X motor drivers.
465
  * enable this section if you have TMC26X motor drivers.
466
- * you need to import the TMC26XStepper library into the arduino IDE for this
466
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
467
  ******************************************************************************/
467
  ******************************************************************************/
468
 
468
 
469
 // @section tmc
469
 // @section tmc
525
 
525
 
526
 /******************************************************************************\
526
 /******************************************************************************\
527
  * enable this section if you have L6470  motor drivers.
527
  * enable this section if you have L6470  motor drivers.
528
- * you need to import the L6470 library into the arduino IDE for this
528
+ * you need to import the L6470 library into the Arduino IDE for this
529
  ******************************************************************************/
529
  ******************************************************************************/
530
 
530
 
531
 // @section l6470
531
 // @section l6470
535
 
535
 
536
   //#define X_IS_L6470
536
   //#define X_IS_L6470
537
   #define X_MICROSTEPS 16     //number of microsteps
537
   #define X_MICROSTEPS 16     //number of microsteps
538
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
538
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
539
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
 
541
 
542
   //#define X2_IS_L6470
542
   //#define X2_IS_L6470
543
   #define X2_MICROSTEPS 16     //number of microsteps
543
   #define X2_MICROSTEPS 16     //number of microsteps
544
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
545
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
 
547
 
548
   //#define Y_IS_L6470
548
   //#define Y_IS_L6470
549
   #define Y_MICROSTEPS 16     //number of microsteps
549
   #define Y_MICROSTEPS 16     //number of microsteps
550
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
551
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
 
553
 
554
   //#define Y2_IS_L6470
554
   //#define Y2_IS_L6470
555
   #define Y2_MICROSTEPS 16     //number of microsteps
555
   #define Y2_MICROSTEPS 16     //number of microsteps
556
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
557
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
 
559
 
560
   //#define Z_IS_L6470
560
   //#define Z_IS_L6470
561
   #define Z_MICROSTEPS 16     //number of microsteps
561
   #define Z_MICROSTEPS 16     //number of microsteps
562
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
563
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
 
565
 
566
   //#define Z2_IS_L6470
566
   //#define Z2_IS_L6470
567
   #define Z2_MICROSTEPS 16     //number of microsteps
567
   #define Z2_MICROSTEPS 16     //number of microsteps
568
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
569
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
 
571
 
572
   //#define E0_IS_L6470
572
   //#define E0_IS_L6470
573
   #define E0_MICROSTEPS 16     //number of microsteps
573
   #define E0_MICROSTEPS 16     //number of microsteps
574
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
575
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
 
577
 
578
   //#define E1_IS_L6470
578
   //#define E1_IS_L6470
579
   #define E1_MICROSTEPS 16     //number of microsteps
579
   #define E1_MICROSTEPS 16     //number of microsteps
580
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
581
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
 
583
 
584
   //#define E2_IS_L6470
584
   //#define E2_IS_L6470
585
   #define E2_MICROSTEPS 16     //number of microsteps
585
   #define E2_MICROSTEPS 16     //number of microsteps
586
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
587
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
 
589
 
590
   //#define E3_IS_L6470
590
   //#define E3_IS_L6470
591
   #define E3_MICROSTEPS 16     //number of microsteps
591
   #define E3_MICROSTEPS 16     //number of microsteps
592
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
593
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
593
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
594
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
 
595
 

+ 5
- 5
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

281
 
281
 
282
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
282
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
283
 
283
 
284
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
284
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
285
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
285
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
286
   #define  DEFAULT_bedKp 15.00
286
   #define  DEFAULT_bedKp 15.00
287
   #define  DEFAULT_bedKi .04
287
   #define  DEFAULT_bedKi .04
288
   #define  DEFAULT_bedKd 305.4
288
   #define  DEFAULT_bedKd 305.4
289
 
289
 
290
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
290
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
291
   //from pidautotune
291
   //from pidautotune
292
   //#define  DEFAULT_bedKp 97.1
292
   //#define  DEFAULT_bedKp 97.1
293
   //#define  DEFAULT_bedKi 1.41
293
   //#define  DEFAULT_bedKi 1.41
484
   //   This mode is preferred because there are more measurements.
484
   //   This mode is preferred because there are more measurements.
485
   //
485
   //
486
   // - "3-point" mode
486
   // - "3-point" mode
487
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
487
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
488
   //   You specify the XY coordinates of all 3 points.
488
   //   You specify the XY coordinates of all 3 points.
489
 
489
 
490
   // Enable this to sample the bed in a grid (least squares solution).
490
   // Enable this to sample the bed in a grid (least squares solution).
793
 
793
 
794
 // @section extras
794
 // @section extras
795
 
795
 
796
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
796
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
797
 //#define FAST_PWM_FAN
797
 //#define FAST_PWM_FAN
798
 
798
 
799
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
799
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
881
 #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
881
 #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
882
 #define MEASURED_UPPER_LIMIT         2.00  //upper limit factor used for sensor reading validation in mm
882
 #define MEASURED_UPPER_LIMIT         2.00  //upper limit factor used for sensor reading validation in mm
883
 #define MEASURED_LOWER_LIMIT         1.60  //lower limit factor for sensor reading validation in mm
883
 #define MEASURED_LOWER_LIMIT         1.60  //lower limit factor for sensor reading validation in mm
884
-#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)
884
+#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)
885
 
885
 
886
 //defines used in the code
886
 //defines used in the code
887
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
887
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

462
 
462
 
463
 /******************************************************************************\
463
 /******************************************************************************\
464
  * enable this section if you have TMC26X motor drivers.
464
  * enable this section if you have TMC26X motor drivers.
465
- * you need to import the TMC26XStepper library into the arduino IDE for this
465
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
466
  ******************************************************************************/
466
  ******************************************************************************/
467
 
467
 
468
 // @section tmc
468
 // @section tmc
524
 
524
 
525
 /******************************************************************************\
525
 /******************************************************************************\
526
  * enable this section if you have L6470  motor drivers.
526
  * enable this section if you have L6470  motor drivers.
527
- * you need to import the L6470 library into the arduino IDE for this
527
+ * you need to import the L6470 library into the Arduino IDE for this
528
  ******************************************************************************/
528
  ******************************************************************************/
529
 
529
 
530
 // @section l6470
530
 // @section l6470
534
 
534
 
535
   //#define X_IS_L6470
535
   //#define X_IS_L6470
536
   #define X_MICROSTEPS 16     //number of microsteps
536
   #define X_MICROSTEPS 16     //number of microsteps
537
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
537
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
538
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
539
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
 
540
 
541
   //#define X2_IS_L6470
541
   //#define X2_IS_L6470
542
   #define X2_MICROSTEPS 16     //number of microsteps
542
   #define X2_MICROSTEPS 16     //number of microsteps
543
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
544
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
 
546
 
547
   //#define Y_IS_L6470
547
   //#define Y_IS_L6470
548
   #define Y_MICROSTEPS 16     //number of microsteps
548
   #define Y_MICROSTEPS 16     //number of microsteps
549
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
550
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
 
552
 
553
   //#define Y2_IS_L6470
553
   //#define Y2_IS_L6470
554
   #define Y2_MICROSTEPS 16     //number of microsteps
554
   #define Y2_MICROSTEPS 16     //number of microsteps
555
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
556
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
 
558
 
559
   //#define Z_IS_L6470
559
   //#define Z_IS_L6470
560
   #define Z_MICROSTEPS 16     //number of microsteps
560
   #define Z_MICROSTEPS 16     //number of microsteps
561
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
562
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
 
564
 
565
   //#define Z2_IS_L6470
565
   //#define Z2_IS_L6470
566
   #define Z2_MICROSTEPS 16     //number of microsteps
566
   #define Z2_MICROSTEPS 16     //number of microsteps
567
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
568
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
 
570
 
571
   //#define E0_IS_L6470
571
   //#define E0_IS_L6470
572
   #define E0_MICROSTEPS 16     //number of microsteps
572
   #define E0_MICROSTEPS 16     //number of microsteps
573
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be 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
574
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
 
576
 
577
   //#define E1_IS_L6470
577
   //#define E1_IS_L6470
578
   #define E1_MICROSTEPS 16     //number of microsteps
578
   #define E1_MICROSTEPS 16     //number of microsteps
579
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
580
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
 
582
 
583
   //#define E2_IS_L6470
583
   //#define E2_IS_L6470
584
   #define E2_MICROSTEPS 16     //number of microsteps
584
   #define E2_MICROSTEPS 16     //number of microsteps
585
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
586
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
 
588
 
589
   //#define E3_IS_L6470
589
   //#define E3_IS_L6470
590
   #define E3_MICROSTEPS 16     //number of microsteps
590
   #define E3_MICROSTEPS 16     //number of microsteps
591
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
591
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
592
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
593
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
594
 
594
 

+ 5
- 5
Marlin/example_configurations/makibox/Configuration.h View File

251
 
251
 
252
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
252
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
253
 
253
 
254
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
254
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
255
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
255
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
256
   #define  DEFAULT_bedKp 10.00
256
   #define  DEFAULT_bedKp 10.00
257
   #define  DEFAULT_bedKi .023
257
   #define  DEFAULT_bedKi .023
258
   #define  DEFAULT_bedKd 305.4
258
   #define  DEFAULT_bedKd 305.4
259
 
259
 
260
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
261
   //from pidautotune
261
   //from pidautotune
262
   //#define  DEFAULT_bedKp 97.1
262
   //#define  DEFAULT_bedKp 97.1
263
   //#define  DEFAULT_bedKi 1.41
263
   //#define  DEFAULT_bedKi 1.41
454
   //   This mode is preferred because there are more measurements.
454
   //   This mode is preferred because there are more measurements.
455
   //
455
   //
456
   // - "3-point" mode
456
   // - "3-point" mode
457
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
457
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
458
   //   You specify the XY coordinates of all 3 points.
458
   //   You specify the XY coordinates of all 3 points.
459
 
459
 
460
   // Enable this to sample the bed in a grid (least squares solution).
460
   // Enable this to sample the bed in a grid (least squares solution).
753
 
753
 
754
 // @section extras
754
 // @section extras
755
 
755
 
756
-// 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
757
 //#define FAST_PWM_FAN
757
 //#define FAST_PWM_FAN
758
 
758
 
759
 // 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
841
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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 3.00  //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
842
 #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
843
 #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
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)
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)
845
 
845
 
846
 //defines used in the code
846
 //defines used in the code
847
 #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

+ 12
- 12
Marlin/example_configurations/makibox/Configuration_adv.h View File

457
 
457
 
458
 /******************************************************************************\
458
 /******************************************************************************\
459
  * enable this section if you have TMC26X motor drivers.
459
  * enable this section if you have TMC26X motor drivers.
460
- * you need to import the TMC26XStepper library into the arduino IDE for this
460
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
461
  ******************************************************************************/
461
  ******************************************************************************/
462
 
462
 
463
 // @section tmc
463
 // @section tmc
519
 
519
 
520
 /******************************************************************************\
520
 /******************************************************************************\
521
  * enable this section if you have L6470  motor drivers.
521
  * enable this section if you have L6470  motor drivers.
522
- * you need to import the L6470 library into the arduino IDE for this
522
+ * you need to import the L6470 library into the Arduino IDE for this
523
  ******************************************************************************/
523
  ******************************************************************************/
524
 
524
 
525
 // @section l6470
525
 // @section l6470
529
 
529
 
530
   //#define X_IS_L6470
530
   //#define X_IS_L6470
531
   #define X_MICROSTEPS 16     //number of microsteps
531
   #define X_MICROSTEPS 16     //number of microsteps
532
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
532
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
533
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
533
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
534
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
534
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
535
 
535
 
536
   //#define X2_IS_L6470
536
   //#define X2_IS_L6470
537
   #define X2_MICROSTEPS 16     //number of microsteps
537
   #define X2_MICROSTEPS 16     //number of microsteps
538
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
538
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
539
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
 
541
 
542
   //#define Y_IS_L6470
542
   //#define Y_IS_L6470
543
   #define Y_MICROSTEPS 16     //number of microsteps
543
   #define Y_MICROSTEPS 16     //number of microsteps
544
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
545
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
 
547
 
548
   //#define Y2_IS_L6470
548
   //#define Y2_IS_L6470
549
   #define Y2_MICROSTEPS 16     //number of microsteps
549
   #define Y2_MICROSTEPS 16     //number of microsteps
550
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
551
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
 
553
 
554
   //#define Z_IS_L6470
554
   //#define Z_IS_L6470
555
   #define Z_MICROSTEPS 16     //number of microsteps
555
   #define Z_MICROSTEPS 16     //number of microsteps
556
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
557
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
 
559
 
560
   //#define Z2_IS_L6470
560
   //#define Z2_IS_L6470
561
   #define Z2_MICROSTEPS 16     //number of microsteps
561
   #define Z2_MICROSTEPS 16     //number of microsteps
562
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
563
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
 
565
 
566
   //#define E0_IS_L6470
566
   //#define E0_IS_L6470
567
   #define E0_MICROSTEPS 16     //number of microsteps
567
   #define E0_MICROSTEPS 16     //number of microsteps
568
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
569
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
 
571
 
572
   //#define E1_IS_L6470
572
   //#define E1_IS_L6470
573
   #define E1_MICROSTEPS 16     //number of microsteps
573
   #define E1_MICROSTEPS 16     //number of microsteps
574
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
575
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
 
577
 
578
   //#define E2_IS_L6470
578
   //#define E2_IS_L6470
579
   #define E2_MICROSTEPS 16     //number of microsteps
579
   #define E2_MICROSTEPS 16     //number of microsteps
580
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
581
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
 
583
 
584
   //#define E3_IS_L6470
584
   //#define E3_IS_L6470
585
   #define E3_MICROSTEPS 16     //number of microsteps
585
   #define E3_MICROSTEPS 16     //number of microsteps
586
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
587
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
 
589
 

+ 5
- 5
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

238
 
238
 
239
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
239
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
240
 
240
 
241
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
241
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
242
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
242
   //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
243
   #define  DEFAULT_bedKp 10.00
243
   #define  DEFAULT_bedKp 10.00
244
   #define  DEFAULT_bedKi .023
244
   #define  DEFAULT_bedKi .023
245
   #define  DEFAULT_bedKd 305.4
245
   #define  DEFAULT_bedKd 305.4
246
 
246
 
247
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
247
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
248
   //from pidautotune
248
   //from pidautotune
249
   //#define  DEFAULT_bedKp 97.1
249
   //#define  DEFAULT_bedKp 97.1
250
   //#define  DEFAULT_bedKi 1.41
250
   //#define  DEFAULT_bedKi 1.41
442
   //   This mode is preferred because there are more measurements.
442
   //   This mode is preferred because there are more measurements.
443
   //
443
   //
444
   // - "3-point" mode
444
   // - "3-point" mode
445
-  //   Probe 3 arbitrary points on the bed (that aren't colinear)
445
+  //   Probe 3 arbitrary points on the bed (that aren't collinear)
446
   //   You specify the XY coordinates of all 3 points.
446
   //   You specify the XY coordinates of all 3 points.
447
 
447
 
448
   // Enable this to sample the bed in a grid (least squares solution).
448
   // Enable this to sample the bed in a grid (least squares solution).
745
 
745
 
746
 // @section extras
746
 // @section extras
747
 
747
 
748
-// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
748
+// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
749
 //#define FAST_PWM_FAN
749
 //#define FAST_PWM_FAN
750
 
750
 
751
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
751
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
833
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
833
 #define DEFAULT_NOMINAL_FILAMENT_DIA 3.00  //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
834
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
834
 #define MEASURED_UPPER_LIMIT         3.30  //upper limit factor used for sensor reading validation in mm
835
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
835
 #define MEASURED_LOWER_LIMIT         1.90  //lower limit factor for sensor reading validation in mm
836
-#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)
836
+#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)
837
 
837
 
838
 //defines used in the code
838
 //defines used in the code
839
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially
839
 #define DEFAULT_MEASURED_FILAMENT_DIA  DEFAULT_NOMINAL_FILAMENT_DIA  //set measured to nominal initially

+ 12
- 12
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

458
 
458
 
459
 /******************************************************************************\
459
 /******************************************************************************\
460
  * enable this section if you have TMC26X motor drivers.
460
  * enable this section if you have TMC26X motor drivers.
461
- * you need to import the TMC26XStepper library into the arduino IDE for this
461
+ * you need to import the TMC26XStepper library into the Arduino IDE for this
462
  ******************************************************************************/
462
  ******************************************************************************/
463
 
463
 
464
 // @section tmc
464
 // @section tmc
520
 
520
 
521
 /******************************************************************************\
521
 /******************************************************************************\
522
  * enable this section if you have L6470  motor drivers.
522
  * enable this section if you have L6470  motor drivers.
523
- * you need to import the L6470 library into the arduino IDE for this
523
+ * you need to import the L6470 library into the Arduino IDE for this
524
  ******************************************************************************/
524
  ******************************************************************************/
525
 
525
 
526
 // @section l6470
526
 // @section l6470
530
 
530
 
531
   //#define X_IS_L6470
531
   //#define X_IS_L6470
532
   #define X_MICROSTEPS 16     //number of microsteps
532
   #define X_MICROSTEPS 16     //number of microsteps
533
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
533
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
534
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
535
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
536
 
536
 
537
   //#define X2_IS_L6470
537
   //#define X2_IS_L6470
538
   #define X2_MICROSTEPS 16     //number of microsteps
538
   #define X2_MICROSTEPS 16     //number of microsteps
539
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
539
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
540
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
541
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
542
 
542
 
543
   //#define Y_IS_L6470
543
   //#define Y_IS_L6470
544
   #define Y_MICROSTEPS 16     //number of microsteps
544
   #define Y_MICROSTEPS 16     //number of microsteps
545
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
 
548
 
549
   //#define Y2_IS_L6470
549
   //#define Y2_IS_L6470
550
   #define Y2_MICROSTEPS 16     //number of microsteps
550
   #define Y2_MICROSTEPS 16     //number of microsteps
551
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
   #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
 
554
 
555
   //#define Z_IS_L6470
555
   //#define Z_IS_L6470
556
   #define Z_MICROSTEPS 16     //number of microsteps
556
   #define Z_MICROSTEPS 16     //number of microsteps
557
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
 
560
 
561
   //#define Z2_IS_L6470
561
   //#define Z2_IS_L6470
562
   #define Z2_MICROSTEPS 16     //number of microsteps
562
   #define Z2_MICROSTEPS 16     //number of microsteps
563
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
 
566
 
567
   //#define E0_IS_L6470
567
   //#define E0_IS_L6470
568
   #define E0_MICROSTEPS 16     //number of microsteps
568
   #define E0_MICROSTEPS 16     //number of microsteps
569
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
 
572
 
573
   //#define E1_IS_L6470
573
   //#define E1_IS_L6470
574
   #define E1_MICROSTEPS 16     //number of microsteps
574
   #define E1_MICROSTEPS 16     //number of microsteps
575
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
 
578
 
579
   //#define E2_IS_L6470
579
   //#define E2_IS_L6470
580
   #define E2_MICROSTEPS 16     //number of microsteps
580
   #define E2_MICROSTEPS 16     //number of microsteps
581
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
 
584
 
585
   //#define E3_IS_L6470
585
   //#define E3_IS_L6470
586
   #define E3_MICROSTEPS 16     //number of microsteps
586
   #define E3_MICROSTEPS 16     //number of microsteps
587
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be careful not to go too high
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
 
590
 

+ 1
- 1
Marlin/language_cn.h View File

8
 #ifndef LANGUAGE_CN_H
8
 #ifndef LANGUAGE_CN_H
9
 #define LANGUAGE_CN_H
9
 #define LANGUAGE_CN_H
10
 
10
 
11
-#define MAPPER_NON         // For direct asci codes
11
+#define MAPPER_NON         // For direct ascii codes
12
 #define DISPLAY_CHARSET_ISO10646_CN
12
 #define DISPLAY_CHARSET_ISO10646_CN
13
 
13
 
14
 #define WELCOME_MSG                         "\xa4\xa5\xa6\xa7"
14
 #define WELCOME_MSG                         "\xa4\xa5\xa6\xa7"

+ 1
- 1
Marlin/language_en.h View File

9
 #define LANGUAGE_EN_H
9
 #define LANGUAGE_EN_H
10
 
10
 
11
 #if DISABLED(MAPPER_NON) && DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_D0D1) && DISABLED(MAPPER_D0D1_MOD) && DISABLED(MAPPER_E382E383)
11
 #if DISABLED(MAPPER_NON) && DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_D0D1) && DISABLED(MAPPER_D0D1_MOD) && DISABLED(MAPPER_E382E383)
12
-  #define MAPPER_NON         // For direct asci codes
12
+  #define MAPPER_NON         // For direct ascii codes
13
 #endif
13
 #endif
14
 
14
 
15
 //#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
15
 //#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays

+ 1
- 1
Marlin/language_test.h View File

25
 //   impossible to have a close to direct mapping but will need giant conversion tables and fonts (we don't want to have in a embedded system).
25
 //   impossible to have a close to direct mapping but will need giant conversion tables and fonts (we don't want to have in a embedded system).
26
 
26
 
27
 
27
 
28
-#define MAPPER_NON         // For direct asci codes ( until now all languages except ru, de, fi, kana_utf8, ... )
28
+#define MAPPER_NON         // For direct ascii codes ( until now all languages except ru, de, fi, kana_utf8, ... )
29
 //#define MAPPER_C2C3        // For most European languages when language file is in utf8
29
 //#define MAPPER_C2C3        // For most European languages when language file is in utf8
30
 //#define MAPPER_D0D1        // For Cyrillic
30
 //#define MAPPER_D0D1        // For Cyrillic
31
 //#define MAPPER_E382E383    // For Katakana
31
 //#define MAPPER_E382E383    // For Katakana

+ 1
- 1
Marlin/planner.cpp View File

892
     // Compute maximum allowable entry speed at junction by centripetal acceleration approximation.
892
     // Compute maximum allowable entry speed at junction by centripetal acceleration approximation.
893
     // Let a circle be tangent to both previous and current path line segments, where the junction
893
     // Let a circle be tangent to both previous and current path line segments, where the junction
894
     // deviation is defined as the distance from the junction to the closest edge of the circle,
894
     // deviation is defined as the distance from the junction to the closest edge of the circle,
895
-    // colinear with the circle center. The circular segment joining the two paths represents the
895
+    // collinear with the circle center. The circular segment joining the two paths represents the
896
     // path of centripetal acceleration. Solve for max velocity based on max acceleration about the
896
     // path of centripetal acceleration. Solve for max velocity based on max acceleration about the
897
     // radius of the circle, defined indirectly by junction deviation. This may be also viewed as
897
     // radius of the circle, defined indirectly by junction deviation. This may be also viewed as
898
     // path width or max_jerk in the previous grbl version. This approach does not actually deviate
898
     // path width or max_jerk in the previous grbl version. This approach does not actually deviate

Loading…
Cancel
Save