bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🐛 Fix Manual Move axis selection (#24404)

Browse Source
This commit is contained in:
Scott Lahteine
2022-06-26 05:47:18 -05:00
parent ab2fceda2c
commit 0435b2220a
9 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View File

@ -283,7 +283,7 @@ CrealityDWINClass CrealityDWIN;
#endif
void manual_move(bool zmove=false) {
void manual_mesh_move(const bool zmove=false) {
if (zmove) {
planner.synchronize();
current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
@ -3035,7 +3035,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
mesh_conf.goto_mesh_value = true;
mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
Popup_Handler(MoveWait);
mesh_conf.manual_move();
mesh_conf.manual_mesh_move();
Draw_Menu(UBLMesh);
#endif
#elif HAS_BED_PROBE
@ -3091,7 +3091,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
#endif
Popup_Handler(MoveWait);
mesh_conf.manual_move();
mesh_conf.manual_mesh_move();
Draw_Menu(LevelManual);
}
break;
@ -3328,7 +3328,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
mesh_conf.mesh_x++;
else
mesh_conf.mesh_x--;
mesh_conf.manual_move();
mesh_conf.manual_mesh_move();
}
}
break;
@ -3375,7 +3375,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
else {
mesh_conf.goto_mesh_value = !mesh_conf.goto_mesh_value;
current_position.z = 0;
mesh_conf.manual_move(true);
mesh_conf.manual_mesh_move(true);
Draw_Checkbox(row, mesh_conf.goto_mesh_value);
}
break;
@ -3428,7 +3428,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
mesh_conf.mesh_x++;
else
mesh_conf.mesh_x--;
mesh_conf.manual_move();
mesh_conf.manual_mesh_move();
}
else {
gcode.process_subcommands_now(F("G29 S"));
@ -3449,7 +3449,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
mesh_conf.mesh_x--;
else
mesh_conf.mesh_x++;
mesh_conf.manual_move();
mesh_conf.manual_mesh_move();
}
}
break;
@ -4109,8 +4109,8 @@ void CrealityDWINClass::Value_Control() {
planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
planner.synchronize();
break;
case UBLMesh: mesh_conf.manual_move(true); break;
case LevelManual: mesh_conf.manual_move(selection == LEVELING_M_OFFSET); break;
case UBLMesh: mesh_conf.manual_mesh_move(true); break;
case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
#endif
}
if (valuepointer == &planner.flow_percentage[0])