diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index b280635d50..9910e9758f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -439,7 +439,7 @@ #endif #endif -#if ANY(MachineCR5, MachineEnder3S1) +#if ENABLED(MachineEnder3S1) #if NONE(ABL_NCSW, ABL_EZABL, ABL_BLTOUCH) #define ABL_BLTOUCH #endif @@ -1635,7 +1635,7 @@ #define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#if NONE(ABL_EZABL, MachineCR2020) +#if NONE(ABL_EZABL, MachineCR2020, MachineCR5) #define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe. #else diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp index b4bb7b64a8..f94cde97a3 100644 --- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp @@ -186,8 +186,8 @@ bool sdprint = false; int16_t pausetemp, pausebed, pausefan; -bool livemove = false; -bool liveadjust = false; +bool livemove = true; +bool liveadjust = true; uint8_t preheatmode = 0; float zoffsetvalue = 0; uint8_t gridpoint; diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp index bc57242815..aa8a53445b 100644 --- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp @@ -72,6 +72,7 @@ namespace ExtUI uint8_t dwin_settings_version = 1; bool reEntryPrevent = false; + uint8_t reEntryCount = 0; uint16_t idleThrottling = 0; @@ -155,12 +156,16 @@ void onStartup() void onIdle() { - if (reEntryPrevent) - return; - if (rtscheck.RTS_RecData() > 0 && (rtscheck.recdat.data[0]!=0 || rtscheck.recdat.addr!=0)) + while (rtscheck.RTS_RecData() > 0 && (rtscheck.recdat.data[0]!=0 || rtscheck.recdat.addr!=0)) rtscheck.RTS_HandleData(); + if (reEntryPrevent && reEntryCount < 120) { + reEntryCount++; + return; + } + reEntryCount = 0; + if(idleThrottling++ < 750){ return; } diff --git a/platformio.ini b/platformio.ini index 97a6d55d43..7bfb16e7bd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -2344,6 +2344,12 @@ extends = common_avr8 board = megaatmega2560 build_flags = ${common.build_flags} -DMachineCR5 -DHotendAllMetal +[env:CR5Pro_BLT] +platform = atmelavr +extends = common_avr8 +board = megaatmega2560 +build_flags = ${common.build_flags} -DMachineCR5 -DHotendAllMetal -DABL_BLTOUCH + # [env:include_tree] platform = atmelavr