Browse Source

Fix gcode_G26 error return

Scott Lahteine 7 years ago
parent
commit
bb0cc1bbbc
1 changed files with 12 additions and 12 deletions
  1. 12
    12
      Marlin/G26_Mesh_Validation_Tool.cpp

+ 12
- 12
Marlin/G26_Mesh_Validation_Tool.cpp View File

590
       g26_bed_temp = parser.value_celsius();
590
       g26_bed_temp = parser.value_celsius();
591
       if (!WITHIN(g26_bed_temp, 15, 140)) {
591
       if (!WITHIN(g26_bed_temp, 15, 140)) {
592
         SERIAL_PROTOCOLLNPGM("?Specified bed temperature not plausible.");
592
         SERIAL_PROTOCOLLNPGM("?Specified bed temperature not plausible.");
593
-        return G26_ERR;
593
+        return;
594
       }
594
       }
595
     }
595
     }
596
 
596
 
598
       g26_layer_height = parser.value_linear_units();
598
       g26_layer_height = parser.value_linear_units();
599
       if (!WITHIN(g26_layer_height, 0.0, 2.0)) {
599
       if (!WITHIN(g26_layer_height, 0.0, 2.0)) {
600
         SERIAL_PROTOCOLLNPGM("?Specified layer height not plausible.");
600
         SERIAL_PROTOCOLLNPGM("?Specified layer height not plausible.");
601
-        return G26_ERR;
601
+        return;
602
       }
602
       }
603
     }
603
     }
604
 
604
 
607
         g26_retraction_multiplier = parser.value_float();
607
         g26_retraction_multiplier = parser.value_float();
608
         if (!WITHIN(g26_retraction_multiplier, 0.05, 15.0)) {
608
         if (!WITHIN(g26_retraction_multiplier, 0.05, 15.0)) {
609
           SERIAL_PROTOCOLLNPGM("?Specified Retraction Multiplier not plausible.");
609
           SERIAL_PROTOCOLLNPGM("?Specified Retraction Multiplier not plausible.");
610
-          return G26_ERR;
610
+          return;
611
         }
611
         }
612
       }
612
       }
613
       else {
613
       else {
614
         SERIAL_PROTOCOLLNPGM("?Retraction Multiplier must be specified.");
614
         SERIAL_PROTOCOLLNPGM("?Retraction Multiplier must be specified.");
615
-        return G26_ERR;
615
+        return;
616
       }
616
       }
617
     }
617
     }
618
 
618
 
620
       g26_nozzle = parser.value_float();
620
       g26_nozzle = parser.value_float();
621
       if (!WITHIN(g26_nozzle, 0.1, 1.0)) {
621
       if (!WITHIN(g26_nozzle, 0.1, 1.0)) {
622
         SERIAL_PROTOCOLLNPGM("?Specified nozzle size not plausible.");
622
         SERIAL_PROTOCOLLNPGM("?Specified nozzle size not plausible.");
623
-        return G26_ERR;
623
+        return;
624
       }
624
       }
625
     }
625
     }
626
 
626
 
630
           g26_prime_flag = -1;
630
           g26_prime_flag = -1;
631
         #else
631
         #else
632
           SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
632
           SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
633
-          return G26_ERR;
633
+          return;
634
         #endif
634
         #endif
635
       }
635
       }
636
       else {
636
       else {
638
         g26_prime_length = parser.value_linear_units();
638
         g26_prime_length = parser.value_linear_units();
639
         if (!WITHIN(g26_prime_length, 0.0, 25.0)) {
639
         if (!WITHIN(g26_prime_length, 0.0, 25.0)) {
640
           SERIAL_PROTOCOLLNPGM("?Specified prime length not plausible.");
640
           SERIAL_PROTOCOLLNPGM("?Specified prime length not plausible.");
641
-          return G26_ERR;
641
+          return;
642
         }
642
         }
643
       }
643
       }
644
     }
644
     }
647
       g26_filament_diameter = parser.value_linear_units();
647
       g26_filament_diameter = parser.value_linear_units();
648
       if (!WITHIN(g26_filament_diameter, 1.0, 4.0)) {
648
       if (!WITHIN(g26_filament_diameter, 1.0, 4.0)) {
649
         SERIAL_PROTOCOLLNPGM("?Specified filament size not plausible.");
649
         SERIAL_PROTOCOLLNPGM("?Specified filament size not plausible.");
650
-        return G26_ERR;
650
+        return;
651
       }
651
       }
652
     }
652
     }
653
     g26_extrusion_multiplier *= sq(1.75) / sq(g26_filament_diameter); // If we aren't using 1.75mm filament, we need to
653
     g26_extrusion_multiplier *= sq(1.75) / sq(g26_filament_diameter); // If we aren't using 1.75mm filament, we need to
660
       g26_hotend_temp = parser.value_celsius();
660
       g26_hotend_temp = parser.value_celsius();
661
       if (!WITHIN(g26_hotend_temp, 165, 280)) {
661
       if (!WITHIN(g26_hotend_temp, 165, 280)) {
662
         SERIAL_PROTOCOLLNPGM("?Specified nozzle temperature not plausible.");
662
         SERIAL_PROTOCOLLNPGM("?Specified nozzle temperature not plausible.");
663
-        return G26_ERR;
663
+        return;
664
       }
664
       }
665
     }
665
     }
666
 
666
 
676
     #else
676
     #else
677
       if (!parser.seen('R')) {
677
       if (!parser.seen('R')) {
678
         SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD.");
678
         SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD.");
679
-        return G26_ERR;
679
+        return;
680
       }
680
       }
681
       else
681
       else
682
         g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
682
         g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
683
     #endif
683
     #endif
684
     if (g26_repeats < 1) {
684
     if (g26_repeats < 1) {
685
       SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1.");
685
       SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1.");
686
-      return G26_ERR;
686
+      return;
687
     }
687
     }
688
 
688
 
689
     g26_x_pos = parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position[X_AXIS];
689
     g26_x_pos = parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position[X_AXIS];
690
     g26_y_pos = parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position[Y_AXIS];
690
     g26_y_pos = parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position[Y_AXIS];
691
     if (!position_is_reachable(g26_x_pos, g26_y_pos)) {
691
     if (!position_is_reachable(g26_x_pos, g26_y_pos)) {
692
       SERIAL_PROTOCOLLNPGM("?Specified X,Y coordinate out of bounds.");
692
       SERIAL_PROTOCOLLNPGM("?Specified X,Y coordinate out of bounds.");
693
-      return G26_ERR;
693
+      return;
694
     }
694
     }
695
 
695
 
696
     /**
696
     /**

Loading…
Cancel
Save