From 20a88f50a35c03001bec278b4f85ca8cb5d109ce Mon Sep 17 00:00:00 2001 From: ThomasToka Date: Wed, 12 Jul 2023 14:12:29 +0200 Subject: [PATCH] The UBL Update - stabilizing should work reliably now :) --- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 +- Marlin/src/lcd/rts/e3s1pro/lcd_rts.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 133283057975..0743a78fc9ba 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -819,7 +819,7 @@ void unified_bed_leveling::shift_mesh_height() { ExtUI::onMeshUpdate(best.pos, measured_z); #endif #if ENABLED(E3S1PRO_RTS) - point_num_real = best.pos.x + best.pos.y * 5 + 1; + point_num_real = best.pos.x + best.pos.y * GRID_MAX_POINTS_X + 1; if(old_leveling == 1){ const uint16_t percent = 100 / GRID_MAX_POINTS * (GRID_MAX_POINTS - (count - 1)); rtscheck.RTS_SndData((uint16_t) (percent / 2) , AUTO_BED_LEVEL_TITLE_VP); diff --git a/Marlin/src/lcd/rts/e3s1pro/lcd_rts.cpp b/Marlin/src/lcd/rts/e3s1pro/lcd_rts.cpp index 3364dddfd7ec..8081ae738ef1 100644 --- a/Marlin/src/lcd/rts/e3s1pro/lcd_rts.cpp +++ b/Marlin/src/lcd/rts/e3s1pro/lcd_rts.cpp @@ -511,7 +511,7 @@ void RTSSHOW::RTS_Init(void) RTS_SndData(0, DOWNLOAD_PREVIEW_VP); #endif - //#if ENABLED(AUTO_BED_LEVELING_BILINEAR) + #if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL) bool zig = false; int8_t inStart, inStop, inInc, showcount; showcount = 0; @@ -540,8 +540,10 @@ void RTSSHOW::RTS_Init(void) showcount++; } } + #endif + #if ENABLED(AUTO_BED_LEVELING_BILINEAR) queue.enqueue_now_P(PSTR("M420 S1")); - //#endif + #endif /***************transmit Fan speed to screen*****************/ // turn off fans @@ -2476,8 +2478,9 @@ void RTSSHOW::RTS_HandleData(void) #else touchscreen_requested_mesh = 1; queue.enqueue_one_P(PSTR("G29 P1 T")); - // queue.enqueue_one_P(PSTR("G29 P3")); queue.enqueue_one_P(PSTR("G29 S0")); + queue.enqueue_one_P(PSTR("M420 S1")); + queue.enqueue_one_P(PSTR("M500")); #endif #endif }