|
@@ -207,7 +207,7 @@ CrealityDWINClass CrealityDWIN;
|
207
|
207
|
|
208
|
208
|
void manual_value_update(bool undefined=false) {
|
209
|
209
|
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" : "");
|
210
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
210
|
+ gcode.process_subcommands_now(cmd);
|
211
|
211
|
planner.synchronize();
|
212
|
212
|
}
|
213
|
213
|
|
|
@@ -267,7 +267,7 @@ CrealityDWINClass CrealityDWIN;
|
267
|
267
|
|
268
|
268
|
void manual_value_update() {
|
269
|
269
|
sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
|
270
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
270
|
+ gcode.process_subcommands_now(cmd);
|
271
|
271
|
planner.synchronize();
|
272
|
272
|
}
|
273
|
273
|
|
|
@@ -283,9 +283,9 @@ CrealityDWINClass CrealityDWIN;
|
283
|
283
|
else {
|
284
|
284
|
CrealityDWIN.Popup_Handler(MoveWait);
|
285
|
285
|
sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
|
286
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
286
|
+ gcode.process_subcommands_now(cmd);
|
287
|
287
|
sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
|
288
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
288
|
+ gcode.process_subcommands_now(cmd);
|
289
|
289
|
planner.synchronize();
|
290
|
290
|
current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
|
291
|
291
|
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/
|
1116
|
1116
|
}
|
1117
|
1117
|
Popup_Handler(FilChange);
|
1118
|
1118
|
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
|
1119
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1119
|
+ gcode.process_subcommands_now(cmd);
|
1120
|
1120
|
}
|
1121
|
1121
|
#endif
|
1122
|
1122
|
}
|
|
@@ -1156,7 +1156,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1156
|
1156
|
Draw_Menu_Item(row, ICON_MoveX, "Home X");
|
1157
|
1157
|
else {
|
1158
|
1158
|
Popup_Handler(Home);
|
1159
|
|
- gcode.process_subcommands_now_P(PSTR("G28 X"));
|
|
1159
|
+ gcode.process_subcommands_now(F("G28 X"));
|
1160
|
1160
|
planner.synchronize();
|
1161
|
1161
|
Redraw_Menu();
|
1162
|
1162
|
}
|
|
@@ -1166,7 +1166,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1166
|
1166
|
Draw_Menu_Item(row, ICON_MoveY, "Home Y");
|
1167
|
1167
|
else {
|
1168
|
1168
|
Popup_Handler(Home);
|
1169
|
|
- gcode.process_subcommands_now_P(PSTR("G28 Y"));
|
|
1169
|
+ gcode.process_subcommands_now(F("G28 Y"));
|
1170
|
1170
|
planner.synchronize();
|
1171
|
1171
|
Redraw_Menu();
|
1172
|
1172
|
}
|
|
@@ -1176,7 +1176,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1176
|
1176
|
Draw_Menu_Item(row, ICON_MoveZ,"Home Z");
|
1177
|
1177
|
else {
|
1178
|
1178
|
Popup_Handler(Home);
|
1179
|
|
- gcode.process_subcommands_now_P(PSTR("G28 Z"));
|
|
1179
|
+ gcode.process_subcommands_now(F("G28 Z"));
|
1180
|
1180
|
planner.synchronize();
|
1181
|
1181
|
Redraw_Menu();
|
1182
|
1182
|
}
|
|
@@ -1185,7 +1185,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1185
|
1185
|
if (draw)
|
1186
|
1186
|
Draw_Menu_Item(row, ICON_SetHome, "Set Home Position");
|
1187
|
1187
|
else {
|
1188
|
|
- gcode.process_subcommands_now_P(PSTR("G92 X0 Y0 Z0"));
|
|
1188
|
+ gcode.process_subcommands_now(F("G92 X0 Y0 Z0"));
|
1189
|
1189
|
AudioFeedback();
|
1190
|
1190
|
}
|
1191
|
1191
|
break;
|
|
@@ -1350,14 +1350,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1350
|
1350
|
if (use_probe) {
|
1351
|
1351
|
#if HAS_BED_PROBE
|
1352
|
1352
|
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));
|
1353
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1353
|
+ gcode.process_subcommands_now(cmd);
|
1354
|
1354
|
planner.synchronize();
|
1355
|
1355
|
Popup_Handler(ManualProbing);
|
1356
|
1356
|
#endif
|
1357
|
1357
|
}
|
1358
|
1358
|
else {
|
1359
|
1359
|
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));
|
1360
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1360
|
+ gcode.process_subcommands_now(cmd);
|
1361
|
1361
|
planner.synchronize();
|
1362
|
1362
|
Redraw_Menu();
|
1363
|
1363
|
}
|
|
@@ -1371,14 +1371,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1371
|
1371
|
if (use_probe) {
|
1372
|
1372
|
#if HAS_BED_PROBE
|
1373
|
1373
|
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));
|
1374
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1374
|
+ gcode.process_subcommands_now(cmd);
|
1375
|
1375
|
planner.synchronize();
|
1376
|
1376
|
Popup_Handler(ManualProbing);
|
1377
|
1377
|
#endif
|
1378
|
1378
|
}
|
1379
|
1379
|
else {
|
1380
|
1380
|
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));
|
1381
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1381
|
+ gcode.process_subcommands_now(cmd);
|
1382
|
1382
|
planner.synchronize();
|
1383
|
1383
|
Redraw_Menu();
|
1384
|
1384
|
}
|
|
@@ -1392,14 +1392,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1392
|
1392
|
if (use_probe) {
|
1393
|
1393
|
#if HAS_BED_PROBE
|
1394
|
1394
|
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));
|
1395
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1395
|
+ gcode.process_subcommands_now(cmd);
|
1396
|
1396
|
planner.synchronize();
|
1397
|
1397
|
Popup_Handler(ManualProbing);
|
1398
|
1398
|
#endif
|
1399
|
1399
|
}
|
1400
|
1400
|
else {
|
1401
|
1401
|
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));
|
1402
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1402
|
+ gcode.process_subcommands_now(cmd);
|
1403
|
1403
|
planner.synchronize();
|
1404
|
1404
|
Redraw_Menu();
|
1405
|
1405
|
}
|
|
@@ -1413,14 +1413,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1413
|
1413
|
if (use_probe) {
|
1414
|
1414
|
#if HAS_BED_PROBE
|
1415
|
1415
|
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));
|
1416
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1416
|
+ gcode.process_subcommands_now(cmd);
|
1417
|
1417
|
planner.synchronize();
|
1418
|
1418
|
Popup_Handler(ManualProbing);
|
1419
|
1419
|
#endif
|
1420
|
1420
|
}
|
1421
|
1421
|
else {
|
1422
|
1422
|
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));
|
1423
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1423
|
+ gcode.process_subcommands_now(cmd);
|
1424
|
1424
|
planner.synchronize();
|
1425
|
1425
|
Redraw_Menu();
|
1426
|
1426
|
}
|
|
@@ -1434,14 +1434,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1434
|
1434
|
if (use_probe) {
|
1435
|
1435
|
#if HAS_BED_PROBE
|
1436
|
1436
|
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));
|
1437
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1437
|
+ gcode.process_subcommands_now(cmd);
|
1438
|
1438
|
planner.synchronize();
|
1439
|
1439
|
Popup_Handler(ManualProbing);
|
1440
|
1440
|
#endif
|
1441
|
1441
|
}
|
1442
|
1442
|
else {
|
1443
|
1443
|
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));
|
1444
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1444
|
+ gcode.process_subcommands_now(cmd);
|
1445
|
1445
|
planner.synchronize();
|
1446
|
1446
|
Redraw_Menu();
|
1447
|
1447
|
}
|
|
@@ -1484,16 +1484,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1484
|
1484
|
Draw_Menu_Item(row, ICON_Homing, "Home Z Axis");
|
1485
|
1485
|
else {
|
1486
|
1486
|
Popup_Handler(Home);
|
1487
|
|
- gcode.process_subcommands_now_P(PSTR("G28 Z"));
|
|
1487
|
+ gcode.process_subcommands_now(F("G28 Z"));
|
1488
|
1488
|
Popup_Handler(MoveWait);
|
1489
|
1489
|
#if ENABLED(Z_SAFE_HOMING)
|
1490
|
1490
|
planner.synchronize();
|
1491
|
1491
|
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));
|
1492
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1492
|
+ gcode.process_subcommands_now(cmd);
|
1493
|
1493
|
#else
|
1494
|
|
- gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
|
|
1494
|
+ gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
|
1495
|
1495
|
#endif
|
1496
|
|
- gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
|
|
1496
|
+ gcode.process_subcommands_now(F("G0 F300 Z0"));
|
1497
|
1497
|
planner.synchronize();
|
1498
|
1498
|
Redraw_Menu();
|
1499
|
1499
|
}
|
|
@@ -1513,11 +1513,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1513
|
1513
|
#if ENABLED(Z_SAFE_HOMING)
|
1514
|
1514
|
planner.synchronize();
|
1515
|
1515
|
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));
|
1516
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1516
|
+ gcode.process_subcommands_now(cmd);
|
1517
|
1517
|
#else
|
1518
|
|
- gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
|
|
1518
|
+ gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
|
1519
|
1519
|
#endif
|
1520
|
|
- gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
|
|
1520
|
+ gcode.process_subcommands_now(F("G0 F300 Z0"));
|
1521
|
1521
|
planner.synchronize();
|
1522
|
1522
|
Redraw_Menu();
|
1523
|
1523
|
}
|
|
@@ -1539,7 +1539,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1539
|
1539
|
else {
|
1540
|
1540
|
if (zoffsetvalue < MAX_Z_OFFSET) {
|
1541
|
1541
|
if (liveadjust) {
|
1542
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
|
|
1542
|
+ gcode.process_subcommands_now(F("M290 Z0.01"));
|
1543
|
1543
|
planner.synchronize();
|
1544
|
1544
|
}
|
1545
|
1545
|
zoffsetvalue += 0.01;
|
|
@@ -1553,7 +1553,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1553
|
1553
|
else {
|
1554
|
1554
|
if (zoffsetvalue > MIN_Z_OFFSET) {
|
1555
|
1555
|
if (liveadjust) {
|
1556
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
|
|
1556
|
+ gcode.process_subcommands_now(F("M290 Z-0.01"));
|
1557
|
1557
|
planner.synchronize();
|
1558
|
1558
|
}
|
1559
|
1559
|
zoffsetvalue -= 0.01;
|
|
@@ -1721,7 +1721,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1721
|
1721
|
thermalManager.wait_for_hotend(0);
|
1722
|
1722
|
}
|
1723
|
1723
|
Popup_Handler(FilLoad);
|
1724
|
|
- gcode.process_subcommands_now_P(PSTR("M701"));
|
|
1724
|
+ gcode.process_subcommands_now(F("M701"));
|
1725
|
1725
|
planner.synchronize();
|
1726
|
1726
|
Redraw_Menu();
|
1727
|
1727
|
}
|
|
@@ -1740,7 +1740,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1740
|
1740
|
thermalManager.wait_for_hotend(0);
|
1741
|
1741
|
}
|
1742
|
1742
|
Popup_Handler(FilLoad, true);
|
1743
|
|
- gcode.process_subcommands_now_P(PSTR("M702"));
|
|
1743
|
+ gcode.process_subcommands_now(F("M702"));
|
1744
|
1744
|
planner.synchronize();
|
1745
|
1745
|
Redraw_Menu();
|
1746
|
1746
|
}
|
|
@@ -1759,7 +1759,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
1759
|
1759
|
}
|
1760
|
1760
|
Popup_Handler(FilChange);
|
1761
|
1761
|
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
|
1762
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
1762
|
+ gcode.process_subcommands_now(cmd);
|
1763
|
1763
|
}
|
1764
|
1764
|
}
|
1765
|
1765
|
break;
|
|
@@ -2016,7 +2016,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
2016
|
2016
|
else {
|
2017
|
2017
|
Popup_Handler(PIDWait);
|
2018
|
2018
|
sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
|
2019
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
2019
|
+ gcode.process_subcommands_now(cmd);
|
2020
|
2020
|
planner.synchronize();
|
2021
|
2021
|
Redraw_Menu();
|
2022
|
2022
|
}
|
|
@@ -2083,7 +2083,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
2083
|
2083
|
else {
|
2084
|
2084
|
Popup_Handler(PIDWait);
|
2085
|
2085
|
sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
|
2086
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
2086
|
+ gcode.process_subcommands_now(cmd);
|
2087
|
2087
|
planner.synchronize();
|
2088
|
2088
|
Redraw_Menu();
|
2089
|
2089
|
}
|
|
@@ -3029,7 +3029,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3029
|
3029
|
Draw_Menu_Item(row, ICON_StepY, "M48 Probe Test");
|
3030
|
3030
|
else {
|
3031
|
3031
|
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);
|
3032
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
3032
|
+ gcode.process_subcommands_now(cmd);
|
3033
|
3033
|
}
|
3034
|
3034
|
break;
|
3035
|
3035
|
case PROBE_TEST_COUNT:
|
|
@@ -3141,11 +3141,12 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3141
|
3141
|
Popup_Handler(Home);
|
3142
|
3142
|
gcode.home_all_axes(true);
|
3143
|
3143
|
Popup_Handler(Level);
|
3144
|
|
- if (mesh_conf.tilt_grid > 1)
|
|
3144
|
+ if (mesh_conf.tilt_grid > 1) {
|
3145
|
3145
|
sprintf_P(cmd, PSTR("G29 J%i"), mesh_conf.tilt_grid);
|
|
3146
|
+ gcode.process_subcommands_now(cmd);
|
|
3147
|
+ }
|
3146
|
3148
|
else
|
3147
|
|
- sprintf_P(cmd, PSTR("G29 J"));
|
3148
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
3149
|
+ gcode.process_subcommands_now(F("G29 J"));
|
3149
|
3150
|
planner.synchronize();
|
3150
|
3151
|
Redraw_Menu();
|
3151
|
3152
|
}
|
|
@@ -3173,8 +3174,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3173
|
3174
|
#endif
|
3174
|
3175
|
#if HAS_BED_PROBE
|
3175
|
3176
|
Popup_Handler(Level);
|
3176
|
|
- gcode.process_subcommands_now_P(PSTR("G29 P0\nG29 P1"));
|
3177
|
|
- 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"));
|
|
3177
|
+ gcode.process_subcommands_now(F("G29 P0\nG29 P1"));
|
|
3178
|
+ 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"));
|
3178
|
3179
|
planner.synchronize();
|
3179
|
3180
|
Update_Status("Probed all reachable points");
|
3180
|
3181
|
Popup_Handler(SaveLevel);
|
|
@@ -3189,7 +3190,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3189
|
3190
|
#endif
|
3190
|
3191
|
#elif HAS_BED_PROBE
|
3191
|
3192
|
Popup_Handler(Level);
|
3192
|
|
- gcode.process_subcommands_now_P(PSTR("G29"));
|
|
3193
|
+ gcode.process_subcommands_now(F("G29"));
|
3193
|
3194
|
planner.synchronize();
|
3194
|
3195
|
Popup_Handler(SaveLevel);
|
3195
|
3196
|
#else
|
|
@@ -3197,7 +3198,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3197
|
3198
|
set_bed_leveling_enabled(false);
|
3198
|
3199
|
gridpoint = 1;
|
3199
|
3200
|
Popup_Handler(MoveWait);
|
3200
|
|
- gcode.process_subcommands_now_P(PSTR("G29"));
|
|
3201
|
+ gcode.process_subcommands_now(F("G29"));
|
3201
|
3202
|
planner.synchronize();
|
3202
|
3203
|
Draw_Menu(ManualMesh);
|
3203
|
3204
|
#endif
|
|
@@ -3280,7 +3281,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3280
|
3281
|
Popup_Handler(MeshSlot);
|
3281
|
3282
|
break;
|
3282
|
3283
|
}
|
3283
|
|
- gcode.process_subcommands_now_P(PSTR("G29 L"));
|
|
3284
|
+ gcode.process_subcommands_now(F("G29 L"));
|
3284
|
3285
|
planner.synchronize();
|
3285
|
3286
|
AudioFeedback(true);
|
3286
|
3287
|
}
|
|
@@ -3293,7 +3294,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3293
|
3294
|
Popup_Handler(MeshSlot);
|
3294
|
3295
|
break;
|
3295
|
3296
|
}
|
3296
|
|
- gcode.process_subcommands_now_P(PSTR("G29 S"));
|
|
3297
|
+ gcode.process_subcommands_now(F("G29 S"));
|
3297
|
3298
|
planner.synchronize();
|
3298
|
3299
|
AudioFeedback(true);
|
3299
|
3300
|
}
|
|
@@ -3389,7 +3390,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3389
|
3390
|
Draw_Menu_Item(row, ICON_ResumeEEPROM, "Convert Mesh to Plane");
|
3390
|
3391
|
else {
|
3391
|
3392
|
if (mesh_conf.create_plane_from_mesh()) break;
|
3392
|
|
- gcode.process_subcommands_now_P(PSTR("M420 S1"));
|
|
3393
|
+ gcode.process_subcommands_now(F("M420 S1"));
|
3393
|
3394
|
planner.synchronize();
|
3394
|
3395
|
AudioFeedback(true);
|
3395
|
3396
|
}
|
|
@@ -3497,7 +3498,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3497
|
3498
|
Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
|
3498
|
3499
|
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
|
3499
|
3500
|
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
|
3500
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
|
|
3501
|
+ gcode.process_subcommands_now(F("M290 Z0.01"));
|
3501
|
3502
|
planner.synchronize();
|
3502
|
3503
|
current_position.z += 0.01f;
|
3503
|
3504
|
sync_plan_position();
|
|
@@ -3509,7 +3510,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3509
|
3510
|
Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
|
3510
|
3511
|
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
|
3511
|
3512
|
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
|
3512
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
|
|
3513
|
+ gcode.process_subcommands_now(F("M290 Z-0.01"));
|
3513
|
3514
|
planner.synchronize();
|
3514
|
3515
|
current_position.z -= 0.01f;
|
3515
|
3516
|
sync_plan_position();
|
|
@@ -3580,7 +3581,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3580
|
3581
|
mesh_conf.manual_move();
|
3581
|
3582
|
}
|
3582
|
3583
|
else {
|
3583
|
|
- gcode.process_subcommands_now_P(PSTR("G29 S"));
|
|
3584
|
+ gcode.process_subcommands_now(F("G29 S"));
|
3584
|
3585
|
planner.synchronize();
|
3585
|
3586
|
AudioFeedback(true);
|
3586
|
3587
|
Draw_Menu(Leveling, LEVELING_GET_MESH);
|
|
@@ -3618,7 +3619,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3618
|
3619
|
Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
|
3619
|
3620
|
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
|
3620
|
3621
|
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
|
3621
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
|
|
3622
|
+ gcode.process_subcommands_now(F("M290 Z0.01"));
|
3622
|
3623
|
planner.synchronize();
|
3623
|
3624
|
current_position.z += 0.01f;
|
3624
|
3625
|
sync_plan_position();
|
|
@@ -3630,7 +3631,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3630
|
3631
|
Draw_Menu_Item(row, ICON_Axis, "Microstep Down");
|
3631
|
3632
|
else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
|
3632
|
3633
|
Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
|
3633
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
|
|
3634
|
+ gcode.process_subcommands_now(F("M290 Z-0.01"));
|
3634
|
3635
|
planner.synchronize();
|
3635
|
3636
|
current_position.z -= 0.01f;
|
3636
|
3637
|
sync_plan_position();
|
|
@@ -3657,7 +3658,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3657
|
3658
|
if (draw)
|
3658
|
3659
|
Draw_Menu_Item(row, ICON_Back, "Cancel");
|
3659
|
3660
|
else {
|
3660
|
|
- gcode.process_subcommands_now_P(PSTR("G29 A"));
|
|
3661
|
+ gcode.process_subcommands_now(F("G29 A"));
|
3661
|
3662
|
planner.synchronize();
|
3662
|
3663
|
set_bed_leveling_enabled(level_state);
|
3663
|
3664
|
Draw_Menu(Leveling, LEVELING_GET_MESH);
|
|
@@ -3672,13 +3673,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3672
|
3673
|
}
|
3673
|
3674
|
else if (gridpoint < GRID_MAX_POINTS) {
|
3674
|
3675
|
Popup_Handler(MoveWait);
|
3675
|
|
- gcode.process_subcommands_now_P(PSTR("G29"));
|
|
3676
|
+ gcode.process_subcommands_now(F("G29"));
|
3676
|
3677
|
planner.synchronize();
|
3677
|
3678
|
gridpoint++;
|
3678
|
3679
|
Redraw_Menu();
|
3679
|
3680
|
}
|
3680
|
3681
|
else {
|
3681
|
|
- gcode.process_subcommands_now_P(PSTR("G29"));
|
|
3682
|
+ gcode.process_subcommands_now(F("G29"));
|
3682
|
3683
|
planner.synchronize();
|
3683
|
3684
|
AudioFeedback(settings.save());
|
3684
|
3685
|
Draw_Menu(Leveling, LEVELING_GET_MESH);
|
|
@@ -3697,7 +3698,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3697
|
3698
|
if (draw)
|
3698
|
3699
|
Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
|
3699
|
3700
|
else if (current_position.z < MAX_Z_OFFSET) {
|
3700
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
|
|
3701
|
+ gcode.process_subcommands_now(F("M290 Z0.01"));
|
3701
|
3702
|
planner.synchronize();
|
3702
|
3703
|
current_position.z += 0.01f;
|
3703
|
3704
|
sync_plan_position();
|
|
@@ -3708,7 +3709,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3708
|
3709
|
if (draw)
|
3709
|
3710
|
Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
|
3710
|
3711
|
else if (current_position.z > MIN_Z_OFFSET) {
|
3711
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
|
|
3712
|
+ gcode.process_subcommands_now(F("M290 Z-0.01"));
|
3712
|
3713
|
planner.synchronize();
|
3713
|
3714
|
current_position.z -= 0.01f;
|
3714
|
3715
|
sync_plan_position();
|
|
@@ -3829,7 +3830,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3829
|
3830
|
if (draw)
|
3830
|
3831
|
Draw_Menu_Item(row, ICON_Axis, "Z-Offset Up");
|
3831
|
3832
|
else if (zoffsetvalue < MAX_Z_OFFSET) {
|
3832
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
|
|
3833
|
+ gcode.process_subcommands_now(F("M290 Z0.01"));
|
3833
|
3834
|
zoffsetvalue += 0.01;
|
3834
|
3835
|
Draw_Float(zoffsetvalue, row - 1, false, 100);
|
3835
|
3836
|
}
|
|
@@ -3838,7 +3839,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3838
|
3839
|
if (draw)
|
3839
|
3840
|
Draw_Menu_Item(row, ICON_AxisD, "Z-Offset Down");
|
3840
|
3841
|
else if (zoffsetvalue > MIN_Z_OFFSET) {
|
3841
|
|
- gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
|
|
3842
|
+ gcode.process_subcommands_now(F("M290 Z-0.01"));
|
3842
|
3843
|
zoffsetvalue -= 0.01;
|
3843
|
3844
|
Draw_Float(zoffsetvalue, row - 2, false, 100);
|
3844
|
3845
|
}
|
|
@@ -3916,27 +3917,27 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
|
3916
|
3917
|
case Prepare:
|
3917
|
3918
|
Popup_Handler(FilChange);
|
3918
|
3919
|
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
|
3919
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
3920
|
+ gcode.process_subcommands_now(cmd);
|
3920
|
3921
|
break;
|
3921
|
3922
|
#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
|
3922
|
3923
|
case ChangeFilament:
|
3923
|
3924
|
switch (last_selection) {
|
3924
|
3925
|
case CHANGEFIL_LOAD:
|
3925
|
3926
|
Popup_Handler(FilLoad);
|
3926
|
|
- gcode.process_subcommands_now_P("M701");
|
|
3927
|
+ gcode.process_subcommands_now(F("M701"));
|
3927
|
3928
|
planner.synchronize();
|
3928
|
3929
|
Redraw_Menu(true, true, true);
|
3929
|
3930
|
break;
|
3930
|
3931
|
case CHANGEFIL_UNLOAD:
|
3931
|
3932
|
Popup_Handler(FilLoad, true);
|
3932
|
|
- gcode.process_subcommands_now_P("M702");
|
|
3933
|
+ gcode.process_subcommands_now(F("M702"));
|
3933
|
3934
|
planner.synchronize();
|
3934
|
3935
|
Redraw_Menu(true, true, true);
|
3935
|
3936
|
break;
|
3936
|
3937
|
case CHANGEFIL_CHANGE:
|
3937
|
3938
|
Popup_Handler(FilChange);
|
3938
|
3939
|
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
|
3939
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
3940
|
+ gcode.process_subcommands_now(cmd);
|
3940
|
3941
|
break;
|
3941
|
3942
|
}
|
3942
|
3943
|
break;
|
|
@@ -4275,7 +4276,7 @@ void CrealityDWINClass::Value_Control() {
|
4275
|
4276
|
}
|
4276
|
4277
|
else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
|
4277
|
4278
|
sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - zoffsetvalue), 1, 3, str_1));
|
4278
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
4279
|
+ gcode.process_subcommands_now(cmd);
|
4279
|
4280
|
}
|
4280
|
4281
|
if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
|
4281
|
4282
|
tempvalue = scalePID_i(tempvalue);
|
|
@@ -4474,11 +4475,11 @@ void CrealityDWINClass::Print_Screen_Control() {
|
4474
|
4475
|
char cmnd[20];
|
4475
|
4476
|
#if HAS_HEATED_BED
|
4476
|
4477
|
cmnd[sprintf_P(cmnd, PSTR("M140 S%i"), pausebed)] = '\0';
|
4477
|
|
- gcode.process_subcommands_now_P(PSTR(cmnd));
|
|
4478
|
+ gcode.process_subcommands_now(cmnd);
|
4478
|
4479
|
#endif
|
4479
|
4480
|
#if HAS_EXTRUDERS
|
4480
|
4481
|
cmnd[sprintf_P(cmnd, PSTR("M109 S%i"), pausetemp)] = '\0';
|
4481
|
|
- gcode.process_subcommands_now_P(PSTR(cmnd));
|
|
4482
|
+ gcode.process_subcommands_now(cmnd);
|
4482
|
4483
|
#endif
|
4483
|
4484
|
TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
|
4484
|
4485
|
planner.synchronize();
|
|
@@ -4603,7 +4604,7 @@ void CrealityDWINClass::Popup_Control() {
|
4603
|
4604
|
}
|
4604
|
4605
|
Popup_Handler(FilChange);
|
4605
|
4606
|
sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
|
4606
|
|
- gcode.process_subcommands_now_P(cmd);
|
|
4607
|
+ gcode.process_subcommands_now(cmd);
|
4607
|
4608
|
}
|
4608
|
4609
|
}
|
4609
|
4610
|
else
|
|
@@ -4626,7 +4627,7 @@ void CrealityDWINClass::Popup_Control() {
|
4626
|
4627
|
case SaveLevel:
|
4627
|
4628
|
if (selection == 0) {
|
4628
|
4629
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
4629
|
|
- gcode.process_subcommands_now_P(PSTR("G29 S"));
|
|
4630
|
+ gcode.process_subcommands_now(F("G29 S"));
|
4630
|
4631
|
planner.synchronize();
|
4631
|
4632
|
AudioFeedback(true);
|
4632
|
4633
|
#else
|