|
@@ -483,7 +483,7 @@ inline bool turn_on_heaters() {
|
483
|
483
|
/**
|
484
|
484
|
* Prime the nozzle if needed. Return true on error.
|
485
|
485
|
*/
|
486
|
|
-bool prime_nozzle() {
|
|
486
|
+inline bool prime_nozzle() {
|
487
|
487
|
|
488
|
488
|
#if ENABLED(NEWPANEL)
|
489
|
489
|
float Total_Prime = 0.0;
|
|
@@ -582,7 +582,7 @@ void GcodeSuite::G26() {
|
582
|
582
|
g26_bed_temp = parser.value_celsius();
|
583
|
583
|
if (!WITHIN(g26_bed_temp, 15, 140)) {
|
584
|
584
|
SERIAL_PROTOCOLLNPGM("?Specified bed temperature not plausible.");
|
585
|
|
- return G26_ERR;
|
|
585
|
+ return;
|
586
|
586
|
}
|
587
|
587
|
}
|
588
|
588
|
|
|
@@ -590,7 +590,7 @@ void GcodeSuite::G26() {
|
590
|
590
|
g26_layer_height = parser.value_linear_units();
|
591
|
591
|
if (!WITHIN(g26_layer_height, 0.0, 2.0)) {
|
592
|
592
|
SERIAL_PROTOCOLLNPGM("?Specified layer height not plausible.");
|
593
|
|
- return G26_ERR;
|
|
593
|
+ return;
|
594
|
594
|
}
|
595
|
595
|
}
|
596
|
596
|
|
|
@@ -599,12 +599,12 @@ void GcodeSuite::G26() {
|
599
|
599
|
g26_retraction_multiplier = parser.value_float();
|
600
|
600
|
if (!WITHIN(g26_retraction_multiplier, 0.05, 15.0)) {
|
601
|
601
|
SERIAL_PROTOCOLLNPGM("?Specified Retraction Multiplier not plausible.");
|
602
|
|
- return G26_ERR;
|
|
602
|
+ return;
|
603
|
603
|
}
|
604
|
604
|
}
|
605
|
605
|
else {
|
606
|
606
|
SERIAL_PROTOCOLLNPGM("?Retraction Multiplier must be specified.");
|
607
|
|
- return G26_ERR;
|
|
607
|
+ return;
|
608
|
608
|
}
|
609
|
609
|
}
|
610
|
610
|
|
|
@@ -612,7 +612,7 @@ void GcodeSuite::G26() {
|
612
|
612
|
g26_nozzle = parser.value_float();
|
613
|
613
|
if (!WITHIN(g26_nozzle, 0.1, 1.0)) {
|
614
|
614
|
SERIAL_PROTOCOLLNPGM("?Specified nozzle size not plausible.");
|
615
|
|
- return G26_ERR;
|
|
615
|
+ return;
|
616
|
616
|
}
|
617
|
617
|
}
|
618
|
618
|
|
|
@@ -622,7 +622,7 @@ void GcodeSuite::G26() {
|
622
|
622
|
g26_prime_flag = -1;
|
623
|
623
|
#else
|
624
|
624
|
SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
|
625
|
|
- return G26_ERR;
|
|
625
|
+ return;
|
626
|
626
|
#endif
|
627
|
627
|
}
|
628
|
628
|
else {
|
|
@@ -630,7 +630,7 @@ void GcodeSuite::G26() {
|
630
|
630
|
g26_prime_length = parser.value_linear_units();
|
631
|
631
|
if (!WITHIN(g26_prime_length, 0.0, 25.0)) {
|
632
|
632
|
SERIAL_PROTOCOLLNPGM("?Specified prime length not plausible.");
|
633
|
|
- return G26_ERR;
|
|
633
|
+ return;
|
634
|
634
|
}
|
635
|
635
|
}
|
636
|
636
|
}
|
|
@@ -639,7 +639,7 @@ void GcodeSuite::G26() {
|
639
|
639
|
g26_filament_diameter = parser.value_linear_units();
|
640
|
640
|
if (!WITHIN(g26_filament_diameter, 1.0, 4.0)) {
|
641
|
641
|
SERIAL_PROTOCOLLNPGM("?Specified filament size not plausible.");
|
642
|
|
- return G26_ERR;
|
|
642
|
+ return;
|
643
|
643
|
}
|
644
|
644
|
}
|
645
|
645
|
g26_extrusion_multiplier *= sq(1.75) / sq(g26_filament_diameter); // If we aren't using 1.75mm filament, we need to
|
|
@@ -652,7 +652,7 @@ void GcodeSuite::G26() {
|
652
|
652
|
g26_hotend_temp = parser.value_celsius();
|
653
|
653
|
if (!WITHIN(g26_hotend_temp, 165, 280)) {
|
654
|
654
|
SERIAL_PROTOCOLLNPGM("?Specified nozzle temperature not plausible.");
|
655
|
|
- return G26_ERR;
|
|
655
|
+ return;
|
656
|
656
|
}
|
657
|
657
|
}
|
658
|
658
|
|
|
@@ -668,14 +668,14 @@ void GcodeSuite::G26() {
|
668
|
668
|
#else
|
669
|
669
|
if (!parser.seen('R')) {
|
670
|
670
|
SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD.");
|
671
|
|
- return G26_ERR;
|
|
671
|
+ return;
|
672
|
672
|
}
|
673
|
673
|
else
|
674
|
674
|
g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
|
675
|
675
|
#endif
|
676
|
676
|
if (g26_repeats < 1) {
|
677
|
677
|
SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1.");
|
678
|
|
- return G26_ERR;
|
|
678
|
+ return;
|
679
|
679
|
}
|
680
|
680
|
|
681
|
681
|
g26_x_pos = parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position[X_AXIS],
|
|
@@ -683,7 +683,7 @@ void GcodeSuite::G26() {
|
683
|
683
|
|
684
|
684
|
if (!position_is_reachable(g26_x_pos, g26_y_pos)) {
|
685
|
685
|
SERIAL_PROTOCOLLNPGM("?Specified X,Y coordinate out of bounds.");
|
686
|
|
- return G26_ERR;
|
|
686
|
+ return;
|
687
|
687
|
}
|
688
|
688
|
|
689
|
689
|
/**
|