From 07a1b00a25316dfb92dbe47b6cd29c33e3e6f629 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 4 May 2021 11:56:18 -0400 Subject: [PATCH] Version bump for rebase to head --- Marlin/Version.h | 4 ++-- .../lcd/extui/lib/Creality/Creality_DWIN.cpp | 17 ++++++++++++++++- .../share/PlatformIO/scripts/common-cxxflags.py | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 35de8795aa..f1188a405d 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.0.7_DW7.3.1" +#define SHORT_BUILD_VERSION "2.0.8_DW7.4" /** * Verbose version identifier which should contain a reference to the location @@ -111,7 +111,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -#define STRING_DISTRIBUTION_DATE "2021-04-18" +#define STRING_DISTRIBUTION_DATE "2021-05-04" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp index e7ade473da..3d945599b1 100644 --- a/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/lib/Creality/Creality_DWIN.cpp @@ -323,7 +323,7 @@ void onIdle() rtscheck.RTS_SndData(getZOffset_mm() * 100, ProbeOffset_Z); - rtscheck.RTS_SndData((unsigned int)(getFlowPercentage(E0)), Flowrate); + rtscheck.RTS_SndData((unsigned int)(getFlow_percent(E0)), Flowrate); rtscheck.RTS_SndData((unsigned int)(getAxisSteps_per_mm(X) * 10), StepMM_X); rtscheck.RTS_SndData((unsigned int)(getAxisSteps_per_mm(Y) * 10), StepMM_Y); rtscheck.RTS_SndData((unsigned int)(getAxisSteps_per_mm(Z) * 10), StepMM_Z); @@ -2023,6 +2023,21 @@ void onSteppersDisabled() } +void onPostprocessSettings() +{ + +} + +void startPIDTune(float const& target, ExtUI::extruder_t e) +{ + +} + +void startBedPIDTune(float const& target) +{ + +} + } // namespace ExtUI #endif \ No newline at end of file diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py index 857fdfee53..358894a3e9 100644 --- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py +++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py @@ -27,7 +27,7 @@ def add_cpu_freq(): if env.GetBuildType() == "debug" and env.get('UPLOAD_PROTOCOL') not in ['jlink', 'stlink']: env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug' env_name = str(env["PIOENV"]) -env.Replace(PROGNAME="%s_DW7.3.1" % (env_name)) +env.Replace(PROGNAME="%s_DW7.4" % (env_name)) print("Environment: %s" % (env_name)) # On some platform, F_CPU is a runtime variable. Since it's used to convert from ns