Skip to content

Commit

Permalink
🔖 Version 2.1.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Nov 19, 2024
1 parent 613ff20 commit e5a167a
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 70 deletions.
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* Advanced settings can be found in Configuration_adv.h
*/
#define CONFIGURATION_H_VERSION 02010204
#define CONFIGURATION_H_VERSION 02010205

//===========================================================================
//============================= Getting Started =============================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* Basic settings can be found in Configuration.h
*/
#define CONFIGURATION_ADV_H_VERSION 02010204
#define CONFIGURATION_ADV_H_VERSION 02010205

// @section develop

Expand Down
15 changes: 11 additions & 4 deletions Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.1.2.4"
//#define SHORT_BUILD_VERSION "2.1.2.5"

/**
* Verbose version identifier which should contain a reference to the location
Expand All @@ -41,7 +41,14 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2024-05-29"
//#define STRING_DISTRIBUTION_DATE "2024-11-18"

/**
* The protocol for communication to the host. Protocol indicates communication
* standards such as the use of ASCII, "echo:" and "error:" line prefixes, etc.
* (Other behaviors are given by the firmware version and capabilities report.)
*/
//#define PROTOCOL_VERSION "1.0"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand All @@ -68,8 +75,8 @@
//#define WEBSITE_URL "marlinfw.org"

/**
* Set the vendor info the serial USB interface, if changable
* Currently only supported by DUE platform
* Set the vendor info the serial USB interface, if changeable.
* Currently only supported by DUE platform.
*/
//#define USB_DEVICE_VENDOR_ID 0x0000
//#define USB_DEVICE_PRODUCT_ID 0x0000
Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Release version. Leave the Marlin version or apply a custom scheme.
*/
#ifndef SHORT_BUILD_VERSION
#define SHORT_BUILD_VERSION "2.1.2.4"
#define SHORT_BUILD_VERSION "2.1.2.5"
#endif

/**
Expand All @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2024-06-16"
#define STRING_DISTRIBUTION_DATE "2024-11-18"
#endif

/**
Expand All @@ -52,7 +52,7 @@
* to alert users to major changes.
*/

#define MARLIN_HEX_VERSION 02010204
#define MARLIN_HEX_VERSION 02010205
#ifndef REQUIRED_CONFIGURATION_H_VERSION
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
#endif
Expand Down Expand Up @@ -101,8 +101,8 @@
#endif

/**
* Set the vendor info the serial USB interface, if changable
* Currently only supported by DUE platform
* Set the vendor info the serial USB interface, if changeable.
* Currently only supported by DUE platform.
*/
#ifndef USB_DEVICE_VENDOR_ID
#define USB_DEVICE_VENDOR_ID 0x03EB /* ATMEL VID */
Expand Down
Loading

0 comments on commit e5a167a

Please sign in to comment.