Browse Source

Fix minor spelling in comments

Scott Lahteine 8 years ago
parent
commit
1cc622b167

+ 1
- 1
Marlin/Configuration.h View File

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

+ 2
- 2
Marlin/SanityCheck.h View File

@@ -177,7 +177,7 @@
177 177
 #endif
178 178
 
179 179
 #if ((HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)) && HAS_Z_PROBE) && ( ENABLED(FIX_MOUNTED_PROBE) || defined(Z_ENDSTOP_SERVO_NR) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_SLED))
180
-  #error A probe should not be connected to more then one pin! [Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN || HAS_Z_PROBE]
180
+  #error A probe should not be connected to more than one pin! [Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN || HAS_Z_PROBE]
181 181
 #endif
182 182
 
183 183
 /**
@@ -191,7 +191,7 @@
191 191
   #error For Z_SAFE_HOMING define one kind of probe! [Servo | MECHANICAL_PROBE | Z_PROBE_SLED | FIX_MOUNTED_PROBE]
192 192
 #endif
193 193
 
194
-// To do: Fail with more then one probe defined
194
+// To do: Fail with more than one probe defined
195 195
 
196 196
 /**
197 197
  * Auto Bed Leveling

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -239,7 +239,7 @@
239 239
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
240 240
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
241 241
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
242
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
242
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
243 243
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
244 244
   #define K1 0.95 //smoothing factor within the PID
245 245
 

+ 1
- 1
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 250  // If the temperature difference between the target temperature and the actual temperature
239
-                                    // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                    // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -243,7 +243,7 @@
243 243
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
244 244
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
245 245
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
246
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
246
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
247 247
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
248 248
   #define K1 0.95 //smoothing factor within the PID
249 249
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -261,7 +261,7 @@
261 261
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
262 262
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
263 263
   #define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature
264
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
264
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
265 265
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
266 266
   #define K1 0.95 //smoothing factor within the PID
267 267
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 16 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -239,7 +239,7 @@
239 239
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
240 240
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
241 241
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
242
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
242
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
243 243
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
244 244
   #define K1 0.95 //smoothing factor within the PID
245 245
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -242,7 +242,7 @@
242 242
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
243 243
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
244 244
   #define PID_FUNCTIONAL_RANGE 50 // If the temperature difference between the target temperature and the actual temperature
245
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
245
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
246 246
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
247 247
   #define K1 0.95 //smoothing factor within the PID
248 248
 

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

@@ -259,7 +259,7 @@
259 259
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
260 260
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
261 261
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
262
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
262
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
263 263
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
264 264
   #define K1 0.95 //smoothing factor within the PID
265 265
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

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

@@ -236,7 +236,7 @@
236 236
   //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders)
237 237
                                     // Set/get with gcode: M301 E[extruder number, 0-2]
238 238
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
239
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
239
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
240 240
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
241 241
   #define K1 0.95 //smoothing factor within the PID
242 242
 

+ 1
- 1
Marlin/fonts/README.fonts View File

@@ -4,7 +4,7 @@ Then run make_fonts.bat what calls bdf2u8g.exe with the needed parameters to pro
4 4
 The .h files must be edited to replace '#include "u8g.h"' with '#include <utility/u8g.h>', replace 'U8G_FONT_SECTION' with 'U8G_SECTION', insert '.progmem.' right behind the first '"' and moved to the main directory.
5 5
 
6 6
 How to integrate a new font:
7
-Currently we are limited to 256 symbols per font. We use a menu system with 5 lines, on a display with 64 pixel height. That means we have 12 pixel for a line. To have some space in between the lines we can't use more then 10 pixel height for the symbols. For up to 11 pixel set TALL_FONT_CORRECTION 1 when loading the font.
7
+Currently we are limited to 256 symbols per font. We use a menu system with 5 lines, on a display with 64 pixel height. That means we have 12 pixel for a line. To have some space in between the lines we can't use more than 10 pixel height for the symbols. For up to 11 pixel set TALL_FONT_CORRECTION 1 when loading the font.
8 8
 To fit 22 Symbols on the 128 pixel wide screen, the symbols can't be wider than 5 pixel, for the first 128 symbols.
9 9
 For the second half of the font we now support up to 11x11 pixel.
10 10
 

+ 1
- 1
Marlin/language_test.h View File

@@ -37,7 +37,7 @@
37 37
 // a.)For ASCII coded Language_xx.h files like (en) there are no occurrences of symbols above 0x7F so no mapper is needed.
38 38
 //   If such a symbol appears it is mapped directly into the font. This is the case for the language files we used until now, with all the STR_XX or
39 39
 //   "\xxx" symbols. All Symbols are only one byte long.
40
-// b.) For Unicoded Language_xx.h files (currently ru, de and kana_utf8 ) the non ASCII [0x00-0x7F] symbols are represented by more then one byte.
40
+// b.) For Unicoded Language_xx.h files (currently ru, de and kana_utf8 ) the non ASCII [0x00-0x7F] symbols are represented by more than one byte.
41 41
 //   In the case of two bytes the first is pointing to a 'codepage' and the second to a place in the codepage. These codepages contain 64 symbols.
42 42
 //   So two of them can be mapped. For most of the European languages the necessary symbols are contained in the pages C2 and C3. Cyrillic uses D0
43 43
 //   and D1.

Loading…
Cancel
Save