jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CrealityDwin2.0_Bleeding' into Creality_Bondtech

Browse Source
This commit is contained in:
InsanityAutomation
2022-04-23 10:51:11 -04:00
parent 137797c046 08b92c3d1c
commit 2d7c4023c9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+4 -4
View File
@@ -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
Marlin/Version.h
+1 -1
View File
@@ -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
buildroot/share/PlatformIO/scripts/common-cxxflags.py
+1 -1
View File
@@ -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",
buildroot/share/PlatformIO/scripts/random-bin.py
+1 -1
View File
@@ -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")