Bläddra i källkod

Update headings in Marlin_main.cpp and stepper.cpp

Scott Lahteine 10 år sedan
förälder
incheckning
072625ccad
2 ändrade filer med 57 tillägg och 52 borttagningar
  1. 37
    33
      Marlin/Marlin_main.cpp
  2. 20
    19
      Marlin/stepper.cpp

+ 37
- 33
Marlin/Marlin_main.cpp Visa fil

@@ -1,30 +1,30 @@
1
-/* -*- c++ -*- */
2
-
3
-/*
4
-    Reprap firmware based on Sprinter and grbl.
5
- Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
-
7
- This program is free software: you can redistribute it and/or modify
8
- it under the terms of the GNU General Public License as published by
9
- the Free Software Foundation, either version 3 of the License, or
10
- (at your option) any later version.
11
-
12
- This program is distributed in the hope that it will be useful,
13
- but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- GNU General Public License for more details.
16
-
17
- You should have received a copy of the GNU General Public License
18
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
- */
20
-
21
-/*
22
- This firmware is a mashup between Sprinter and grbl.
23
-  (https://github.com/kliment/Sprinter)
24
-  (https://github.com/simen/grbl/tree)
25
-
26
- It has preliminary support for Matthew Roberts advance algorithm
27
-    http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
1
+/**
2
+ * Marlin Firmware
3
+ *
4
+ * Based on Sprinter and grbl.
5
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ *
7
+ * This program is free software: you can redistribute it and/or modify
8
+ * it under the terms of the GNU General Public License as published by
9
+ * the Free Software Foundation, either version 3 of the License, or
10
+ * (at your option) any later version.
11
+ *
12
+ * This program is distributed in the hope that it will be useful,
13
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
+ * GNU General Public License for more details.
16
+ *
17
+ * You should have received a copy of the GNU General Public License
18
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
+ *
20
+ * About Marlin
21
+ *
22
+ * This firmware is a mashup between Sprinter and grbl.
23
+ *  - https://github.com/kliment/Sprinter
24
+ *  - https://github.com/simen/grbl/tree
25
+ *
26
+ * It has preliminary support for Matthew Roberts advance algorithm
27
+ *  - http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
28 28
  */
29 29
 
30 30
 #include "Marlin.h"
@@ -73,13 +73,12 @@
73 73
  *  - http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
74 74
  *
75 75
  * Help us document these G-codes online:
76
+ *  - http://www.marlinfirmware.org/index.php/G-Code
76 77
  *  - http://reprap.org/wiki/G-code
77
- *  - https://github.com/MarlinFirmware/Marlin/wiki/Marlin-G-Code
78
- */
79
-
80
-/**
78
+ *
79
+ * -----------------
81 80
  * Implemented Codes
82
- * -------------------
81
+ * -----------------
83 82
  *
84 83
  * "G" Codes
85 84
  *
@@ -163,7 +162,7 @@
163 162
  * 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
164 163
  * M206 - Set additional homing offset
165 164
  * M207 - Set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop], stays in mm regardless of M200 setting
166
- * M208 - Set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/sec]
165
+ * M208 - Set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/min]
167 166
  * 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.
168 167
  * M218 - Set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
169 168
  * M220 - Set speed factor override percentage: S<factor in percent>
@@ -215,6 +214,11 @@
215 214
  *
216 215
  * M928 - Start SD logging (M928 filename.g) - ended by M29
217 216
  * M999 - Restart after being stopped by error
217
+ *
218
+ * "T" Codes
219
+ *
220
+ * T0-T3 - Select a tool by index (usually an extruder) [ F<mm/min> ]
221
+ *
218 222
  */
219 223
 
220 224
 #ifdef SDSUPPORT

+ 20
- 19
Marlin/stepper.cpp Visa fil

@@ -1,22 +1,23 @@
1
-/*
2
-  stepper.c - stepper motor driver: executes motion plans using stepper motors
3
-  Part of Grbl
4
-
5
-  Copyright (c) 2009-2011 Simen Svale Skogsrud
6
-
7
-  Grbl is free software: you can redistribute it and/or modify
8
-  it under the terms of the GNU General Public License as published by
9
-  the Free Software Foundation, either version 3 of the License, or
10
-  (at your option) any later version.
11
-
12
-  Grbl is distributed in the hope that it will be useful,
13
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
14
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
-  GNU General Public License for more details.
16
-
17
-  You should have received a copy of the GNU General Public License
18
-  along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
19
-*/
1
+/**
2
+ * stepper.cpp - stepper motor driver: executes motion plans using stepper motors
3
+ * Marlin Firmware
4
+ *
5
+ * Derived from Grbl
6
+ * Copyright (c) 2009-2011 Simen Svale Skogsrud
7
+ *
8
+ * Grbl is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * Grbl is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
20
+ */
20 21
 
21 22
 /* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
22 23
    and Philipp Tiefenbacher. */

Laddar…
Avbryt
Spara