From f70c1d59da421af824b2953ec690c712335ec286 Mon Sep 17 00:00:00 2001
From: InsanityAutomation <d.menzel@insanityautomation.com>
Date: Tue, 20 Aug 2019 17:21:49 -0400
Subject: [PATCH] debug

---
 .../lcd/extensible_ui/lib/Creality_DWIN.cpp   | 25 ++++++++++++++-----
 Marlin/src/lcd/extensible_ui/ui_api.cpp       |  6 ++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp
index 72fe07273a..14ecc099ba 100644
--- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp
@@ -335,11 +335,11 @@ void onIdle()
 					AutoHomeIconNum = 0;
 			}
 
-    //if(rtscheck.recdat.addr != DisplayZaxis && rtscheck.recdat.addr != DisplayYaxis && rtscheck.recdat.addr != DisplayZaxis) {
-		//	rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)X), DisplayXaxis);
-		//	rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)Y), DisplayYaxis);
-		//	rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)Z), DisplayZaxis);
-    //}
+    if(rtscheck.recdat.addr != DisplayZaxis && rtscheck.recdat.addr != DisplayYaxis && rtscheck.recdat.addr != DisplayZaxis) {
+			rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)X), DisplayXaxis);
+			rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)Y), DisplayYaxis);
+			rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)Z), DisplayZaxis);
+    }
 
 		if (getLevelingActive())
 			rtscheck.RTS_SndData(2, AutoLevelIcon); /*Off*/
@@ -1229,6 +1229,20 @@ void RTSSHOW::RTS_HandleData()
 			targetPos = min;
 		else if (targetPos > max)
 			targetPos = max;
+    SERIAL_ECHOLNPAIR("Target Pos:", targetPos);
+    SERIAL_ECHOLNPAIR("Target Axis:", axis);
+    SERIAL_ECHOLNPAIR("Current X Pos:", getAxisPosition_mm((axis_t)X));
+    SERIAL_ECHOLNPAIR("Current Y Pos:", getAxisPosition_mm((axis_t)Y));
+    SERIAL_ECHOLNPAIR("Current Z Pos:", getAxisPosition_mm((axis_t)Z));
+    //char tmpcmd1[30];
+    //if (axis==X)
+    //  sprintf_P(tmpcmd1, PSTR("G1 X%i F2000"), targetPos);
+   // else if (axis==Y)
+    //  sprintf_P(tmpcmd1, PSTR("G1 Y%i F2000"), targetPos);
+   // else if (axis==Z)
+   //   sprintf_P(tmpcmd1, PSTR("G1 Z%i F2000"), targetPos);
+
+		//injectCommands_P(tmpcmd1);
 		setAxisPosition_mm(targetPos, axis);
 		RTS_SndData(10 * getAxisPosition_mm((axis_t)X), DisplayXaxis);
 		RTS_SndData(10 * getAxisPosition_mm((axis_t)Y), DisplayYaxis);
@@ -1236,7 +1250,6 @@ void RTSSHOW::RTS_HandleData()
 
 		delay_ms(1);
 		RTS_SndData(10, FilenameIcon);
-		waitway = 0;
 		break;
 
 	case Filement:
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp
index 887fba3860..37d4336a54 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp
@@ -268,9 +268,9 @@ namespace ExtUI {
   }
 
   float getAxisPosition_mm(const extruder_t extruder) {
-    const uint8_t old_tool = active_extruder;
+    const extruder_t old_tool = getActiveTool();
     setActiveTool(extruder, true);
-    float pos = flags.manual_motion ? destination[E_AXIS] : current_position[E_AXIS];
+    const float pos = flags.manual_motion ? destination[E_AXIS] : current_position[E_AXIS];
     setActiveTool(old_tool, true);
     return pos;
   }
@@ -813,7 +813,7 @@ namespace ExtUI {
     queue.inject_P(gcode);
   }
 
-  bool commandsInQueue() { return (planner.movesplanned() || queue.has_commands_queued()); }
+  bool commandsInQueue() { return (flags.manual_motion || planner.movesplanned() || queue.has_commands_queued()); }
 
   bool isAxisPositionKnown(const axis_t axis) {
     return TEST(axis_known_position, axis);