Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bugfix-2.1.x
Choose a base ref
...
head repository: 3DprintFIT/Marlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: RC
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 21, 2016

  1. RC7 README

    @thinkyhead
    thinkyhead committed Aug 21, 2016
    Copy the full SHA
    d97dc10 View commit details
Showing with 14 additions and 10 deletions.
  1. +2 −2 Marlin/Version.h
  2. +12 −8 README.md
4 changes: 2 additions & 2 deletions Marlin/Version.h
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
/**
* Marlin release version identifier
*/
#define SHORT_BUILD_VERSION "1.1.0-RCBugFix"
#define SHORT_BUILD_VERSION "1.1.0-RC7"

/**
* Verbose version identifier which should contain a reference to the location
@@ -48,7 +48,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
#define STRING_DISTRIBUTION_DATE "2016-07-26 12:00"
#define STRING_DISTRIBUTION_DATE "2016-07-31 12:00"

/**
* Required minimum Configuration.h and Configuration_adv.h file versions.
20 changes: 12 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# Marlin 3D Printer Firmware

[![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-250.png" />

Additional documentation can be found at [The Marlin Documentation Project](https://www.marlinfw.org/).
Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by!

## Release Candidate -- Marlin 1.1.0-RCBugFix - 26 July 2016
## Release Candidate -- Marlin 1.1.0-RC7 - 31 July 2016

__Not for production use – use with caution!__

@@ -17,9 +14,7 @@ You can download earlier versions of Marlin on the [Releases page](https://githu
The latest Release Candidate lives in the ["RC" branch](https://github.com/MarlinFirmware/Marlin/tree/RC). Bugs that we find in the current Release Candidate are patched in the ["RCBugFix" branch](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix), so during beta testing this is where you can always find the latest code on its way towards release.

## Recent Changes
- RCBugFix

- RC7 - 26 Jul 2016
- RC7 - 31 Jul 2016
- Add Print Job Timer and Print Counter (`PRINTCOUNTER`)
- New `M600` Filament Change (`FILAMENT_CHANGE_FEATURE`)
- New `G12` Nozzle Clean (`NOZZLE_CLEAN_FEATURE`)
@@ -85,7 +80,14 @@ 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.
- 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.

### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
## Current Status: Testing

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

@@ -115,3 +117,5 @@ 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.

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)