Browse Source

Merge pull request #769 from Cylindric3D/typofixes_1

Various typo fixes - only in comments, no code changes.
nothinman 11 years ago
parent
commit
3f455889d0
2 changed files with 36 additions and 36 deletions
  1. 22
    22
      Marlin/Configuration.h
  2. 14
    14
      Marlin/Configuration_adv.h

+ 22
- 22
Marlin/Configuration.h View File

8
 //===========================================================================
8
 //===========================================================================
9
 //============================= DELTA Printer ===============================
9
 //============================= DELTA Printer ===============================
10
 //===========================================================================
10
 //===========================================================================
11
-// For a Delta printer rplace the configuration files wilth the files in the
11
+// For a Delta printer replace the configuration files with the files in the
12
 // example_configurations/delta directory.
12
 // example_configurations/delta directory.
13
 //
13
 //
14
 
14
 
68
 // 702= Minitronics v1.0
68
 // 702= Minitronics v1.0
69
 // 90 = Alpha OMCA board
69
 // 90 = Alpha OMCA board
70
 // 91 = Final OMCA board
70
 // 91 = Final OMCA board
71
-// 301 = Rambo
71
+// 301= Rambo
72
 // 21 = Elefu Ra Board (v3)
72
 // 21 = Elefu Ra Board (v3)
73
 
73
 
74
 #ifndef MOTHERBOARD
74
 #ifndef MOTHERBOARD
91
 
91
 
92
 #define POWER_SUPPLY 1
92
 #define POWER_SUPPLY 1
93
 
93
 
94
-// Define this to have the electronics keep the powersupply off on startup. If you don't know what this is leave it.
94
+// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
95
 // #define PS_DEFAULT_OFF
95
 // #define PS_DEFAULT_OFF
96
 
96
 
97
 //===========================================================================
97
 //===========================================================================
106
 // 0 is not used
106
 // 0 is not used
107
 // 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
107
 // 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
108
 // 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
108
 // 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
109
-// 3 is mendel-parts thermistor (4.7k pullup)
109
+// 3 is Mendel-parts thermistor (4.7k pullup)
110
 // 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
110
 // 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
111
 // 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
111
 // 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
112
 // 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
112
 // 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
116
 // 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
116
 // 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
117
 // 10 is 100k RS thermistor 198-961 (4.7k pullup)
117
 // 10 is 100k RS thermistor 198-961 (4.7k pullup)
118
 // 20 is the PT100 circuit found in the Ultimainboard V2.x
118
 // 20 is the PT100 circuit found in the Ultimainboard V2.x
119
-// 60 is 100k Maker's Tool Works Kapton Bed Thermister
119
+// 60 is 100k Maker's Tool Works Kapton Bed Thermistor
120
 //
120
 //
121
 //    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
121
 //    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
122
 //                          (but gives greater accuracy and more stable PID)
122
 //                          (but gives greater accuracy and more stable PID)
182
   #define K1 0.95 //smoothing factor within the PID
182
   #define K1 0.95 //smoothing factor within the PID
183
   #define PID_dT ((OVERSAMPLENR * 8.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
183
   #define PID_dT ((OVERSAMPLENR * 8.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
184
 
184
 
185
-// If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it
185
+// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
186
 // Ultimaker
186
 // Ultimaker
187
     #define  DEFAULT_Kp 22.2
187
     #define  DEFAULT_Kp 22.2
188
     #define  DEFAULT_Ki 1.08
188
     #define  DEFAULT_Ki 1.08
189
     #define  DEFAULT_Kd 114
189
     #define  DEFAULT_Kd 114
190
 
190
 
191
-// Makergear
191
+// MakerGear
192
 //    #define  DEFAULT_Kp 7.0
192
 //    #define  DEFAULT_Kp 7.0
193
 //    #define  DEFAULT_Ki 0.1
193
 //    #define  DEFAULT_Ki 0.1
194
 //    #define  DEFAULT_Kd 12
194
 //    #define  DEFAULT_Kd 12
257
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
257
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
258
 
258
 
259
 #ifndef ENDSTOPPULLUPS
259
 #ifndef ENDSTOPPULLUPS
260
-  // fine Enstop settings: Individual Pullups. will be ignored if ENDSTOPPULLUPS is defined
260
+  // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
261
   // #define ENDSTOPPULLUP_XMAX
261
   // #define ENDSTOPPULLUP_XMAX
262
   // #define ENDSTOPPULLUP_YMAX
262
   // #define ENDSTOPPULLUP_YMAX
263
   // #define ENDSTOPPULLUP_ZMAX
263
   // #define ENDSTOPPULLUP_ZMAX
341
   #define BACK_PROBE_BED_POSITION 180
341
   #define BACK_PROBE_BED_POSITION 180
342
   #define FRONT_PROBE_BED_POSITION 20
342
   #define FRONT_PROBE_BED_POSITION 20
343
 
343
 
344
-  // these are the offsets to the prob relative to the extruder tip (Hotend - Probe)
344
+  // these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
345
   #define X_PROBE_OFFSET_FROM_EXTRUDER -25
345
   #define X_PROBE_OFFSET_FROM_EXTRUDER -25
346
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29
346
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29
347
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35
347
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35
362
 //  #define PROBE_SERVO_DEACTIVATION_DELAY 300
362
 //  #define PROBE_SERVO_DEACTIVATION_DELAY 300
363
 
363
 
364
 
364
 
365
-//If you have enabled the Bed Auto Levelling and are using the same Z Probe for Z Homing,
365
+//If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
366
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
366
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
367
 
367
 
368
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with probe outside the bed area.
368
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with probe outside the bed area.
396
 //#define BED_CENTER_AT_0_0  // If defined, the center of the bed is at (X=0, Y=0)
396
 //#define BED_CENTER_AT_0_0  // If defined, the center of the bed is at (X=0, Y=0)
397
 
397
 
398
 //Manual homing switch locations:
398
 //Manual homing switch locations:
399
-// For deltabots this means top and center of the cartesian print volume.
399
+// For deltabots this means top and center of the Cartesian print volume.
400
 #define MANUAL_X_HOME_POS 0
400
 #define MANUAL_X_HOME_POS 0
401
 #define MANUAL_Y_HOME_POS 0
401
 #define MANUAL_Y_HOME_POS 0
402
 #define MANUAL_Z_HOME_POS 0
402
 #define MANUAL_Z_HOME_POS 0
410
 
410
 
411
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200.0*8/3,760*1.1}  // default steps per unit for Ultimaker
411
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200.0*8/3,760*1.1}  // default steps per unit for Ultimaker
412
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
412
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
413
-#define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
413
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
414
 
414
 
415
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
415
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
416
 #define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
416
 #define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
431
 //===========================================================================
431
 //===========================================================================
432
 
432
 
433
 // EEPROM
433
 // EEPROM
434
-// the microcontroller can store settings in the EEPROM, e.g. max velocity...
435
-// M500 - stores paramters in EEPROM
434
+// The microcontroller can store settings in the EEPROM, e.g. max velocity...
435
+// M500 - stores parameters in EEPROM
436
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
436
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
437
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
437
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
438
-//define this to enable eeprom support
438
+//define this to enable EEPROM support
439
 //#define EEPROM_SETTINGS
439
 //#define EEPROM_SETTINGS
440
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
440
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
441
 // please keep turned on if you can.
441
 // please keep turned on if you can.
451
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
451
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
452
 
452
 
453
 //LCD and SD support
453
 //LCD and SD support
454
-//#define ULTRA_LCD  //general lcd support, also 16x2
454
+//#define ULTRA_LCD  //general LCD support, also 16x2
455
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
455
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
456
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
456
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
457
 //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
457
 //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
458
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
458
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
459
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
459
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
460
-//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
461
-//#define ULTIPANEL  //the ultipanel as on thingiverse
460
+//#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
461
+//#define ULTIPANEL  //the UltiPanel as on Thingiverse
462
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
462
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
463
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
463
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
464
 
464
 
583
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
583
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
584
 //#define SR_LCD
584
 //#define SR_LCD
585
 #ifdef SR_LCD
585
 #ifdef SR_LCD
586
-   #define SR_LCD_2W_NL    // Non latching 2 wire shiftregister
586
+   #define SR_LCD_2W_NL    // Non latching 2 wire shift register
587
    //#define NEWPANEL
587
    //#define NEWPANEL
588
 #endif
588
 #endif
589
 
589
 
599
     #define LCD_WIDTH 20
599
     #define LCD_WIDTH 20
600
     #define LCD_HEIGHT 4
600
     #define LCD_HEIGHT 4
601
   #endif
601
   #endif
602
-#else //no panel but just lcd
602
+#else //no panel but just LCD
603
   #ifdef ULTRA_LCD
603
   #ifdef ULTRA_LCD
604
   #ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
604
   #ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
605
     #define LCD_WIDTH 20
605
     #define LCD_WIDTH 20
621
 // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
621
 // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
622
 //#define FAST_PWM_FAN
622
 //#define FAST_PWM_FAN
623
 
623
 
624
-// Temperature status leds that display the hotend and bet temperature.
625
-// If alle hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
624
+// Temperature status LEDs that display the hotend and bet temperature.
625
+// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
626
 // Otherwise the RED led is on. There is 1C hysteresis.
626
 // Otherwise the RED led is on. There is 1C hysteresis.
627
 //#define TEMP_STAT_LEDS
627
 //#define TEMP_STAT_LEDS
628
 
628
 

+ 14
- 14
Marlin/Configuration_adv.h View File

11
 #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control
11
 #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control
12
 
12
 
13
 //// Heating sanity check:
13
 //// Heating sanity check:
14
-// This waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
14
+// This waits for the watch period in milliseconds whenever an M104 or M109 increases the target temperature
15
 // If the temperature has not increased at the end of that period, the target temperature is set to zero.
15
 // If the temperature has not increased at the end of that period, the target temperature is set to zero.
16
 // It can be reset with another M104/M109. This check is also only triggered if the target temperature and the current temperature
16
 // It can be reset with another M104/M109. This check is also only triggered if the target temperature and the current temperature
17
 //  differ by at least 2x WATCH_TEMP_INCREASE
17
 //  differ by at least 2x WATCH_TEMP_INCREASE
19
 //#define WATCH_TEMP_INCREASE 10  //Heat up at least 10 degree in 20 seconds
19
 //#define WATCH_TEMP_INCREASE 10  //Heat up at least 10 degree in 20 seconds
20
 
20
 
21
 #ifdef PIDTEMP
21
 #ifdef PIDTEMP
22
-  // this adds an experimental additional term to the heatingpower, proportional to the extrusion speed.
23
-  // if Kc is choosen well, the additional required power due to increased melting should be compensated.
22
+  // this adds an experimental additional term to the heating power, proportional to the extrusion speed.
23
+  // if Kc is chosen well, the additional required power due to increased melting should be compensated.
24
   #define PID_ADD_EXTRUSION_RATE
24
   #define PID_ADD_EXTRUSION_RATE
25
   #ifdef PID_ADD_EXTRUSION_RATE
25
   #ifdef PID_ADD_EXTRUSION_RATE
26
-    #define  DEFAULT_Kc (1) //heatingpower=Kc*(e_speed)
26
+    #define  DEFAULT_Kc (1) //heating power=Kc*(e_speed)
27
   #endif
27
   #endif
28
 #endif
28
 #endif
29
 
29
 
34
 // the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp
34
 // the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp
35
 // you exit the value by any M109 without F*
35
 // you exit the value by any M109 without F*
36
 // Also, if the temperature is set to a value <mintemp, it is not changed by autotemp.
36
 // Also, if the temperature is set to a value <mintemp, it is not changed by autotemp.
37
-// on an ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
37
+// on an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
38
 #define AUTOTEMP
38
 #define AUTOTEMP
39
 #ifdef AUTOTEMP
39
 #ifdef AUTOTEMP
40
   #define AUTOTEMP_OLDWEIGHT 0.98
40
   #define AUTOTEMP_OLDWEIGHT 0.98
282
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
282
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
283
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
283
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
284
 
284
 
285
-#define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the filesystem block order.
286
-// if a file is deleted, it frees a block. hence, the order is not purely cronological. To still have auto0.g accessible, there is again the option to do that.
285
+#define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
286
+// if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
287
 // using:
287
 // using:
288
 //#define MENU_ADDAUTOSTART
288
 //#define MENU_ADDAUTOSTART
289
 
289
 
290
-// The hardware watchdog should reset the Microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
290
+// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
291
 //#define USE_WATCHDOG
291
 //#define USE_WATCHDOG
292
 
292
 
293
 #ifdef USE_WATCHDOG
293
 #ifdef USE_WATCHDOG
301
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
301
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
302
 
302
 
303
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
303
 // Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process
304
-// it can e.g. be used to change z-positions in the print startup phase in realtime
304
+// it can e.g. be used to change z-positions in the print startup phase in real-time
305
 // does not respect endstops!
305
 // does not respect endstops!
306
 //#define BABYSTEPPING
306
 //#define BABYSTEPPING
307
 #ifdef BABYSTEPPING
307
 #ifdef BABYSTEPPING
324
 //
324
 //
325
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTUDER_ADVANCE_K * cubic mm per second ^ 2
325
 // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTUDER_ADVANCE_K * cubic mm per second ^ 2
326
 //
326
 //
327
-// hooke's law says:		force = k * distance
328
-// bernoulli's priniciple says:	v ^ 2 / 2 + g . h + pressure / density = constant
327
+// Hooke's law says:		force = k * distance
328
+// Bernoulli's principle says:	v ^ 2 / 2 + g . h + pressure / density = constant
329
 // so: v ^ 2 is proportional to number of steps we advance the extruder
329
 // so: v ^ 2 is proportional to number of steps we advance the extruder
330
 //#define ADVANCE
330
 //#define ADVANCE
331
 
331
 
379
 //===========================================================================
379
 //===========================================================================
380
 
380
 
381
 // The number of linear motions that can be in the plan at any give time.
381
 // The number of linear motions that can be in the plan at any give time.
382
-// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ringbuffering.
382
+// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
383
 #if defined SDSUPPORT
383
 #if defined SDSUPPORT
384
   #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
384
   #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
385
 #else
385
 #else
387
 #endif
387
 #endif
388
 
388
 
389
 
389
 
390
-//The ASCII buffer for recieving from the serial:
390
+//The ASCII buffer for receiving from the serial:
391
 #define MAX_CMD_SIZE 96
391
 #define MAX_CMD_SIZE 96
392
 #define BUFSIZE 4
392
 #define BUFSIZE 4
393
 
393
 
394
 
394
 
395
-// Firmware based and LCD controled retract
395
+// Firmware based and LCD controlled retract
396
 // M207 and M208 can be used to define parameters for the retraction.
396
 // M207 and M208 can be used to define parameters for the retraction.
397
 // The retraction can be called by the slicer using G10 and G11
397
 // The retraction can be called by the slicer using G10 and G11
398
 // until then, intended retractions can be detected by moves that only extrude and the direction.
398
 // until then, intended retractions can be detected by moves that only extrude and the direction.

Loading…
Cancel
Save