3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity
2,911 Commits 21 Branches 81 Tags 1.9 GiB
C++ 63.5%
C 33.5%
Python 1.2%
Shell 0.7%
JavaScript 0.3%
Other 0.6%
ea897654a4
Go to file
AnHardt ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h 
to avoid errors in Marlin_main.cpp. #1860

In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h

On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
2015-04-08 21:53:58 +02:00
ArduinoAddons Actually activate Automatic Versioning 2015-04-02 09:20:24 -05:00
Documentation Added #error + mention not to enable ABL and Mesh at the same time 2015-04-06 19:38:59 +02:00
Marlin Moved the definitions of the LCD_STR_* to Conditionals.h 2015-04-08 21:53:58 +02:00
.gitignore Adjust per-project .gitignore 2015-04-02 09:20:24 -05:00
.travis.yml Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
README.md Fix typo in readme 2015-04-07 23:03:46 -05:00

README.md

Marlin 3D Printer Firmware

RepRap.org Wiki Page

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.

Coverity Scan Build Status Travis Build Status

Contact

Google Hangout: Hangout

Credits

The current Marlin dev team consists of:

  • Scott Lahteine [@thinkyhead]

Sprinters lead developers are Kliment and caru. Grbl's 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...

License

Marlin is published under 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.

Flattr this git repo