Marlin bugfix-2.0.x Version/README
This commit is contained in:
Scott Lahteine
parent
367e1b54ba
commit
e4fcf460e7
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -8496,7 +8496,7 @@ inline void gcode_M205() {
|
||||
*
|
||||
* *** @thinkyhead: I recommend deprecating M206 for SCARA in favor of M665.
|
||||
* *** M206 for SCARA will remain enabled in 1.1.x for compatibility.
|
||||
* *** In the next 1.2 release, it will simply be disabled by default.
|
||||
* *** In the 2.0 release, it will simply be disabled by default.
|
||||
*/
|
||||
inline void gcode_M206() {
|
||||
LOOP_XYZ(i)
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
/**
|
||||
* Marlin release version identifier
|
||||
*/
|
||||
#define SHORT_BUILD_VERSION "bugfix-1.1.x"
|
||||
#define SHORT_BUILD_VERSION "bugfix-2.0.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 "2017-05-04 12:00"
|
||||
#define STRING_DISTRIBUTION_DATE "2017-07-27 12:00"
|
||||
|
||||
/**
|
||||
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
||||
@ -57,8 +57,8 @@
|
||||
* but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option on
|
||||
* the configuration files.
|
||||
*/
|
||||
#define REQUIRED_CONFIGURATION_H_VERSION 010100
|
||||
#define REQUIRED_CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define REQUIRED_CONFIGURATION_H_VERSION 020000
|
||||
#define REQUIRED_CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
/**
|
||||
* The protocol for communication to the host. Protocol indicates communication
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//================================= README ==================================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
/**
|
||||
* Sample configuration file for TinyBoy2 L10/L16
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
/**
|
||||
* Sample configuration file for Vellemann K8200
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_H
|
||||
#define CONFIGURATION_H
|
||||
#define CONFIGURATION_H_VERSION 010100
|
||||
#define CONFIGURATION_H_VERSION 020000
|
||||
|
||||
//===========================================================================
|
||||
//============================= Getting Started =============================
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
#ifndef CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H
|
||||
#define CONFIGURATION_ADV_H_VERSION 010100
|
||||
#define CONFIGURATION_ADV_H_VERSION 020000
|
||||
|
||||
// @section temperature
|
||||
|
||||
|
||||
55
README.md
55
README.md
@ -8,32 +8,26 @@
|
||||
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
|
||||
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
|
||||
|
||||
## Bugfix Branch
|
||||
## Marlin 2.0 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.
|
||||
This branch is used to accumulate patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.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.1.)
|
||||
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
|
||||
|
||||
## Recent Changes
|
||||
- Further integration of Unified Bed Leveling
|
||||
- Initial UBL LCD Menu
|
||||
- New optimized G-code parser singleton
|
||||
- Initial M3/M4/M5 Spindle and Laser support
|
||||
- Added M421 Q to offset a mesh point
|
||||
- Refinements to G26 and G33
|
||||
- Added M80 S to query the power state
|
||||
- "Cancel Print" now shuts off heaters
|
||||
- Added `EXTRAPOLATE_BEYOND_GRID` option for mesh-based leveling
|
||||
- Add a Hardware Abstraction Layer (HAL) supporting current AVR platforms
|
||||
- Planning a HAL for Re:Arm
|
||||
- Planning a HAL for STM32
|
||||
|
||||
## 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)).
|
||||
Proposed patches should be submitted as a Pull Request against this branch ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.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.
|
||||
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
|
||||
- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
|
||||
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
|
||||
|
||||
### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
|
||||
|
||||
@ -43,35 +37,8 @@ The current Marlin dev team consists of:
|
||||
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
|
||||
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
|
||||
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
|
||||
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Deutsch, English
|
||||
- Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)] - Deutsch, English
|
||||
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Deutsch, English
|
||||
- Chris Pepper [[@p3p](https://github.com/p3p)] - English
|
||||
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
|
||||
- Bo Hermannsen [[@boelle](https://github.com/boelle)] - Danish, English
|
||||
- Bob Cousins [[@bobc](https://github.com/bobc)] - English
|
||||
- [[@maverikou](https://github.com/maverikou)]
|
||||
- Chris Palmer [[@nophead](https://github.com/nophead)]
|
||||
- [[@paclema](https://github.com/paclema)]
|
||||
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
|
||||
- David Braam [[@daid](https://github.com/daid)]
|
||||
- Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
|
||||
|
||||
More features have been added by:
|
||||
- Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)] - English, Italian
|
||||
- Thomas Moore [[@tcm0116](https://github.com/tcm0116)]
|
||||
- Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)]
|
||||
- Petr Zahradnik [[@clexpert](https://github.com/clexpert)]
|
||||
- Kai [[@Kaibob2](https://github.com/Kaibob2)]
|
||||
- Edward Patel [[@epatel](https://github.com/epatel)]
|
||||
- F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)] - English, Spanish
|
||||
- [[@esenapaj](https://github.com/esenapaj)] - English, Japanese
|
||||
- [[@benlye](https://github.com/benlye)]
|
||||
- [[@Tannoo](https://github.com/Tannoo)]
|
||||
- [[@teemuatlut](https://github.com/teemuatlut)]
|
||||
- [[@bgort](https://github.com/bgort)]
|
||||
- Luc Van Daele[[@LVD-AC](https://github.com/LVD-AC)] - Dutch, French, English
|
||||
- [[@paulusjacobus](https://github.com/paulusjacobus)]
|
||||
- ...and many others
|
||||
|
||||
## License
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ The following scripts can be used on macOS or Linux to speed up the process of w
|
||||
|
||||
File|Description
|
||||
----|-----------
|
||||
mfadd [user]|Add Remote - Add another Github user's fork of Marlin as a remote, then fetch it. After this you can check out one of their branches and either make a PR targeted at their fork or targeted at `bugfix-1.1.x`.
|
||||
mfadd [user]|Add Remote - Add another Github user's fork of Marlin as a remote, then fetch it. After this you can check out one of their branches and either make a PR targeted at their fork or targeted at `bugfix-2.0.x`.
|
||||
mfinit|Init Working Copy - Creates a remote named '`upstream`' (for use by the other scripts) pointing to the '`MarlinFirmware`' fork. Use once after checking out your fork.
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ mfpub|Build the documentation and publish it to marlinfw.org via Github.
|
||||
File|Description
|
||||
----|-----------
|
||||
ghtp -[h/s]|Set the protocol to use for all remotes. -h for HTTPS, -s for SSL.
|
||||
mfinfo|This utility script is used by the other scripts to get:<br/>- The upstream project ('`MarlinFirmware`')<br/>- the '`origin`' project (i.e., your Github username),<br/>- the repository name ('`Marlin`'),<br/>- the PR target branch ('`bugfix-1.1.x`'), and<br/>- the current branch (or the first command-line argument).<br/><br/>By itself, `mfinfo` simply prints these values to the console.
|
||||
mfinfo|This utility script is used by the other scripts to get:<br/>- The upstream project ('`MarlinFirmware`')<br/>- the '`origin`' project (i.e., your Github username),<br/>- the repository name ('`Marlin`'),<br/>- the PR target branch ('`bugfix-2.0.x`'), and<br/>- the current branch (or the first command-line argument).<br/><br/>By itself, `mfinfo` simply prints these values to the console.
|
||||
mfclean |Prune your merged and remotely-deleted branches.
|
||||
|
||||
---
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# Great way to clean up your branches after messing around a lot
|
||||
#
|
||||
|
||||
KEEP="RC|RCBugFix|dev|master|bugfix-1"
|
||||
KEEP="RC|RCBugFix|dev|master|bugfix-1|bugfix-2"
|
||||
|
||||
echo "Fetching latest upstream and origin..."
|
||||
git fetch upstream
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# - Remote (upstream) Org name (MarlinFirmware)
|
||||
# - Remote (origin) Org name (your Github username)
|
||||
# - Repo Name (Marlin, MarlinDev, MarlinDocumentation)
|
||||
# - PR Target branch (bugfix-1.1.x, dev, or master)
|
||||
# - PR Target branch (bugfix-2.0.x, dev, or master)
|
||||
# - Branch Arg (the branch argument or current branch)
|
||||
# - Current Branch
|
||||
#
|
||||
@ -23,7 +23,7 @@ ORG=$(git remote get-url upstream 2>/dev/null | sed -E 's/.*[\/:](.*)\/.*$/\1/')
|
||||
[[ $ORG == MarlinFirmware ]] || { echo "`basename $0`: Not a Marlin repository." 1>&2 ; exit 1; }
|
||||
|
||||
case "$REPO" in
|
||||
Marlin ) TARG=bugfix-1.1.x ;;
|
||||
Marlin ) TARG=bugfix-2.0.x ;;
|
||||
MarlinDev ) TARG=dev ;;
|
||||
MarlinDocumentation ) TARG=master ;;
|
||||
esac
|
||||
|
||||
Loading…
Reference in New Issue
Block a user