From 5111e8d3a303a9b1df1fbf3f836b3cf82fc9368e Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 17 Jul 2022 20:40:27 -0400 Subject: [PATCH] Update rev number and upstream merge revisions --- Marlin/src/lcd/e3v2/marlinui/ui_common.cpp | 2 +- .../extui/dgus_creality/DGUSScreenHandler.cpp | 16 ++++++++-------- .../share/PlatformIO/scripts/common-cxxflags.py | 2 +- buildroot/share/PlatformIO/scripts/random-bin.py | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp index 2135e4e072..8234eba80f 100644 --- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp +++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp @@ -110,7 +110,7 @@ void MarlinUI::clear_lcd() { #define VERSION_Y 84 #endif DWIN_JPG_ShowAndCache(0); // Ensure DACAI stays on boot screen - DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, 230, S(dwin_string.string())); + DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length * 10) / 2, 230, S(dwin_string.string())); TERN_(SHOW_CUSTOM_BOOTSCREEN, safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT)); clear_lcd(); diff --git a/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp index e1472626d4..e56e240f62 100644 --- a/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp @@ -932,15 +932,15 @@ uint16_t CreateRgb(double h, double s, double v) { #if HAS_BED_PROBE void DGUSScreenHandler::UpdateMeshValue(const int8_t x, const int8_t y, const float z) { - SERIAL_ECHOPGM("X", x); - SERIAL_ECHOPGM(" Y", y); - SERIAL_ECHO(" Z"); - SERIAL_ECHO_F(z, 4); + //SERIAL_ECHOPGM("X", x); + //SERIAL_ECHOPGM(" Y", y); + //SERIAL_ECHO(" Z"); + //SERIAL_ECHO_F(z, 4); // Determine the screen X and Y value if (x % SkipMeshPoint != 0 || y % SkipMeshPoint != 0) { // Skip this point - SERIAL_ECHOLN(""); + //SERIAL_ECHOLN(""); return; } @@ -961,12 +961,12 @@ uint16_t CreateRgb(double h, double s, double v) { // If we don't accidently overshoot to the next number, trick the display by upping the number 0.0001 💩 displayZ += correctionFactor; - SERIAL_ECHO(" displayZ: "); - SERIAL_ECHO_F(z, 4); + //SERIAL_ECHO(" displayZ: "); + //SERIAL_ECHO_F(z, 4); } } - SERIAL_ECHOLN(""); + //SERIAL_ECHOLN(""); dgusdisplay.WriteVariable(vpAddr, displayZ); diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py index 95bed5ccc4..91d5cc5c7d 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.6" % (str(env["PIOENV"]))) + env.Replace(PROGNAME="%s_DW7.4.7" % (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 8e2bc3dafd..9d2c6c72c6 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.6" % (env_name) + env['PROGNAME'] = "firmware_%s_DW7.4.7" % (env_name) #env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")