From d97dc10216d9a431278052e5b60973bafeeed7e0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 4 Aug 2016 13:59:38 -0700 Subject: [PATCH] RC7 README --- Marlin/Version.h | 4 ++-- README.md | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 5aa79221aeb4..520835e01fc0 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -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. diff --git a/README.md b/README.md index 112b0eadcce5..4558637d68af 100644 --- a/README.md +++ b/README.md @@ -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) - 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)