Sfoglia il codice sorgente

Merge branch 'Documentation' of github.com:stv0g/Marlin into Documentation

Steffen Vogel 10 anni fa
parent
commit
26337a56cc
3 ha cambiato i file con 43 aggiunte e 44 eliminazioni
  1. 16
    32
      Documentation/Features.md
  2. 2
    3
      Documentation/Hardware.md
  3. 25
    9
      README.md

+ 16
- 32
Documentation/Features.md Vedi File

@@ -1,13 +1,10 @@
1
-
2
-Features:
3
-=========
1
+# Features
4 2
 
5 3
 *   Interrupt based movement with real linear acceleration
6 4
 *   High steprate
7 5
 *   Look ahead (Keep the speed high when possible. High cornering speed)
8 6
 *   Interrupt based temperature protection
9
-*   preliminary support for Matthew Roberts advance algorithm
10
-    For more info see: http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
7
+*   Preliminary support for [Matthew Roberts Advance Algorithm](http://reprap.org/pipermail/reprap-dev/2011-May/003323.html)
11 8
 *   Full endstop support
12 9
 *   SD Card support
13 10
 *   SD Card folders (works in pronterface)
@@ -19,12 +16,12 @@ Features:
19 16
 *   Arc support
20 17
 *   Temperature oversampling
21 18
 *   Dynamic Temperature setpointing aka "AutoTemp"
22
-*   Support for QTMarlin, a very beta GUI for PID-tuning and velocity-acceleration testing. https://github.com/bkubicek/QTMarlin
19
+*   Support for [QTMarlin](https://github.com/bkubicek/QTMarlin), a very beta GUI for PID-tuning and velocity-acceleration testing. 
23 20
 *   Endstop trigger reporting to the host software.
24 21
 *   Updated sdcardlib
25 22
 *   Heater power reporting. Useful for PID monitoring.
26 23
 *   PID tuning
27
-*   CoreXY kinematics (www.corexy.com/theory.html)
24
+*   [CoreXY kinematics](www.corexy.com/theory.html)
28 25
 *   Delta kinematics
29 26
 *   SCARA kinematics
30 27
 *   Dual X-carriage support for multiple extruder systems
@@ -36,12 +33,9 @@ Features:
36 33
 
37 34
 The default baudrate is 250000. This baudrate has less jitter and hence errors than the usual 115200 baud, but is less supported by drivers and host-environments.
38 35
 
36
+## Differences and additions to the already good Sprinter firmware
39 37
 
40
-Differences and additions to the already good Sprinter firmware:
41
-================================================================
42
-
43
-Look-ahead:
44
------------
38
+### Look-ahead
45 39
 
46 40
 Marlin has look-ahead. While sprinter has to break and re-accelerate at each corner,
47 41
 lookahead will only decelerate and accelerate to a velocity,
@@ -49,21 +43,18 @@ so that the change in vectorial velocity magnitude is less than the xy_jerk_velo
49 43
 This is only possible, if some future moves are already processed, hence the name.
50 44
 It leads to less over-deposition at corners, especially at flat angles.
51 45
 
52
-Arc support:
53
-------------
46
+### Arc support
54 47
 
55 48
 Slic3r can find curves that, although broken into segments, were ment to describe an arc.
56 49
 Marlin is able to print those arcs. The advantage is the firmware can choose the resolution,
57 50
 and can perform the arc with nearly constant velocity, resulting in a nice finish.
58 51
 Also, less serial communication is needed.
59 52
 
60
-Temperature Oversampling:
61
--------------------------
53
+### Temperature Oversampling
62 54
 
63 55
 To reduce noise and make the PID-differential term more useful, 16 ADC conversion results are averaged.
64 56
 
65
-AutoTemp:
66
----------
57
+### AutoTemp
67 58
 
68 59
 If your gcode contains a wide spread of extruder velocities, or you realtime change the building speed, the temperature should be changed accordingly.
69 60
 Usually, higher speed requires higher temperature.
@@ -76,42 +67,36 @@ The wanted temperature then will be set to t=tempmin+factor*maxerate, while bein
76 67
 If the target temperature is set manually or by gcode to a value less then tempmin, it will be kept without change.
77 68
 Ideally, your gcode can be completely free of temperature controls, apart from a M109 S T F in the start.gcode, and a M109 S0 in the end.gcode.
78 69
 
79
-EEPROM:
80
--------
70
+### EEPROM
81 71
 
82 72
 If you know your PID values, the acceleration and max-velocities of your unique machine, you can set them, and finally store them in the EEPROM.
83 73
 After each reboot, it will magically load them from EEPROM, independent what your Configuration.h says.
84 74
 
85
-LCD Menu:
86
----------
75
+### LCD Menu
87 76
 
88 77
 If your hardware supports it, you can build yourself a LCD-CardReader+Click+encoder combination. It will enable you to realtime tune temperatures,
89 78
 accelerations, velocities, flow rates, select and print files from the SD card, preheat, disable the steppers, and do other fancy stuff.
90 79
 One working hardware is documented here: http://www.thingiverse.com/thing:12663
91 80
 Also, with just a 20x4 or 16x2 display, useful data is shown.
92 81
 
93
-SD card folders:
94
-----------------
82
+### SD card directories
95 83
 
96 84
 If you have an SD card reader attached to your controller, also folders work now. Listing the files in pronterface will show "/path/subpath/file.g".
97 85
 You can write to file in a subfolder by specifying a similar text using small letters in the path.
98 86
 Also, backup copies of various operating systems are hidden, as well as files not ending with ".g".
99 87
 
100
-SD card folders:
101
-----------------
88
+### Autostart
102 89
 
103 90
 If you place a file auto[0-9].g into the root of the sd card, it will be automatically executed if you boot the printer. The same file will be executed by selecting "Autostart" from the menu.
104 91
 First *0 will be performed, than *1 and so on. That way, you can heat up or even print automatically without user interaction.
105 92
 
106
-Endstop trigger reporting:
107
---------------------------
93
+### Endstop trigger reporting
108 94
 
109 95
 If an endstop is hit while moving towards the endstop, the location at which the firmware thinks that the endstop was triggered is outputed on the serial port.
110 96
 This is useful, because the user gets a warning message.
111 97
 However, also tools like QTMarlin can use this for finding acceptable combinations of velocity+acceleration.
112 98
 
113
-Coding paradigm:
114
-----------------
99
+### Coding paradigm
115 100
 
116 101
 Not relevant from a user side, but Marlin was split into thematic junks, and has tried to partially enforced private variables.
117 102
 This is intended to make it clearer, what interacts which what, and leads to a higher level of modularization.
@@ -121,8 +106,7 @@ In the serial communication, a #define based level of abstraction was enforced,
121 106
 some transfer is information (usually beginning with "echo:"), an error "error:", or just normal protocol,
122 107
 necessary for backwards compatibility.
123 108
 
124
-Interrupt based temperature measurements:
125
------------------------------------------
109
+### Interrupt based temperature measurements
126 110
 
127 111
 An interrupt is used to manage ADC conversions, and enforce checking for critical temperatures.
128 112
 This leads to less blocking in the heater management routine.

+ 2
- 3
Documentation/Hardware.md Vedi File

@@ -19,8 +19,6 @@ http://reprap.org/wiki/RAMPS
19 19
 #define BOARD_RAMPS_13_EEF      36   // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan)
20 20
 ```
21 21
 
22
-#define BOARD_DUEMILANOVE_328P  4    // Duemilanove w/ ATMega328P pin assignment
23
-
24 22
 ##### Generation 3 Electronics
25 23
 
26 24
 http://reprap.org/wiki/Generation_3_Electronics
@@ -98,6 +96,7 @@ http://reprap.org/wiki/RUMBA
98 96
 #### Others
99 97
 
100 98
 ```
99
+#define BOARD_DUEMILANOVE_328P  4    // Duemilanove w/ ATMega328P pin assignment
101 100
 #define BOARD_STB_11            64   // STB V1.1
102 101
 #define BOARD_ULTIMAKER         7    // Ultimaker
103 102
 #define BOARD_ULTIMAKER_OLD     71   // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
@@ -117,4 +116,4 @@ http://reprap.org/wiki/RUMBA
117 116
 #define BOARD_ELEFU_3           21   // Elefu Ra Board (v3)
118 117
 #define BOARD_5DPRINT           88   // 5DPrint D8 Driver Board
119 118
 #define BOARD_LEAPFROG          999  // Leapfrog
120
-```
119
+```

+ 25
- 9
README.md Vedi File

@@ -14,21 +14,19 @@
14 14
 
15 15
 ## Quick Information
16 16
 
17
-This RepRap firmware is a mashup between <a href="https://github.com/kliment/Sprinter">Sprinter</a>, <a href="https://github.com/simen/grbl/tree">grbl</a> and many original parts.
18
-
19
-Derived from Sprinter and Grbl by Erik van der Zalm.
20
-Sprinters lead developers are Kliment and caru.
21
-Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl
22
-A fork by bkubicek for the Ultimaker was merged, and further development was aided by him.
23
-Some features have been added by:
24
-Lampmaker, Bradley Feldman, and others...
17
+This is a firmware for reprap single-processor electronics setups.
18
+It also works on the Ultimaker PCB. It supports printing from SD card+Folders, and look-ahead trajectory planning.
19
+This firmware is a mashup between [Sprinter](https://github.com/kliment/Sprinter), [grbl](https://github.com/simen/grbl) and many original parts.
25 20
 
26 21
 ## Current Status: Bug Fixing
27 22
 
23
+The Marlin development is currently revived. There's a long list of reported issues and pull requests, which we are working on currently.
24
+We are actively looking for testers. So please try the current development version and report new issues and feedback.
25
+
28 26
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
29 27
 [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin)
30 28
 
31
-What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201
29
+What bugs are we working on: [Bug Fixing Round 2](https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%202)
32 30
 
33 31
 ## Contact
34 32
 
@@ -36,6 +34,24 @@ __IRC:__ #marlin-firmware @freenode
36 34
 
37 35
 __Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da
38 36
 
37
+## Credits
38
+
39
+The current Marlin dev team consists of:
40
+
41
+ - Erik van der Zalm ([@ErikZalm](https://github.com/ErikZalm))
42
+ - [@daid](https://github.com/daid)
43
+ - Bo Herrmannsen ([@boelle](https://github.com/boelle))
44
+
45
+Sprinters lead developers are Kliment and caru.
46
+Grbls lead developer is Simen Svale Skogsrud.
47
+Sonney Jeon (Chamnit) improved some parts of grbl
48
+A fork by bkubicek for the Ultimaker was merged.
49
+
50
+More features have been added by:
51
+  - Lampmaker,
52
+  - Bradley Feldman,
53
+  - and others...
54
+
39 55
 ## Licence
40 56
 
41 57
 Marlin is published unde the [GPL license](/Documentation/COPYING.md) because I believe in open development.

Loading…
Annulla
Salva