jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug

Browse Source
This commit is contained in:
InsanityAutomation
2019-08-20 17:21:49 -04:00
parent f30bf8ba7d
commit f70c1d59da
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp
+19 -6
View File
@@ -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:
Marlin/src/lcd/extensible_ui/ui_api.cpp
+3 -3
View File
@@ -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);