CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marlin bugfix-2.0.x Version/README

Browse Source
This commit is contained in:
Scott Lahteine 2017-07-27 03:02:53 -05:00
parent 367e1b54ba
commit e4fcf460e7
66 changed files with 81 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/Marlin_main.cpp
View File

@ -8496,7 +8496,7 @@ inline void gcode_M205() {
* *
* *** @thinkyhead: I recommend deprecating M206 for SCARA in favor of M665. * *** @thinkyhead: I recommend deprecating M206 for SCARA in favor of M665.
* *** M206 for SCARA will remain enabled in 1.1.x for compatibility. * *** 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() { inline void gcode_M206() {
LOOP_XYZ(i) LOOP_XYZ(i)

8
Marlin/Version.h
View File

@ -35,7 +35,7 @@
/** /**
* Marlin release version identifier * 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 * 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 * here we define this default string as the date where the latest release
* version was tagged. * 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. * 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 * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option on
* the configuration files. * the configuration files.
*/ */
#define REQUIRED_CONFIGURATION_H_VERSION 010100 #define REQUIRED_CONFIGURATION_H_VERSION 020000
#define REQUIRED_CONFIGURATION_ADV_H_VERSION 010100 #define REQUIRED_CONFIGURATION_ADV_H_VERSION 020000
/** /**
* The protocol for communication to the host. Protocol indicates communication * The protocol for communication to the host. Protocol indicates communication

2
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/AliExpress/CL-260/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Anet/A6/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Anet/A6/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Anet/A8/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Anet/A8/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/BQ/Hephestos/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
View File

@ -22,7 +22,7 @@
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//================================= README ================================== //================================= README ==================================

2
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/BQ/WITBOX/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Cartesio/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Creality/CR-10/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Felix/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Infitary/i3-M508/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Malyan/M150/Configuration.h
View File

@ -42,7 +42,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Malyan/M150/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/RigidBot/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/TinyBoy2/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
/** /**
* Sample configuration file for TinyBoy2 L10/L16 * Sample configuration file for TinyBoy2 L10/L16

2
Marlin/example_configurations/TinyBoy2/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Velleman/K8200/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
/** /**
* Sample configuration file for Vellemann K8200 * Sample configuration file for Vellemann K8200

2
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
View File

@ -41,7 +41,7 @@
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Velleman/K8400/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -41,7 +41,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/makibox/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

2
Marlin/example_configurations/wt150/Configuration.h
View File

@ -37,7 +37,7 @@
*/ */
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010100 #define CONFIGURATION_H_VERSION 020000
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================

2
Marlin/example_configurations/wt150/Configuration_adv.h
View File

@ -32,7 +32,7 @@
*/ */
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010100 #define CONFIGURATION_ADV_H_VERSION 020000
// @section temperature // @section temperature

55
README.md
View File

@ -8,32 +8,26 @@
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/). 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! 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!__ __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 ## Recent Changes
- Further integration of Unified Bed Leveling - Add a Hardware Abstraction Layer (HAL) supporting current AVR platforms
- Initial UBL LCD Menu - Planning a HAL for Re:Arm
- New optimized G-code parser singleton - Planning a HAL for STM32
- 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
## Submitting Patches ## 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. - This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
- 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. - 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). The "naive" question is often the one we forget to ask. - 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) ### [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 - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Deutsch, English - Chris Pepper [[@p3p](https://github.com/p3p)] - English
- Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)] - Deutsch, English
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Deutsch, English
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, 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 ## License

4
buildroot/share/git/README.md
View File

@ -18,7 +18,7 @@ The following scripts can be used on macOS or Linux to speed up the process of w
File|Description 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. 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 File|Description
----|----------- ----|-----------
ghtp -[h/s]|Set the protocol to use for all remotes. -h for HTTPS, -s for SSL. 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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|Prune your merged and remotely-deleted branches. mfclean&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|Prune your merged and remotely-deleted branches.
--- ---

2
buildroot/share/git/mfclean
View File

@ -6,7 +6,7 @@
# Great way to clean up your branches after messing around a lot # 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..." echo "Fetching latest upstream and origin..."
git fetch upstream git fetch upstream

4
buildroot/share/git/mfinfo
View File

@ -7,7 +7,7 @@
# - Remote (upstream) Org name (MarlinFirmware) # - Remote (upstream) Org name (MarlinFirmware)
# - Remote (origin) Org name (your Github username) # - Remote (origin) Org name (your Github username)
# - Repo Name (Marlin, MarlinDev, MarlinDocumentation) # - 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) # - Branch Arg (the branch argument or current branch)
# - 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; } [[ $ORG == MarlinFirmware ]] || { echo "`basename $0`: Not a Marlin repository." 1>&2 ; exit 1; }
case "$REPO" in case "$REPO" in
Marlin ) TARG=bugfix-1.1.x ;; Marlin ) TARG=bugfix-2.0.x ;;
MarlinDev ) TARG=dev ;; MarlinDev ) TARG=dev ;;
MarlinDocumentation ) TARG=master ;; MarlinDocumentation ) TARG=master ;;
esac esac