From 08b92c3d1c28178c2a008574a6d916d3a7a253d0 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sat, 23 Apr 2022 10:48:43 -0400 Subject: [PATCH] Bump version, tweak accels --- Marlin/Configuration.h | 8 ++++---- Marlin/Version.h | 2 +- buildroot/share/PlatformIO/scripts/common-cxxflags.py | 2 +- buildroot/share/PlatformIO/scripts/random-bin.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a262a1b61c..abdb2aff9b 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1893,7 +1893,7 @@ * following movement settings. If fewer factors are given than the * total number of extruders, the last value applies to the rest. */ -//#define DISTINCT_E_FACTORS +#define DISTINCT_E_FACTORS /** * Default Axis Steps Per Unit (linear=steps/mm, rotational=steps/°) @@ -1996,7 +1996,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 300 // X, Y, Z acceleration for travel (non printing) moves #elif ENABLED(MachineEnder7) #define DEFAULT_MAX_FEEDRATE { 750, 750, 10, 75 } - #define DEFAULT_MAX_ACCELERATION { 35000, 35000, 100, 75 } + #define DEFAULT_MAX_ACCELERATION { 25000, 25000, 100, 75 } #define DEFAULT_ACCELERATION 10000 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 10000 // X, Y, Z acceleration for travel (non printing) moves @@ -2042,8 +2042,8 @@ #define DEFAULT_XJERK 20.0 #define DEFAULT_YJERK 20.0 #elif ENABLED(MachineEnder7) - #define DEFAULT_XJERK 30.0 - #define DEFAULT_YJERK 30.0 + #define DEFAULT_XJERK 20.0 + #define DEFAULT_YJERK 20.0 #else #define DEFAULT_XJERK 10.0 #define DEFAULT_YJERK 5.0 diff --git a/Marlin/Version.h b/Marlin/Version.h index 1c07a93c13..cfc925627e 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.0.9_DW7.4.5.1" +#define SHORT_BUILD_VERSION "2.0.9_DW7.4.6" /** * Verbose version identifier which should contain a reference to the location diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py index 69bbdf600b..53e4753d28 100644 --- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py +++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py @@ -6,7 +6,7 @@ import pioutil if pioutil.is_pio_build(): Import("env") - env.Replace(PROGNAME="%s_DW7.4.5.1" % (str(env["PIOENV"]))) + env.Replace(PROGNAME="%s_DW7.4.6" % (str(env["PIOENV"]))) cxxflags = [ #"-Wno-incompatible-pointer-types", diff --git a/buildroot/share/PlatformIO/scripts/random-bin.py b/buildroot/share/PlatformIO/scripts/random-bin.py index 4423ee0119..8e2bc3dafd 100644 --- a/buildroot/share/PlatformIO/scripts/random-bin.py +++ b/buildroot/share/PlatformIO/scripts/random-bin.py @@ -7,5 +7,5 @@ if pioutil.is_pio_build(): from datetime import datetime Import("env") env_name = str(env["PIOENV"]) - env['PROGNAME'] = "firmware_%s_DW7.4.5.1" % (env_name) + env['PROGNAME'] = "firmware_%s_DW7.4.6" % (env_name) #env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")