Go to file

Roxy-3D c11665e92f Regression fixes for UBL's G29 P1, G29 P2, G29 P4 and G26 (#9213 ) The changes to ultralcd.cpp for is_lcd_clicked() did not encompass the full functionality of UBL's G29 P1, P2 and P4. It also broke G26's ability to abort in several of its phases. This is the first pass at fixing the problem. It has been tested for correctness for several hours but more testing needs to be done. There may be a few follow up patches to finish covering all the corner cases, but right now I need to merge this before any conflicts show up. Some of these changes will need to be moved over to the bugfix-v2.0.0 branch. That will happen a few days from now.		2018-01-17 00:27:50 -06:00
.github	Give a more detailed issue template	2017-06-22 18:17:02 -05:00
buildroot	Fix use_example_configs handling spaces in path	2017-12-16 17:32:32 -06:00
Marlin	Regression fixes for UBL's G29 P1, G29 P2, G29 P4 and G26 (#9213 )	2018-01-17 00:27:50 -06:00
.gitattributes	Add hidden option to output Bilinear grids in JSON	2017-04-05 23:43:17 -05:00
.gitignore	Merge pull request #8452 from tcm0116/1.1.x-pio_deps	2017-11-16 22:54:15 -06:00
.travis.yml	Use Arduino 1.8.5 for Travis CI	2018-01-10 05:23:06 -06:00
LICENSE	Update LICENSE	2015-11-12 13:09:59 -06:00
platformio.ini	[1.1.x][PlatformIO] Stop compiling after first five errors (#8828 )	2017-12-19 23:59:19 -06:00
README.md	Update README.md for bugfix	2017-12-15 20:14:25 -06:00

Marlin 3D Printer Firmware

Additional documentation can be found at the Marlin Home Page. Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!

Bugfix Branch

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.

Download earlier versions of Marlin on the Releases page. (The latest tagged release of Marlin is version 1.1.7.)

Recent Changes

Internally always use native machine space
Initial UBL LCD Menu
New optimized G-code parser singleton
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

Proposed patches should be submitted as a Pull Request against this branch (bugfix-1.1.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 2.0 and beyond should improve on separation of bug fixes and cutting-edge development.
Follow the proper coding style to gain points with the maintainers. See our Coding Standards page for more information.
Please submit your questions and concerns to the Issue Queue. The "naive" question is often the one we forget to ask.

Credits

The current Marlin dev team consists of:

Roxanne Neufeld [@Roxy-3D]
Scott Lahteine [@thinkyhead]
Bob Kuhn [@Bob-the-Kuhn]

Notable contributors include:

Alberto Cotronei [@MagoKimbra]
Andreas Hardtung [@AnHardt]
Bernhard Kubicek [@bkubicek]
Bob Cousins [@bobc]
Chris Palmer [@nophead]
David Braam [@daid]
Edward Patel [@epatel]
Erik van der Zalm [@ErikZalm]
Ernesto Martinez [@emartinez167]
F. Malpartida [@fmalpartida]
Jochen Groppe [@CONSULitAS]
João Brazio [@jbrazio]
Kai [@Kaibob2]
Luc Van Daele[@LVD-AC]
Nico Tonnhofer [@Wurstnase]
Petr Zahradnik [@clexpert]
Thomas Moore [@tcm0116]
[@alexxy]
[@android444]
[@benlye]
[@bgort]
[@Grogyan]
[@marcio-ao]
[@maverikou]
[@oysteinkrog]
[@p3p]
[@paclema]
[@paulusjacobus]
[@psavva]
[@Tannoo]
[@teemuatlut]
...and many others

License

Marlin is published under the GPL license because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.

While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.

README.md