From e249e380fc886dc59bf127b0294aed0ded5f3b01 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 20 Aug 2019 18:12:01 -0400 Subject: [PATCH] usability tweaks --- Marlin/Configuration_adv.h | 2 +- Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index fa9b6c0c2e..988b57ba73 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1267,7 +1267,7 @@ // @section leveling -#if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) +#if ENABLED(MESH_BED_LEVELING) // Override the mesh area if the automatic (max) area is too large #if( (X_PROBE_OFFSET_FROM_EXTRUDER + 15) > 0 ) diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp index 14ecc099ba..ad7b85c715 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp @@ -156,10 +156,10 @@ void onIdle() case 3: SERIAL_ECHOLN("==waitway 3=="); - if(isPositionKnown() && (getActualTemp_celsius(BED) >= (getTargetTemp_celsius(BED)-1))) { + //if(isPositionKnown() && (getActualTemp_celsius(BED) >= (getTargetTemp_celsius(BED)-1))) { rtscheck.RTS_SndData(ExchangePageBase + 64, ExchangepageAddr); waitway = 0; - } + //} break; case 4: @@ -1244,11 +1244,12 @@ void RTSSHOW::RTS_HandleData() //injectCommands_P(tmpcmd1); setAxisPosition_mm(targetPos, axis); + delay_ms(1); RTS_SndData(10 * getAxisPosition_mm((axis_t)X), DisplayXaxis); RTS_SndData(10 * getAxisPosition_mm((axis_t)Y), DisplayYaxis); RTS_SndData(10 * getAxisPosition_mm((axis_t)Z), DisplayZaxis); - delay_ms(1); + waitway = 0; RTS_SndData(10, FilenameIcon); break;