Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
## Bugfix Branch
## Marlin 2.0 Bugfix Branch
__Not for production use. Use with caution!__
__Not for production use. Use with caution!__
This branch is used to accumulate patches to the latest 1.1.x release version. Periodically this branch will form the basis for the next minor 1.1.x release.
This branch is used to accumulate patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release.
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.1.)
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
## Recent Changes
## Recent Changes
- Further integration of Unified Bed Leveling
- Add a Hardware Abstraction Layer (HAL) supporting current AVR platforms
- Initial UBL LCD Menu
- Planning a HAL for Re:Arm
- New optimized G-code parser singleton
- Planning a HAL for STM32
- Initial M3/M4/M5 Spindle and Laser support
- Added M421 Q to offset a mesh point
- Refinements to G26 and G33
- Added M80 S to query the power state
- "Cancel Print" now shuts off heaters
- Added `EXTRAPOLATE_BEYOND_GRID` option for mesh-based leveling
## Submitting Patches
## Submitting Patches
Proposed patches should be submitted as a Pull Request against this branch ([bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x)).
Proposed patches should be submitted as a Pull Request against this branch ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)).
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 1.2 and beyond should improve on separation of bug fixes and cutting-edge development.
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
- Follow the proper coding style to gain points with the maintainers. See our [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) page for more information.
- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). The "naive" question is often the one we forget to ask.
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
@ -43,35 +37,8 @@ The current Marlin dev team consists of:
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Deutsch, English
- Chris Pepper [[@p3p](https://github.com/p3p)] - English
- Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)] - Deutsch, English
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Deutsch, English
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
- Bo Hermannsen [[@boelle](https://github.com/boelle)] - Danish, English
- Bob Cousins [[@bobc](https://github.com/bobc)] - English
- [[@maverikou](https://github.com/maverikou)]
- Chris Palmer [[@nophead](https://github.com/nophead)]
- [[@paclema](https://github.com/paclema)]
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
- David Braam [[@daid](https://github.com/daid)]
- Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
More features have been added by:
- Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)] - English, Italian
- Thomas Moore [[@tcm0116](https://github.com/tcm0116)]
@ -18,7 +18,7 @@ The following scripts can be used on macOS or Linux to speed up the process of w
File|Description
File|Description
----|-----------
----|-----------
mfadd [user]|Add Remote - Add another Github user's fork of Marlin as a remote, then fetch it. After this you can check out one of their branches and either make a PR targeted at their fork or targeted at `bugfix-1.1.x`.
mfadd [user]|Add Remote - Add another Github user's fork of Marlin as a remote, then fetch it. After this you can check out one of their branches and either make a PR targeted at their fork or targeted at `bugfix-2.0.x`.
mfinit|Init Working Copy - Creates a remote named '`upstream`' (for use by the other scripts) pointing to the '`MarlinFirmware`' fork. Use once after checking out your fork.
mfinit|Init Working Copy - Creates a remote named '`upstream`' (for use by the other scripts) pointing to the '`MarlinFirmware`' fork. Use once after checking out your fork.
@ -50,7 +50,7 @@ mfpub|Build the documentation and publish it to marlinfw.org via Github.
File|Description
File|Description
----|-----------
----|-----------
ghtp -[h/s]|Set the protocol to use for all remotes. -h for HTTPS, -s for SSL.
ghtp -[h/s]|Set the protocol to use for all remotes. -h for HTTPS, -s for SSL.
mfinfo|This utility script is used by the other scripts to get:<br/>- The upstream project ('`MarlinFirmware`')<br/>- the '`origin`' project (i.e., your Github username),<br/>- the repository name ('`Marlin`'),<br/>- the PR target branch ('`bugfix-1.1.x`'), and<br/>- the current branch (or the first command-line argument).<br/><br/>By itself, `mfinfo` simply prints these values to the console.
mfinfo|This utility script is used by the other scripts to get:<br/>- The upstream project ('`MarlinFirmware`')<br/>- the '`origin`' project (i.e., your Github username),<br/>- the repository name ('`Marlin`'),<br/>- the PR target branch ('`bugfix-2.0.x`'), and<br/>- the current branch (or the first command-line argument).<br/><br/>By itself, `mfinfo` simply prints these values to the console.
mfclean |Prune your merged and remotely-deleted branches.
mfclean |Prune your merged and remotely-deleted branches.
Scott Lahteine
8 years ago