thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🎨 Apply F() to G-code subcommands

Browse Source
This commit is contained in:
Scott Lahteine
2021-09-25 18:43:52 -05:00
committed by Scott Lahteine
parent 23f10563e0
commit 59dac3a7e4
28 changed files with 136 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,7 @@ CrealityDWINClass CrealityDWIN;
void manual_value_update(bool undefined=false) {
sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
}
@@ -267,7 +267,7 @@ CrealityDWINClass CrealityDWIN;
void manual_value_update() {
sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
}
@@ -283,9 +283,9 @@ CrealityDWINClass CrealityDWIN;
else {
CrealityDWIN.Popup_Handler(MoveWait);
sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
@@ -1116,7 +1116,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
}
Popup_Handler(FilChange);
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
}
#endif
}
@@ -1156,7 +1156,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_MoveX, "Home X");
else {
Popup_Handler(Home);
gcode.process_subcommands_now_P(PSTR("G28 X"));
gcode.process_subcommands_now(F("G28 X"));
planner.synchronize();
Redraw_Menu();
}
@@ -1166,7 +1166,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_MoveY, "Home Y");
else {
Popup_Handler(Home);
gcode.process_subcommands_now_P(PSTR("G28 Y"));
gcode.process_subcommands_now(F("G28 Y"));
planner.synchronize();
Redraw_Menu();
}
@@ -1176,7 +1176,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_MoveZ,"Home Z");
else {
Popup_Handler(Home);
gcode.process_subcommands_now_P(PSTR("G28 Z"));
gcode.process_subcommands_now(F("G28 Z"));
planner.synchronize();
Redraw_Menu();
}
@@ -1185,7 +1185,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (draw)
Draw_Menu_Item(row, ICON_SetHome, "Set Home Position");
else {
gcode.process_subcommands_now_P(PSTR("G92 X0 Y0 Z0"));
gcode.process_subcommands_now(F("G92 X0 Y0 Z0"));
AudioFeedback();
}
break;
@@ -1350,14 +1350,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (use_probe) {
#if HAS_BED_PROBE
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Popup_Handler(ManualProbing);
#endif
}
else {
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -1371,14 +1371,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (use_probe) {
#if HAS_BED_PROBE
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Popup_Handler(ManualProbing);
#endif
}
else {
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -1392,14 +1392,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (use_probe) {
#if HAS_BED_PROBE
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Popup_Handler(ManualProbing);
#endif
}
else {
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -1413,14 +1413,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (use_probe) {
#if HAS_BED_PROBE
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Popup_Handler(ManualProbing);
#endif
}
else {
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -1434,14 +1434,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (use_probe) {
#if HAS_BED_PROBE
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(X_MAX_POS / 2.0f - probe.offset.x, 1, 3, str_1), dtostrf(Y_MAX_POS / 2.0f - probe.offset.y, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Popup_Handler(ManualProbing);
#endif
}
else {
sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -1484,16 +1484,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_Homing, "Home Z Axis");
else {
Popup_Handler(Home);
gcode.process_subcommands_now_P(PSTR("G28 Z"));
gcode.process_subcommands_now(F("G28 Z"));
Popup_Handler(MoveWait);
#if ENABLED(Z_SAFE_HOMING)
planner.synchronize();
sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
#else
gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
#endif
gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
gcode.process_subcommands_now(F("G0 F300 Z0"));
planner.synchronize();
Redraw_Menu();
}
@@ -1513,11 +1513,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
#if ENABLED(Z_SAFE_HOMING)
planner.synchronize();
sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
#else
gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
#endif
gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
gcode.process_subcommands_now(F("G0 F300 Z0"));
planner.synchronize();
Redraw_Menu();
}
@@ -1539,7 +1539,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
else {
if (zoffsetvalue < MAX_Z_OFFSET) {
if (liveadjust) {
gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
gcode.process_subcommands_now(F("M290 Z0.01"));
planner.synchronize();
}
zoffsetvalue += 0.01;
@@ -1553,7 +1553,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
else {
if (zoffsetvalue > MIN_Z_OFFSET) {
if (liveadjust) {
gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
gcode.process_subcommands_now(F("M290 Z-0.01"));
planner.synchronize();
}
zoffsetvalue -= 0.01;
@@ -1721,7 +1721,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
thermalManager.wait_for_hotend(0);
}
Popup_Handler(FilLoad);
gcode.process_subcommands_now_P(PSTR("M701"));
gcode.process_subcommands_now(F("M701"));
planner.synchronize();
Redraw_Menu();
}
@@ -1740,7 +1740,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
thermalManager.wait_for_hotend(0);
}
Popup_Handler(FilLoad, true);
gcode.process_subcommands_now_P(PSTR("M702"));
gcode.process_subcommands_now(F("M702"));
planner.synchronize();
Redraw_Menu();
}
@@ -1759,7 +1759,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
}
Popup_Handler(FilChange);
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
}
}
break;
@@ -2016,7 +2016,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
else {
Popup_Handler(PIDWait);
sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -2083,7 +2083,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
else {
Popup_Handler(PIDWait);
sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
planner.synchronize();
Redraw_Menu();
}
@@ -3029,7 +3029,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_StepY, "M48 Probe Test");
else {
sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
}
break;
case PROBE_TEST_COUNT:
@@ -3141,11 +3141,12 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Popup_Handler(Home);
gcode.home_all_axes(true);
Popup_Handler(Level);
if (mesh_conf.tilt_grid > 1)
if (mesh_conf.tilt_grid > 1) {
sprintf_P(cmd, PSTR("G29 J%i"), mesh_conf.tilt_grid);
gcode.process_subcommands_now(cmd);
}
else
sprintf_P(cmd, PSTR("G29 J"));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(F("G29 J"));
planner.synchronize();
Redraw_Menu();
}
@@ -3173,8 +3174,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
#endif
#if HAS_BED_PROBE
Popup_Handler(Level);
gcode.process_subcommands_now_P(PSTR("G29 P0\nG29 P1"));
gcode.process_subcommands_now_P(PSTR("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
gcode.process_subcommands_now(F("G29 P0\nG29 P1"));
gcode.process_subcommands_now(F("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
planner.synchronize();
Update_Status("Probed all reachable points");
Popup_Handler(SaveLevel);
@@ -3189,7 +3190,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
#endif
#elif HAS_BED_PROBE
Popup_Handler(Level);
gcode.process_subcommands_now_P(PSTR("G29"));
gcode.process_subcommands_now(F("G29"));
planner.synchronize();
Popup_Handler(SaveLevel);
#else
@@ -3197,7 +3198,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
set_bed_leveling_enabled(false);
gridpoint = 1;
Popup_Handler(MoveWait);
gcode.process_subcommands_now_P(PSTR("G29"));
gcode.process_subcommands_now(F("G29"));
planner.synchronize();
Draw_Menu(ManualMesh);
#endif
@@ -3280,7 +3281,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Popup_Handler(MeshSlot);
break;
}
gcode.process_subcommands_now_P(PSTR("G29 L"));
gcode.process_subcommands_now(F("G29 L"));
planner.synchronize();
AudioFeedback(true);
}
@@ -3293,7 +3294,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Popup_Handler(MeshSlot);
break;
}
gcode.process_subcommands_now_P(PSTR("G29 S"));
gcode.process_subcommands_now(F("G29 S"));
planner.synchronize();
AudioFeedback(true);
}
@@ -3389,7 +3390,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_ResumeEEPROM, "Convert Mesh to Plane");
else {
if (mesh_conf.create_plane_from_mesh()) break;
gcode.process_subcommands_now_P(PSTR("M420 S1"));
gcode.process_subcommands_now(F("M420 S1"));
planner.synchronize();
AudioFeedback(true);
}
@@ -3497,7 +3498,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
gcode.process_subcommands_now(F("M290 Z0.01"));
planner.synchronize();
current_position.z += 0.01f;
sync_plan_position();
@@ -3509,7 +3510,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
gcode.process_subcommands_now(F("M290 Z-0.01"));
planner.synchronize();
current_position.z -= 0.01f;
sync_plan_position();
@@ -3580,7 +3581,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
mesh_conf.manual_move();
}
else {
gcode.process_subcommands_now_P(PSTR("G29 S"));
gcode.process_subcommands_now(F("G29 S"));
planner.synchronize();
AudioFeedback(true);
Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3618,7 +3619,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
gcode.process_subcommands_now(F("M290 Z0.01"));
planner.synchronize();
current_position.z += 0.01f;
sync_plan_position();
@@ -3630,7 +3631,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Menu_Item(row, ICON_Axis, "Microstep Down");
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
gcode.process_subcommands_now(F("M290 Z-0.01"));
planner.synchronize();
current_position.z -= 0.01f;
sync_plan_position();
@@ -3657,7 +3658,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (draw)
Draw_Menu_Item(row, ICON_Back, "Cancel");
else {
gcode.process_subcommands_now_P(PSTR("G29 A"));
gcode.process_subcommands_now(F("G29 A"));
planner.synchronize();
set_bed_leveling_enabled(level_state);
Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3672,13 +3673,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
}
else if (gridpoint < GRID_MAX_POINTS) {
Popup_Handler(MoveWait);
gcode.process_subcommands_now_P(PSTR("G29"));
gcode.process_subcommands_now(F("G29"));
planner.synchronize();
gridpoint++;
Redraw_Menu();
}
else {
gcode.process_subcommands_now_P(PSTR("G29"));
gcode.process_subcommands_now(F("G29"));
planner.synchronize();
AudioFeedback(settings.save());
Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3697,7 +3698,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (draw)
Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
else if (current_position.z < MAX_Z_OFFSET) {
gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
gcode.process_subcommands_now(F("M290 Z0.01"));
planner.synchronize();
current_position.z += 0.01f;
sync_plan_position();
@@ -3708,7 +3709,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (draw)
Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
else if (current_position.z > MIN_Z_OFFSET) {
gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
gcode.process_subcommands_now(F("M290 Z-0.01"));
planner.synchronize();
current_position.z -= 0.01f;
sync_plan_position();
@@ -3829,7 +3830,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (draw)
Draw_Menu_Item(row, ICON_Axis, "Z-Offset Up");
else if (zoffsetvalue < MAX_Z_OFFSET) {
gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
gcode.process_subcommands_now(F("M290 Z0.01"));
zoffsetvalue += 0.01;
Draw_Float(zoffsetvalue, row - 1, false, 100);
}
@@ -3838,7 +3839,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
if (draw)
Draw_Menu_Item(row, ICON_AxisD, "Z-Offset Down");
else if (zoffsetvalue > MIN_Z_OFFSET) {
gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
gcode.process_subcommands_now(F("M290 Z-0.01"));
zoffsetvalue -= 0.01;
Draw_Float(zoffsetvalue, row - 2, false, 100);
}
@@ -3916,27 +3917,27 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
case Prepare:
Popup_Handler(FilChange);
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
break;
#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
case ChangeFilament:
switch (last_selection) {
case CHANGEFIL_LOAD:
Popup_Handler(FilLoad);
gcode.process_subcommands_now_P("M701");
gcode.process_subcommands_now(F("M701"));
planner.synchronize();
Redraw_Menu(true, true, true);
break;
case CHANGEFIL_UNLOAD:
Popup_Handler(FilLoad, true);
gcode.process_subcommands_now_P("M702");
gcode.process_subcommands_now(F("M702"));
planner.synchronize();
Redraw_Menu(true, true, true);
break;
case CHANGEFIL_CHANGE:
Popup_Handler(FilChange);
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
break;
}
break;
@@ -4275,7 +4276,7 @@ void CrealityDWINClass::Value_Control() {
}
else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - zoffsetvalue), 1, 3, str_1));
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
}
if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
tempvalue = scalePID_i(tempvalue);
@@ -4474,11 +4475,11 @@ void CrealityDWINClass::Print_Screen_Control() {
char cmnd[20];
#if HAS_HEATED_BED
cmnd[sprintf_P(cmnd, PSTR("M140 S%i"), pausebed)] = '\0';
gcode.process_subcommands_now_P(PSTR(cmnd));
gcode.process_subcommands_now(cmnd);
#endif
#if HAS_EXTRUDERS
cmnd[sprintf_P(cmnd, PSTR("M109 S%i"), pausetemp)] = '\0';
gcode.process_subcommands_now_P(PSTR(cmnd));
gcode.process_subcommands_now(cmnd);
#endif
TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
planner.synchronize();
@@ -4603,7 +4604,7 @@ void CrealityDWINClass::Popup_Control() {
}
Popup_Handler(FilChange);
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
gcode.process_subcommands_now_P(cmd);
gcode.process_subcommands_now(cmd);
}
}
else
@@ -4626,7 +4627,7 @@ void CrealityDWINClass::Popup_Control() {
case SaveLevel:
if (selection == 0) {
#if ENABLED(AUTO_BED_LEVELING_UBL)
gcode.process_subcommands_now_P(PSTR("G29 S"));
gcode.process_subcommands_now(F("G29 S"));
planner.synchronize();
AudioFeedback(true);
#else