From d649ef6c72a9545dcd553872d8bfd3a143886b98 Mon Sep 17 00:00:00 2001 From: Sebastien Andrivet Date: Sat, 13 Jan 2018 19:16:33 +0100 Subject: [PATCH] Change versions numbers (2.1) --- CHANGELOG.md | 11 ++++++++--- Marlin/Version.h | 4 ++-- Marlin/advi3pp.cpp | 6 +++--- README.md | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2db8b5e9de..6ccb98b224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,16 @@ # ADVi3++ Changelog -## 2.1.0 (2017-12-28) +## 2.1.0 (2018-01-12) ### New features -* Align with Marlin 1.1.8 -* Change maximum temperatures to 270 C and 150 C. Be careful. +* Align with Marlin `1.1.8` +* Upgrade `atmelavr` to `1.8.1` +* Upgrade PlatformIO to `3.5.0` +* [#34](https://github.com/andrivet/ADVi3pp-Marlin/issues/34): Change maximum temperatures to **280°C** and **150°C**. **Be careful if you use high temperatures, it is at your own risk**. +* [#40](https://github.com/andrivet/ADVi3pp-Marlin/issues/40): Change default acceleration speeds to `1000` and default jerk to `8` + +### Bug fixes ## 2.0.1 (2017-11-26) diff --git a/Marlin/Version.h b/Marlin/Version.h index 167cd74c61..bcf3b2c1b2 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,14 +41,14 @@ * Verbose version identifier which should contain a reference to the location * from where the binary was downloaded or the source code was compiled. */ - #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (ADVi3++ 2.0.2)" + #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (ADVi3++ 2.1.0)" /** * The STRING_DISTRIBUTION_DATE represents when the binary file was built, * here we define this default string as the date where the latest release * version was tagged. */ - #define STRING_DISTRIBUTION_DATE "2017-12-28 12:00" + #define STRING_DISTRIBUTION_DATE "2018-01-12 12:00" /** * Required minimum Configuration.h and Configuration_adv.h file versions. diff --git a/Marlin/advi3pp.cpp b/Marlin/advi3pp.cpp index 40b2f1ba5e..3eaf361191 100644 --- a/Marlin/advi3pp.cpp +++ b/Marlin/advi3pp.cpp @@ -41,9 +41,9 @@ namespace { - const uint16_t advi3_pp_version = 0x0201; // 2.0.1 - const uint16_t advi3_pp_oldest_lcd_compatible_version = 0x0201; // 2.0.1 - const uint16_t advi3_pp_newest_lcd_compatible_version = 0x0201; // 2.0.1 + const uint16_t advi3_pp_version = 0x0210; // 2.1.0 + const uint16_t advi3_pp_oldest_lcd_compatible_version = 0x0210; // 2.1.0 + const uint16_t advi3_pp_newest_lcd_compatible_version = 0x0210; // 2.1.0 // Modify also DETAILED_BUILD_VERSION in Version.h const unsigned long advi3_pp_baudrate = 115200; diff --git a/README.md b/README.md index be2a300b71..ede5bcad65 100644 --- a/README.md +++ b/README.md @@ -111,8 +111,8 @@ Thank to [Marlin](http://marlinfw.org) for their great work. # Copyright -* Copyright © 2017 Sebastien Andrivet [https://github.com/andrivet/advi3pp-Marlin] -* Copyright © 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] +* Copyright © 2017-2018 Sebastien Andrivet [https://github.com/andrivet/advi3pp-Marlin] +* Copyright © 2016-2018 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Based on Sprinter and grbl. * Copyright © 2011 Camiel Gubbels / Erik van der Zalm