3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-28 22:35:21 +00:00
Code Issues Releases Wiki Activity

🩹 Fix some logical axis usage

Browse Source
This commit is contained in:
Scott Lahteine 2022-01-10 05:34:16 -06:00
parent 08b6597471
commit 224b6e5af9
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/gcode/feature/pause/G60.cpp
View File

@ -47,13 +47,16 @@ void GcodeSuite::G60() {
SBI(saved_slots[slot >> 3], slot & 0x07); SBI(saved_slots[slot >> 3], slot & 0x07);
#if ENABLED(SAVED_POSITIONS_DEBUG) #if ENABLED(SAVED_POSITIONS_DEBUG)
{
DEBUG_ECHOPGM(STR_SAVED_POS " S", slot); DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
const xyze_pos_t &pos = stored_position[slot]; const xyze_pos_t &pos = stored_position[slot];
DEBUG_ECHOLNPAIR_F_P( DEBUG_ECHOLNPAIR_F_P(
LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e, LIST_N(DOUBLE(LINEAR_AXES), PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z, SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z, #if HAS_EXTRUDERS
SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k) , SP_E_STR, pos.e
#endif
); );
}
#endif #endif
} }

2
Marlin/src/lcd/marlinui.cpp
View File

@ -771,7 +771,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
// Add a manual move to the queue? // Add a manual move to the queue?
if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) { if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S; const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
#if IS_KINEMATIC #if IS_KINEMATIC

6
Marlin/src/module/motion.cpp
View File

@ -265,8 +265,7 @@ void report_current_position_projected() {
const xyz_pos_t lpos = cartes.asLogical(); const xyz_pos_t lpos = cartes.asLogical();
SERIAL_ECHOPGM_P( SERIAL_ECHOPGM_P(
LIST_N(DOUBLE(LOGICAL_AXES), LIST_N(DOUBLE(LINEAR_AXES),
SP_E_LBL, current_position.e,
X_LBL, lpos.x, X_LBL, lpos.x,
SP_Y_LBL, lpos.y, SP_Y_LBL, lpos.y,
SP_Z_LBL, lpos.z, SP_Z_LBL, lpos.z,
@ -274,6 +273,9 @@ void report_current_position_projected() {
SP_J_LBL, lpos.j, SP_J_LBL, lpos.j,
SP_K_LBL, lpos.k SP_K_LBL, lpos.k
) )
#if HAS_EXTRUDERS
, SP_E_LBL, current_position.e
#endif
); );
stepper.report_positions(); stepper.report_positions();