|
@@ -1,18 +1,22 @@
|
1
|
1
|
# Marlin 3D Printer Firmware
|
2
|
2
|
<img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
|
3
|
|
- Additional documentation can be found in [our wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page).
|
|
3
|
+ Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page).
|
4
|
4
|
|
5
|
|
-## Release Candidate -- Marlin 1.1.0-RC3 - 01 December 2015
|
|
5
|
+## Release Candidate -- Marlin 1.1.0-RC4 - 24 March 2016
|
6
|
6
|
|
7
|
7
|
__Not for production use – use with caution!__
|
8
|
8
|
|
9
|
|
-Previously tagged versions of Marlin are not recommended. However, the latest patches to the Marlin 1.0 series can be found in the [1.0.x](https://github.com/MarlinFirmware/Marlin/tree/1.0.x) branch.
|
|
9
|
+You can download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest "stable" release of Marlin is 1.0.2-1.)
|
10
|
10
|
|
11
|
|
-[This branch, "RC"](https://github.com/MarlinFirmware/Marlin/tree/RC), is our current pre-release candidate.
|
|
11
|
+You'll always find the latest Release Candidate in the ["RC" branch](https://github.com/MarlinFirmware/Marlin/tree/RC). Bugs that we find in the current Release Candidate are patched in the ["RCBugFix" branch](https://github.com/MarlinFirmware/Marlin/tree/RC), so during beta testing this is where you can always find the latest code on its way towards release.
|
12
|
12
|
|
13
|
|
-Future development takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/).
|
|
13
|
+Future development (Marlin 1.2 and beyond) takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/).
|
14
|
14
|
|
15
|
15
|
## Recent Changes
|
|
16
|
+RC4 - 24 Mar 2016
|
|
17
|
+ Many lingering bugs and nagging issues addressed
|
|
18
|
+ Improvements to LCD menus, CoreXY/CoreXZ, Delta, Bed Leveling, and more…
|
|
19
|
+
|
16
|
20
|
RC3 - 01 Dec 2015
|
17
|
21
|
A number of language sensitive strings have been revised
|
18
|
22
|
Formatting of the LCD display has been improved to handle negative coordinates better
|
|
@@ -26,25 +30,21 @@ RC1 - 19 Sep 2015
|
26
|
30
|
Published for testing
|
27
|
31
|
|
28
|
32
|
## Submitting Patches
|
29
|
|
-Proposed patches should be submitted as a Pull Request against the [RCBugFix](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix) branch
|
30
|
|
-Note: Do not propose added features. Patches to the Release Candidate are limited to corrections of coding errors for the functions that have been implemented.
|
31
|
|
-Please follow the proper style. Pull requests containing styling errors will have to be reworked.
|
32
|
|
-
|
|
33
|
+Proposed patches should be submitted as a Pull Request against the [RCBugFix](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix) branch.
|
33
|
34
|
|
|
35
|
+- Don't submit new feature proposals. The RCBugFix branch is for fixing bugs in existing features.
|
|
36
|
+- Do submit questions and concerns. The "naive" question is often the one we forget to ask.
|
|
37
|
+- Follow the proper coding style. Pull requests with styling errors will be delayed. See our [Coding Standards](https://github.com/MarlinFirmware/Marlin/wiki/DNE-Coding-Standards) page for more information.
|
34
|
38
|
|
35
|
39
|
## Current Status: Testing
|
36
|
40
|
|
37
|
|
-Please test this firmware and inform us of any issues where it fails to perform in a manner consistent with the designed functionality.
|
|
41
|
+Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by!
|
38
|
42
|
|
39
|
43
|
[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
|
40
|
44
|
[![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
|
41
|
45
|
|
42
|
46
|
##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
|
43
|
47
|
|
44
|
|
-## Contact
|
45
|
|
-
|
46
|
|
-__Google Hangout:__ <a href="https://plus.google.com/hangouts/_/gxn3wrea5gdhoo223yimsiforia" target="_blank">. Hangout</a> We have a hangout every 2 weeks. Search the issue list for "Hangout" and you will see what time and date the next event is going on.
|
47
|
|
-
|
48
|
48
|
## Credits
|
49
|
49
|
|
50
|
50
|
The current Marlin dev team consists of:
|