Browse Source

Moves the Marlin logo into the buildroot

pull/1/head
João Brázio 9 years ago
parent
commit
3d3a919059
No known key found for this signature in database GPG Key ID: F62CFD37DFFDB540
  1. 21
      README.md
  2. 0
      buildroot/share/pixmaps/logo/Marlin Logo GitHub.png
  3. 0
      buildroot/share/pixmaps/logo/Marlin Logo LCD High.png
  4. 0
      buildroot/share/pixmaps/logo/Marlin Logo LCD Low_old.png
  5. 0
      buildroot/share/pixmaps/logo/Marlin Logo.pdf
  6. 0
      buildroot/share/pixmaps/logo/Marlin Logo.png
  7. 0
      buildroot/share/pixmaps/logo/Marlin Logo.svg
  8. 0
      buildroot/share/pixmaps/logo/Marlin Logo_old.ai
  9. 0
      buildroot/share/pixmaps/logo/Marlin Logo_old.cdr
  10. 0
      buildroot/share/pixmaps/logo/Marlin Logo_old.dxf
  11. 0
      buildroot/share/pixmaps/logo/marlinwiki.png

21
README.md

@ -1,6 +1,12 @@
# Marlin 3D Printer Firmware # Marlin 3D Printer Firmware
<img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki). [![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
<img align="top" width=175 src="buildroot/share/pixmaps/logo/Marlin%20Logo%20GitHub.png" />
Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki).
Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by!
## Release Candidate -- Marlin 1.1.0-RCBugFix - 27 April 2016 ## Release Candidate -- Marlin 1.1.0-RCBugFix - 27 April 2016
@ -58,14 +64,7 @@ Proposed patches should be submitted as a Pull Request against the [RCBugFix](ht
- Do submit questions and concerns. The "naive" question is often the one we forget to ask. - Do submit questions and concerns. The "naive" question is often the one we forget to ask.
- 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. - 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.
## Current Status: Testing ### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by!
[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
[![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
## Credits ## Credits
@ -95,5 +94,3 @@ More features have been added by:
Marlin is published under the [GPL license](/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. Marlin is published under the [GPL license](/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. 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.
[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)

0
Documentation/Logo/Marlin Logo GitHub.png → buildroot/share/pixmaps/logo/Marlin Logo GitHub.png

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
Documentation/Logo/Marlin Logo LCD High.png → buildroot/share/pixmaps/logo/Marlin Logo LCD High.png

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

0
Documentation/Logo/Marlin Logo LCD Low_old.png → buildroot/share/pixmaps/logo/Marlin Logo LCD Low_old.png

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 249 B

0
Documentation/Logo/Marlin Logo.pdf → buildroot/share/pixmaps/logo/Marlin Logo.pdf

0
Documentation/Logo/Marlin Logo.png → buildroot/share/pixmaps/logo/Marlin Logo.png

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

0
Documentation/Logo/Marlin Logo.svg → buildroot/share/pixmaps/logo/Marlin Logo.svg

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

0
Documentation/Logo/Marlin Logo_old.ai → buildroot/share/pixmaps/logo/Marlin Logo_old.ai

0
Documentation/Logo/Marlin Logo_old.cdr → buildroot/share/pixmaps/logo/Marlin Logo_old.cdr

0
Documentation/Logo/Marlin Logo_old.dxf → buildroot/share/pixmaps/logo/Marlin Logo_old.dxf

0
Documentation/Logo/marlinwiki.png → buildroot/share/pixmaps/logo/marlinwiki.png

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Loading…
Cancel
Save