mirror of https://github.com/MarlinFirmware/Marlin.git and custom config

Go to file

Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist Small changes (and formatting to confuse the diff’er) which first allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a #warning (rather than error) that the extra progress bar / message options don’t apply to graphical displays at this time. This leaves open perhaps combining the progress bar and message area in some future (or forked custom) graphical LCD display arrangement (at which time the relevant variables may be moved into ultralcd.cpp with externs in ultralcd.h). I also added a conditional error that the progress bar and the filament display may not work well together.		2015-01-09 18:16:56 -08:00
ArduinoAddons	adding hardware files for OMC	2014-12-17 23:01:30 +01:00
Documentation	reformatting	2015-01-08 19:38:52 +01:00
Marlin	DOGLCD and LCD_PROGRESS_BAR to coexist	2015-01-09 18:16:56 -08:00
.gitignore	Update .gitignore	2015-01-03 13:52:52 +01:00
.travis.yml	Commented out configs that are failing with no easy fixes for the moment	2015-01-03 22:46:15 +00:00
README.md	added link to IRC web chat, archive and mailing list	2015-01-09 22:28:47 +01:00

Marlin 3D Printer Firmware

Configuration & Compilation
Supported
- Features
- Hardware
- GCodes
Notes
- Auto Bed Leveling
- Filament Sensor

Quick Information

This is a firmware for reprap single-processor electronics setups. It also works on the Ultimaker PCB. It supports printing from SD card+Folders, and look-ahead trajectory planning. This firmware is a mashup between Sprinter, grbl and many original parts.

Current Status: Bug Fixing

The Marlin development is currently revived. There's a long list of reported issues and pull requests, which we are working on currently. We are actively looking for testers. So please try the current development version and report new issues and feedback.

What bugs are we working on: Bug Fixing Round 2

Contact

IRC: #marlin-firmware @freenode (WebChat Client, Archive)

Mailing List: marlin@lists.0l.de (Subscribe, Archive)

Credits

The current Marlin dev team consists of:

Erik van der Zalm (@ErikZalm)
@daid
Bo Herrmannsen (@boelle)

Sprinters lead developers are Kliment and caru. Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl A fork by bkubicek for the Ultimaker was merged.

More features have been added by:

Lampmaker,
Bradley Feldman,
and others...

Licence

Marlin is published unde the GPL license because I believe in open development. Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent.

README.md