Browse Source

Various typo fixes - only in comments, no code changes.

Cylindric 10 years ago
parent
commit
fdce91192e
3 changed files with 27 additions and 27 deletions
  1. 5
    5
      Marlin/Marlin.h
  2. 19
    19
      Marlin/Marlin_main.cpp
  3. 3
    3
      Marlin/qr_solve.cpp

+ 5
- 5
Marlin/Marlin.h View File

1
 // Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
1
 // Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
2
-// Licence: GPL
2
+// License: GPL
3
 
3
 
4
 #ifndef MARLIN_H
4
 #ifndef MARLIN_H
5
 #define MARLIN_H
5
 #define MARLIN_H
30
 # include "Arduino.h"
30
 # include "Arduino.h"
31
 #else
31
 #else
32
 # include "WProgram.h"
32
 # include "WProgram.h"
33
-  //Arduino < 1.0.0 does not define this, so we need to do it ourselfs
33
+  //Arduino < 1.0.0 does not define this, so we need to do it ourselves
34
 # define analogInputToDigitalPin(p) ((p) + A0)
34
 # define analogInputToDigitalPin(p) ((p) + A0)
35
 #endif
35
 #endif
36
 
36
 
87
 void serial_echopair_P(const char *s_P, unsigned long v);
87
 void serial_echopair_P(const char *s_P, unsigned long v);
88
 
88
 
89
 
89
 
90
-//things to write to serial from Programmemory. saves 400 to 2k of RAM.
90
+//Things to write to serial from Program memory. Saves 400 to 2k of RAM.
91
 FORCE_INLINE void serialprintPGM(const char *str)
91
 FORCE_INLINE void serialprintPGM(const char *str)
92
 {
92
 {
93
   char ch=pgm_read_byte(str);
93
   char ch=pgm_read_byte(str);
184
 
184
 
185
 bool IsStopped();
185
 bool IsStopped();
186
 
186
 
187
-void enquecommand(const char *cmd); //put an ascii command at the end of the current buffer.
188
-void enquecommand_P(const char *cmd); //put an ascii command at the end of the current buffer, read from flash
187
+void enquecommand(const char *cmd); //put an ASCII command at the end of the current buffer.
188
+void enquecommand_P(const char *cmd); //put an ASCII command at the end of the current buffer, read from flash
189
 void prepare_arc_move(char isclockwise);
189
 void prepare_arc_move(char isclockwise);
190
 void clamp_to_software_endstops(float target[3]);
190
 void clamp_to_software_endstops(float target[3]);
191
 
191
 

+ 19
- 19
Marlin/Marlin_main.cpp View File

63
 
63
 
64
 #define VERSION_STRING  "1.0.0"
64
 #define VERSION_STRING  "1.0.0"
65
 
65
 
66
-// look here for descriptions of gcodes: http://linuxcnc.org/handbook/gcode/g-code.html
66
+// look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html
67
 // http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
67
 // http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
68
 
68
 
69
 //Implemented Codes
69
 //Implemented Codes
80
 // G30 - Single Z Probe, probes bed at current XY location.
80
 // G30 - Single Z Probe, probes bed at current XY location.
81
 // G90 - Use Absolute Coordinates
81
 // G90 - Use Absolute Coordinates
82
 // G91 - Use Relative Coordinates
82
 // G91 - Use Relative Coordinates
83
-// G92 - Set current position to cordinates given
83
+// G92 - Set current position to coordinates given
84
 
84
 
85
 // M Codes
85
 // M Codes
86
 // M0   - Unconditional stop - Wait for user to press a button on the LCD (Only if ULTRA_LCD is enabled)
86
 // M0   - Unconditional stop - Wait for user to press a button on the LCD (Only if ULTRA_LCD is enabled)
101
 // M31  - Output time since last M109 or SD card start to serial
101
 // M31  - Output time since last M109 or SD card start to serial
102
 // M32  - Select file and start SD print (Can be used _while_ printing from SD card files):
102
 // M32  - Select file and start SD print (Can be used _while_ printing from SD card files):
103
 //        syntax "M32 /path/filename#", or "M32 S<startpos bytes> !filename#"
103
 //        syntax "M32 /path/filename#", or "M32 S<startpos bytes> !filename#"
104
-//        Call gcode file : "M32 P !filename#" and return to caller file after finishing (simiarl to #include).
104
+//        Call gcode file : "M32 P !filename#" and return to caller file after finishing (similar to #include).
105
 //        The '#' is necessary when calling from within sd files, as it stops buffer prereading
105
 //        The '#' is necessary when calling from within sd files, as it stops buffer prereading
106
 // M42  - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
106
 // M42  - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
107
 // M80  - Turn on Power Supply
107
 // M80  - Turn on Power Supply
127
 // M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil)
127
 // M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil)
128
 // M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil)
128
 // M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil)
129
 // M140 - Set bed target temp
129
 // M140 - Set bed target temp
130
-// M150 - Set BlinkM Colour Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work.
130
+// M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work.
131
 // M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
131
 // M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
132
 //        Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
132
 //        Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
133
 // M200 D<millimeters>- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
133
 // M200 D<millimeters>- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
134
 // M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
134
 // M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
135
 // M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!!
135
 // M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!!
136
 // M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec
136
 // M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec
137
-// M204 - Set default acceleration: S normal moves T filament only moves (M204 S3000 T7000) im mm/sec^2  also sets minimum segment time in ms (B20000) to prevent buffer underruns and M20 minimum feedrate
137
+// M204 - Set default acceleration: S normal moves T filament only moves (M204 S3000 T7000) in mm/sec^2  also sets minimum segment time in ms (B20000) to prevent buffer under-runs and M20 minimum feedrate
138
 // M205 -  advanced settings:  minimum travel speed S=while printing T=travel only,  B=minimum segment time X= maximum xy jerk, Z=maximum Z jerk, E=maximum E jerk
138
 // M205 -  advanced settings:  minimum travel speed S=while printing T=travel only,  B=minimum segment time X= maximum xy jerk, Z=maximum Z jerk, E=maximum E jerk
139
-// M206 - set additional homeing offset
139
+// M206 - set additional homing offset
140
 // M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop], stays in mm regardless of M200 setting
140
 // M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop], stays in mm regardless of M200 setting
141
-// M208 - set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/min]
141
+// M208 - set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/sec]
142
 // M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction.
142
 // M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction.
143
 // M218 - set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
143
 // M218 - set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
144
 // M220 S<factor in percent>- set speed factor override percentage
144
 // M220 S<factor in percent>- set speed factor override percentage
147
 // M240 - Trigger a camera to take a photograph
147
 // M240 - Trigger a camera to take a photograph
148
 // M250 - Set LCD contrast C<contrast value> (value 0..63)
148
 // M250 - Set LCD contrast C<contrast value> (value 0..63)
149
 // M280 - set servo position absolute. P: servo index, S: angle or microseconds
149
 // M280 - set servo position absolute. P: servo index, S: angle or microseconds
150
-// M300 - Play beepsound S<frequency Hz> P<duration ms>
150
+// M300 - Play beep sound S<frequency Hz> P<duration ms>
151
 // M301 - Set PID parameters P I and D
151
 // M301 - Set PID parameters P I and D
152
 // M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
152
 // M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
153
 // M303 - PID relay autotune S<temperature> sets the target temperature. (default target temperature = 150C)
153
 // M303 - PID relay autotune S<temperature> sets the target temperature. (default target temperature = 150C)
155
 // M400 - Finish all moves
155
 // M400 - Finish all moves
156
 // M401 - Lower z-probe if present
156
 // M401 - Lower z-probe if present
157
 // M402 - Raise z-probe if present
157
 // M402 - Raise z-probe if present
158
-// M500 - stores paramters in EEPROM
158
+// M500 - stores parameters in EEPROM
159
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
159
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
160
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
160
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
161
-// M503 - print the current settings (from memory not from eeprom)
161
+// M503 - print the current settings (from memory not from EEPROM)
162
 // M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
162
 // M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
163
 // M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
163
 // M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
164
-// M666 - set delta endstop adjustemnt
164
+// M666 - set delta endstop adjustment
165
 // M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ]
165
 // M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ]
166
 // M907 - Set digital trimpot motor current using axis codes.
166
 // M907 - Set digital trimpot motor current using axis codes.
167
 // M908 - Control digital trimpot directly.
167
 // M908 - Control digital trimpot directly.
254
 
254
 
255
 
255
 
256
 //===========================================================================
256
 //===========================================================================
257
-//=============================private variables=============================
257
+//=============================Private Variables=============================
258
 //===========================================================================
258
 //===========================================================================
259
 const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
259
 const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
260
 static float destination[NUM_AXIS] = {  0.0, 0.0, 0.0, 0.0};
260
 static float destination[NUM_AXIS] = {  0.0, 0.0, 0.0, 0.0};
274
 static char serial_char;
274
 static char serial_char;
275
 static int serial_count = 0;
275
 static int serial_count = 0;
276
 static boolean comment_mode = false;
276
 static boolean comment_mode = false;
277
-static char *strchr_pointer; // just a pointer to find chars in the cmd string like X, Y, Z, E, etc
277
+static char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc
278
 
278
 
279
 const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42
279
 const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42
280
 
280
 
302
 bool target_direction;
302
 bool target_direction;
303
 
303
 
304
 //===========================================================================
304
 //===========================================================================
305
-//=============================ROUTINES=============================
305
+//=============================Routines======================================
306
 //===========================================================================
306
 //===========================================================================
307
 
307
 
308
 void get_arc_coordinates();
308
 void get_arc_coordinates();
339
 {
339
 {
340
   if(buflen < BUFSIZE)
340
   if(buflen < BUFSIZE)
341
   {
341
   {
342
-    //this is dangerous if a mixing of serial and this happsens
342
+    //this is dangerous if a mixing of serial and this happens
343
     strcpy(&(cmdbuffer[bufindw][0]),cmd);
343
     strcpy(&(cmdbuffer[bufindw][0]),cmd);
344
     SERIAL_ECHO_START;
344
     SERIAL_ECHO_START;
345
     SERIAL_ECHOPGM("enqueing \"");
345
     SERIAL_ECHOPGM("enqueing \"");
354
 {
354
 {
355
   if(buflen < BUFSIZE)
355
   if(buflen < BUFSIZE)
356
   {
356
   {
357
-    //this is dangerous if a mixing of serial and this happsens
357
+    //this is dangerous if a mixing of serial and this happens
358
     strcpy_P(&(cmdbuffer[bufindw][0]),cmd);
358
     strcpy_P(&(cmdbuffer[bufindw][0]),cmd);
359
     SERIAL_ECHO_START;
359
     SERIAL_ECHO_START;
360
     SERIAL_ECHOPGM("enqueing \"");
360
     SERIAL_ECHOPGM("enqueing \"");
661
     return;
661
     return;
662
   }
662
   }
663
 
663
 
664
-  //'#' stops reading from sd to the buffer prematurely, so procedural macro calls are possible
665
-  // if it occures, stop_buffering is triggered and the buffer is ran dry.
666
-  // this character _can_ occure in serial com, due to checksums. however, no checksums are used in sd printing
664
+  //'#' stops reading from SD to the buffer prematurely, so procedural macro calls are possible
665
+  // if it occurs, stop_buffering is triggered and the buffer is ran dry.
666
+  // this character _can_ occur in serial com, due to checksums. however, no checksums are used in SD printing
667
 
667
 
668
   static bool stop_buffering=false;
668
   static bool stop_buffering=false;
669
   if(buflen==0) stop_buffering=false;
669
   if(buflen==0) stop_buffering=false;

+ 3
- 3
Marlin/qr_solve.cpp View File

1171
 
1171
 
1172
   Discussion:
1172
   Discussion:
1173
 
1173
 
1174
-    DQRLSS must be preceeded by a call to DQRANK.
1174
+    DQRLSS must be preceded by a call to DQRANK.
1175
 
1175
 
1176
     The system is to be solved is
1176
     The system is to be solved is
1177
       A * X = B
1177
       A * X = B
1223
     linear system.
1223
     linear system.
1224
 
1224
 
1225
     Output, double RSD[M], the residual, B - A*X.  RSD may
1225
     Output, double RSD[M], the residual, B - A*X.  RSD may
1226
-    overwite B.
1226
+    overwrite B.
1227
 
1227
 
1228
     Input, int JPVT[N], the pivot information from DQRANK.
1228
     Input, int JPVT[N], the pivot information from DQRANK.
1229
     Columns JPVT[0], ..., JPVT[KR-1] of the original matrix are linearly
1229
     Columns JPVT[0], ..., JPVT[KR-1] of the original matrix are linearly
1312
     can be replaced by dummy variables in the calling program.
1312
     can be replaced by dummy variables in the calling program.
1313
     To save storage, the user may in some cases use the same
1313
     To save storage, the user may in some cases use the same
1314
     array for different parameters in the calling sequence.  A
1314
     array for different parameters in the calling sequence.  A
1315
-    frequently occuring example is when one wishes to compute
1315
+    frequently occurring example is when one wishes to compute
1316
     any of B, RSD, or AB and does not need Y or QTY.  In this
1316
     any of B, RSD, or AB and does not need Y or QTY.  In this
1317
     case one may identify Y, QTY, and one of B, RSD, or AB, while
1317
     case one may identify Y, QTY, and one of B, RSD, or AB, while
1318
     providing separate arrays for anything else that is to be
1318
     providing separate arrays for anything else that is to be

Loading…
Cancel
Save