From 5f431c140fa61b295b25844ab8bf8ea054e27219 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 24 Jan 2023 20:20:31 -0500 Subject: [PATCH] Idex offsets to uint32 4 byte --- .../src/lcd/extui/ia_dwin/Creality_DWIN.cpp | 36 +++++++++---------- Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h | 6 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp index 9ddb932e4c..77373c6c4b 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp @@ -394,25 +394,25 @@ void onIdle() rtscheck.RTS_SndData((unsigned int)(getAxisSteps_per_mm(Z) * 10), StepMM_Z); rtscheck.RTS_SndData((unsigned int)(getAxisSteps_per_mm(E0) * 10), StepMM_E); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(X)/100), Accel_X); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(Y)/100), Accel_Y); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(Z)/10), Accel_Z); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxAcceleration_mm_s2(E0)), Accel_E); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxAcceleration_mm_s2(X)/100), Accel_X); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxAcceleration_mm_s2(Y)/100), Accel_Y); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxAcceleration_mm_s2(Z)/10), Accel_Z); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxAcceleration_mm_s2(E0)), Accel_E); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxFeedrate_mm_s(X)), Feed_X); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxFeedrate_mm_s(Y)), Feed_Y); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxFeedrate_mm_s(Z)), Feed_Z); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxFeedrate_mm_s(E0)), Feed_E); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxFeedrate_mm_s(X)), Feed_X); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxFeedrate_mm_s(Y)), Feed_Y); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxFeedrate_mm_s(Z)), Feed_Z); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxFeedrate_mm_s(E0)), Feed_E); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxJerk_mm_s(X)*100), Jerk_X); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxJerk_mm_s(Y)*100), Jerk_Y); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxJerk_mm_s(Z)*100), Jerk_Z); - rtscheck.RTS_SndData(((unsigned int)getAxisMaxJerk_mm_s(E0)*100), Jerk_E); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxJerk_mm_s(X)*100), Jerk_X); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxJerk_mm_s(Y)*100), Jerk_Y); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxJerk_mm_s(Z)*100), Jerk_Z); + rtscheck.RTS_SndData((unsigned int)(getAxisMaxJerk_mm_s(E0)*100), Jerk_E); #if HAS_HOTEND_OFFSET - rtscheck.RTS_SndData(((unsigned int)getNozzleOffset_mm(X, E1)*10), T2Offset_X); - rtscheck.RTS_SndData(((unsigned int)getNozzleOffset_mm(Y, E1)*10), T2Offset_Y); - rtscheck.RTS_SndData(((unsigned int)getNozzleOffset_mm(Z, E1)*10), T2Offset_Z); + WriteVariable(T2Offset_X, (uint32_t)(getNozzleOffset_mm(X, E1)*1000), sizeof(uint32_t)); + WriteVariable(T2Offset_Y, (uint32_t)(getNozzleOffset_mm(Y, E1)*1000), sizeof(uint32_t)); + WriteVariable(T2Offset_Z, (uint32_t)(getNozzleOffset_mm(Z, E1)*1000), sizeof(uint32_t)); rtscheck.RTS_SndData((unsigned int)(getAxisSteps_per_mm(E1) * 10), T2StepMM_E); #endif @@ -1209,15 +1209,15 @@ void RTSSHOW::RTS_HandleData() } else if (recdat.addr == T2Offset_X) { - setNozzleOffset_mm(tmp_float_handling*10, X, E1); + setNozzleOffset_mm(tmp_float_handling*1000, X, E1); } else if (recdat.addr == T2Offset_Y) { - setNozzleOffset_mm(tmp_float_handling*10, Y, E1); + setNozzleOffset_mm(tmp_float_handling*1000, Y, E1); } else if (recdat.addr == T2Offset_Z) { - setNozzleOffset_mm(tmp_float_handling*10, Z, E1); + setNozzleOffset_mm(tmp_float_handling*1000, Z, E1); } #endif #if HAS_BED_PROBE diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h index fe5f1f205e..b476f6d910 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h @@ -93,9 +93,9 @@ namespace ExtUI { #define ProbeOffset_Z 0x1026 #define T2Offset_X 0x1090 -#define T2Offset_Y 0x1092 -#define T2Offset_Z 0x1094 -#define T2StepMM_E 0x1096 +#define T2Offset_Y 0x1094 +#define T2Offset_Z 0x1098 +#define T2StepMM_E 0x109C #define ActiveToolVP 0x1014