From 72c30aca9731a386e676192f0d5ad279ca2a5be3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 23 Nov 2024 20:26:55 -0600 Subject: [PATCH] Marlin 2.1.3-beta1 This beta release is posted to get some bugs fixed. Let's go! --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- Marlin/src/lcd/e3v2/README.md | 2 +- README.md | 12 ++++++++---- config/README.md | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 737ca23f6f8e..f89097481612 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -//#define SHORT_BUILD_VERSION "bugfix-2.1.x" +//#define SHORT_BUILD_VERSION "2.1.3-beta1" /** * Verbose version identifier which should contain a reference to the location diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 338de3c10542..4cdae7cf11b2 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -25,7 +25,7 @@ * Release version. Leave the Marlin version or apply a custom scheme. */ #ifndef SHORT_BUILD_VERSION - #define SHORT_BUILD_VERSION "bugfix-2.1.x" + #define SHORT_BUILD_VERSION "2.1.3-beta1" #endif /** diff --git a/Marlin/src/lcd/e3v2/README.md b/Marlin/src/lcd/e3v2/README.md index 09055d03a492..8469e092f50a 100644 --- a/Marlin/src/lcd/e3v2/README.md +++ b/Marlin/src/lcd/e3v2/README.md @@ -1,6 +1,6 @@ # DWIN for Creality Ender-3 v2 -Marlin's Ender-3 v2 support requires the `DWIN_SET` included with the Ender-3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2). +Marlin's Ender-3 v2 support requires the `DWIN_SET` included with the Ender-3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/2.1.3-b1/config/examples/Creality/Ender-3%20V2). ## Easy Install diff --git a/README.md b/README.md index 4d835685d105..09c15c423299 100644 --- a/README.md +++ b/README.md @@ -15,20 +15,24 @@ Additional documentation can be found at the [Marlin Home Page](//marlinfw.org/). Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by! -## Marlin 2.1 Bugfix Branch +## Marlin 2.1.3 Beta 1 __Not for production use. Use with caution!__ -Marlin 2.1 continues to support both 32-bit ARM and 8-bit AVR boards while adding support for up to 9 coordinated axes and to up to 8 extruders. +This branch is for testing and bug fixes for Marlin 2.1.3. We'll use this time to collect bug reports and patch as many issues as we can. This should help the release version of 2.1.3 to be as robust as we can make it. Are you ready to do some testing? -This branch is for patches to the latest 2.1.x release version. Periodically this branch will form the basis for the next minor 2.1.x release. +## Configuration Migration -Download earlier versions of Marlin on the [Releases page](//github.com/MarlinFirmware/Marlin/releases). +There are a lot of configuration changes in Marlin 2.1.3. We're working on automated tools to migrate configurations, so if you want to help us test those get in touch on the [Marlin Discord](//discord.com/servers/marlin-firmware-461605380783472640). If you need help migrating your configurations to Marlin 2.1.3, we'll have a dedicated channel for this purpose. Post your configurations there and we'll send back updated configurations. We can also send a built `firmware.bin` file if you need it. ## Example Configurations Before you can build Marlin for your machine you'll need a configuration for your specific hardware. Upon request, your vendor will be happy to provide you with the complete source code and configurations for your machine, but you'll need to get updated configuration files if you want to install a newer version of Marlin. Fortunately, Marlin users have contributed dozens of tested configurations to get you started. Visit the [MarlinFirmware/Configurations](//github.com/MarlinFirmware/Configurations) repository to find the right configuration for your hardware. +## Marlin Builds + +We now publish builds for all our posted example configurations. See the [MarlinBuilds](//github.com/MarlinFirmware/MarlinBuilds) repository for details. This is a new process so bear with us while we work out all the best variants. If you like the way an example configuration works but think it could be better, please submit your suggested improvements in a **Pull Request**. + ## Building Marlin 2.1 To build and upload Marlin you will use one of these tools: diff --git a/config/README.md b/config/README.md index b19527ccc30a..5c0713cfb55f 100644 --- a/config/README.md +++ b/config/README.md @@ -2,7 +2,7 @@ Marlin configurations for specific machines are now maintained in their own repository at: -## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x +## https://github.com/MarlinFirmware/Configurations/tree/2.1.3-b1 Configuration files for use with the nightly `bugfix-2.1.x` branch can be downloaded from: