diff --git a/Marlin/Version.h b/Marlin/Version.h index 63f4b81ab..d8d490ebb 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 "bugfix-1.1.x" /** * 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-12-06 12:00" + #define STRING_DISTRIBUTION_DATE "2017-05-04 12:00" /** * Required minimum Configuration.h and Configuration_adv.h file versions. diff --git a/README.md b/README.md index acca5b1db..393cb20bd 100644 --- a/README.md +++ b/README.md @@ -1,40 +1,114 @@ # Marlin 3D Printer Firmware - - -## Marlin 1.1.0 - -Marlin 1.1 represents an evolutionary leap over Marlin 1.0.2. It is the result of over two years of effort by several volunteers around the world who have paid meticulous and sometimes obsessive attention to every detail. For this release we focused on code quality, performance, stability, and overall user experience. Several new features have also been added, many of which require no extra hardware. - -For complete Marlin documentation click over to the [Marlin Homepage ](http://marlinfw.org/), where you will find in-depth articles, how-to videos, and tutorials on every aspect of Marlin, as the site develops. For release notes, see the [Releases](https://github.com/MarlinFirmware/Marlin/releases) page. - -## Stable Release Branch - -This Release branch contains the latest tagged version of Marlin (currently 1.1.0 – May 2017). - -Previous releases of Marlin include [1.0.2-2](https://github.com/MarlinFirmware/Marlin/tree/1.0.2-2) (December 2016) and [1.0.1](https://github.com/MarlinFirmware/Marlin/tree/1.0.1) (December 2014). Any version of Marlin prior to 1.0.1 (when we started tagging versions) can be collectively referred to as Marlin 1.0.0. - -## Contributing to Marlin - -Click on the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues) and [Pull Requests](https://github.com/MarlinFirmware/Marlin/pulls) links above at any time to see what we're currently working on. - -To submit patches and new features for Marlin 1.1 check out the [bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x) branch, add your commits, and submit a Pull Request back to the `bugfix-1.1.x` branch. Periodically that branch will form the basis for the next minor release. - -Note that our "bugfix" branch will always contain the latest patches to the current release version. These patches may not be widely tested. As always, when using "nightly" builds of Marlin, proceed with full caution. - -## Current Status: In Development - -Marlin development has reached an important milestone with its first stable release in over 2 years. During this period we focused on cleaning up the code and making it more modern, consistent, readable, and sensible. - -## Future Development - -Arduino IDE now supports folder hierarchies, so Marlin 1.1 is the last "flat" version of Marlin. Version 1.2 will have a hierarchical file structure, and will form the starting-point for our integration of 32-bit CPU support. +[![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) -[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) -##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) -##### [Marlin Home Page](http://marlinfw.org/) -##### [Marlin Discussion Forum](http://forums.reprap.org/list.php?415) + + +Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/). +Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by! + +## Bugfix Branch + +__Not for production use. Use with caution!__ + +This branch is used to accumulate patches to the latest 1.1.x release version. Periodically this branch will form the basis for the next minor 1.1.x release. + +Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.0.) + +## Recent Changes +- 1.1.0 - 4 May 2017 + - See the [1.1.0 Release Notes](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0) for a full list of changes. + +- RC8 - 6 Dec 2016 + - Major performance improvement for Graphical LCDs + - Simplified probe configuration + - Enable Auto Bed Leveling by type + - Reduce serial communication errors + - Make Bilinear (Mesh) Grid Leveling available for non-delta + - Support for Trinamic TMC2130 SilentStepStick SPI-based drivers + - Add `M211` to Enable/Disable Software Endstops + - Add `M355` to turn the case light on/off and set brightness + - Improved I2C class with full master/slave support + - Add `G38.2` `G38.3` command option for CNC style probing + - Add `MINIMUM_STEPPER_PULSE` option to adjust step pulse duration + - Add `R` parameter support for `G2`/`G3` + - Add `M43` optional command (`PINS_DEBUGGING`) + - Remove SCARA axis scaling + - Improved sanity checking of configuration + - Improved support for PlatformIO and command-line build + - Usable `DELTA_CALIBRATION_MENU` + - Support for Printrbot Rev.F + - New and updated languages + +- RC7 - 26 Jul 2016 + - Add Print Job Timer and Print Counter (`PRINTCOUNTER`) + - New `M600` Filament Change (`FILAMENT_CHANGE_FEATURE`) + - New `G12` Nozzle Clean (`NOZZLE_CLEAN_FEATURE`) + - New `G27` Nozzle Park (`NOZZLE_PARK_FEATURE`) + - Add support for `COREYZ` + - Add a new Advance Extrusion algorithm (`LIN_ADVANCE`) + - Add support for inches, Fahrenheit, Kelvin units (`INCH_MODE_SUPPORT`, `TEMPERATURE_UNITS_SUPPORT`) + - Better handling of `G92` shifting of the coordinate space + - Add Greek and Croatian languages + - Improve the Manual (Mesh) Bed Leveling user interface + - Add support for more boards, controllers, and probes: + - Vellemann K8400 (`BOARD_K8400`) + - RigidBot V2 (`BOARD_RIGIDBOARD_V2`) + - Cartesio UI (`BOARD_CNCONTROLS_12`) + - BLTouch probe sensor (`BLTOUCH`) + - Viki 2 with RAMPS and MKS boards + - Improve support for `DELTA` and other kinematics + - Improve thermal management, add `WATCH_BED_TEMP_PERIOD` + - Better handling of toolchange, multiple tools + - Add support for two X steppers `X_DUAL_STEPPER_DRIVERS` + - Add support for `SINGLENOZZLE`, `MIXING_EXTRUDER`, and `SWITCHING_EXTRUDER` + - Simplified probe configuration, allow usage without bed leveling + - And much more… See the [1.1.0-RC7 Change Log](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0-RC7) for the complete list of changes. + +- RC6 - 24 Apr 2016 + - Marlin now requires Arduino version 1.6.0 or later + - Completed support for CoreXY / CoreXZ + - See the [1.1.0-RC6 Change Log](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0-RC6) for all the changes. + +- RC5 - 01 Apr 2016 + - Warn if compiling with older versions (<1.50) of Arduino + - Fix various LCD menu issues + - Add formal support for MKSv1.3 and Sainsmart (RAMPS variants) + - Fix bugs in M104, M109, and M190 + - Fix broken M404 command + - Fix issues with M23 and "Start SD Print" + - More output for M111 + - Rename FILAMENT_SENSOR to FILAMENT_WIDTH_SENSOR + - Fix SD card bugs + - and a lot more + - See the [1.1.0-RC5 Change Log](https://github.com/MarlinFirmware/Marlin/releases/tag/1.1.0-RC5) for more! + +- RC4 - 24 Mar 2016 + - Many lingering bugs and nagging issues addressed + - Improvements to LCD menus, CoreXY/CoreXZ, Delta, Bed Leveling, and more… + +- RC3 - 01 Dec 2015 + - A number of language sensitive strings have been revised + - Formatting of the LCD display has been improved to handle negative coordinates better + - Various compiler-related issues have been corrected + +- RC2 - 29 Sep 2015 + - File styling reverted + - LCD update frequency reduced + +- RC1 - 19 Sep 2015 + - Published for testing + +## Submitting Patches + +Proposed patches should be submitted as a Pull Request against this branch ([bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x)). + +- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 1.2 and beyond should improve on separation of bug fixes and cutting-edge development. +- Follow the proper coding style to gain points with the maintainers. See our [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) page for more information. +- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). The "naive" question is often the one we forget to ask. + +### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) ## Credits @@ -74,8 +148,6 @@ More features have been added by: ## License -Marlin is published under the [GPL license](/COPYING.md) 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. - -[![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) diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo index 571531755..e22744fe9 100755 --- a/buildroot/share/git/mfinfo +++ b/buildroot/share/git/mfinfo @@ -25,7 +25,7 @@ if [[ $ORG != MarlinFirmware ]]; then fi case "$REPO" in - Marlin ) TARG=RCBugFix ;; + Marlin ) TARG=bugfix-1.1.x ;; MarlinDev ) TARG=dev ;; MarlinDocumentation ) TARG=master ;; esac