From a77735d69a5b79aec013d54b9041d0e435943fc7 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Mon, 28 Dec 2020 23:42:53 -0500 Subject: [PATCH] Misc updates --- Marlin/Version.h | 6 ++-- Marlin/src/gcode/bedlevel/abl/G29.cpp | 17 +++++++++++ Marlin/src/lcd/extui/dgus_creality_lcd.cpp | 25 ----------------- .../lib/dgus_creality/DGUSScreenHandler.cpp | 28 +++++++++++++++++++ .../creality_touch/DGUSDisplayDef.h | 3 ++ 5 files changed, 51 insertions(+), 28 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 348b06759c..2fa433150a 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "TM3DMarlin2.0.7.2-CR6-A" +#define SHORT_BUILD_VERSION "TM3D2.0.7.2-CR6-A" /** * Verbose version identifier which should contain a reference to the location @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -#define STRING_DISTRIBUTION_DATE "2020-12-12" +#define STRING_DISTRIBUTION_DATE "2020-12-28" /** * Defines a generic printer name to be output to the LCD after booting Marlin. @@ -65,7 +65,7 @@ * The WEBSITE_URL is the location where users can get more information such as * documentation about a specific Marlin release. */ -//#define WEBSITE_URL "https://marlinfw.org" +#define WEBSITE_URL "tinymachines3d.com" /** * Set the vendor info the serial USB interface, if changable diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 05260955bf..803074acc3 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -82,6 +82,12 @@ #endif #endif +#if ENABLED(PROBING_HEATERS_OFF) + #include "../../../module/temperature.h" + #include "../../../module/printcounter.h" +#endif + + #define G29_RETURN(b) return TERN_(G29_RETRY_AND_RECOVER, b) /** @@ -884,6 +890,17 @@ G29_TYPE GcodeSuite::G29() { report_current_position(); + #if ENABLED(PROBING_HEATERS_OFF) + // If we're going to print then we must ensure we are back on temperature before we continue + if (queue.has_commands_queued() || planner.has_blocks_queued() || print_job_timer.isRunning()) { + SERIAL_ECHOLN("Waiting to heat-up again before continueing"); + ui.set_status("Waiting for heat-up..."); + + thermalManager.wait_for_hotend(0); + thermalManager.wait_for_bed_heating(); + } + #endif + G29_RETURN(isnan(measured_z)); } diff --git a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp index b36367c221..c9f8c36434 100644 --- a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp +++ b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp @@ -174,31 +174,6 @@ bool hasPrintTimer = false; void onConfigurationStoreRead(bool success) { // Called after the entire EEPROM has been read, // whether successful or not. - #if HAS_MESH - if (ExtUI::getMeshValid()) - { - uint8_t abl_probe_index = 0; - for(uint8_t outer = 0; outer < GRID_MAX_POINTS_Y; outer++) - { - for (uint8_t inner = 0; inner < GRID_MAX_POINTS_X; inner++) - { - uint8_t x_Point = inner; - bool zig = (outer & 1); - if (zig) x_Point = (GRID_MAX_POINTS_X - 1) - inner; - xy_uint8_t point = {x_Point, outer}; - - DEBUG_ECHOLNPAIR("Mesh X: ", x_Point); - DEBUG_ECHOLNPAIR("Mesh Y: ", outer); - DEBUG_ECHOLNPAIR("Mesh adr: ", (VP_MESH_VALUE_START + (abl_probe_index * 4))); - DEBUG_ECHOLNPAIR("Mesh Val: ", ExtUI::getMeshPoint(point)); - ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<3>((VP_MESH_VALUE_START + (abl_probe_index * 4)), ExtUI::getMeshPoint(point)); - ++abl_probe_index; - } - } - - setLevelingActive(true); - } - #endif } #if HAS_MESH diff --git a/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp index 2f41f41a6a..285aa48af4 100644 --- a/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp @@ -165,8 +165,10 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) { void DGUSScreenHandler::DGUSLCD_SendAboutFirmwareVersion(DGUS_VP_Variable &var) { const char* fwVersion = PSTR(SOFTVERSION); + const char* fwWebsite = PSTR(WEBSITE_URL); dgusdisplay.WriteVariablePGM(var.VP, fwVersion, strlen(fwVersion), true); + dgusdisplay.WriteVariablePGM(VP_MARLIN_WEBSITE, fwWebsite, strlen(fwWebsite), true); } void DGUSScreenHandler::DGUSLCD_SendAboutPrintSize(DGUS_VP_Variable &var) { @@ -1182,6 +1184,7 @@ bool DGUSScreenHandler::loop() { int16_t percentage = static_cast(((float) ms / (float)BOOTSCREEN_TIMEOUT) * 100); if (percentage > 100) percentage = 100; + dgusdisplay.WriteVariable(VP_STARTPROGRESSBAR, percentage); } @@ -1192,6 +1195,31 @@ bool DGUSScreenHandler::loop() { if (!booted && ELAPSED(ms, BOOTSCREEN_TIMEOUT)) { booted = true; + #if HAS_MESH + if (ExtUI::getMeshValid()) + { + uint8_t abl_probe_index = 0; + for(uint8_t outer = 0; outer < GRID_MAX_POINTS_Y; outer++) + { + for (uint8_t inner = 0; inner < GRID_MAX_POINTS_X; inner++) + { + uint8_t x_Point = inner; + bool zig = (outer & 1); + if (zig) x_Point = (GRID_MAX_POINTS_X - 1) - inner; + xy_uint8_t point = {x_Point, outer}; + + DEBUG_ECHOLNPAIR("Mesh X: ", x_Point); + DEBUG_ECHOLNPAIR("Mesh Y: ", outer); + DEBUG_ECHOLNPAIR("Mesh adr: ", (VP_MESH_VALUE_START + (abl_probe_index * 4))); + DEBUG_ECHOLNPAIR("Mesh Val: ", ExtUI::getMeshPoint(point)); + ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<3>((VP_MESH_VALUE_START + (abl_probe_index * 4)), ExtUI::getMeshPoint(point)); + ++abl_probe_index; + } + } + + ExtUI::setLevelingActive(true); + } + #endif GotoScreen(DGUSLCD_SCREEN_MAIN); } } diff --git a/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.h b/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.h index 422806d2fd..318949c313 100644 --- a/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.h +++ b/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.h @@ -185,6 +185,9 @@ constexpr uint16_t VP_PRINTER_BEDSIZE_LEN = 12; constexpr uint16_t VP_MARLIN_VERSION = 0x2222; constexpr uint8_t VP_MARLIN_VERSION_LEN = 20; // there is more space on the display, if needed. +constexpr uint16_t VP_MARLIN_WEBSITE = 0x2242; +constexpr uint8_t VP_MARLIN_WEBSITE_LEN = 32; + // Material preheat settings constexpr uint16_t VP_PREHEAT_PLA_HOTEND_TEMP = 0x1102; constexpr uint16_t VP_PREHEAT_PLA_BED_TEMP = 0x1104;