瀏覽代碼

G26 parity with 1.1.x

Scott Lahteine 7 年之前
父節點
當前提交
a8764ac5d5
共有 1 個檔案被更改,包括 1 行新增11 行删除
  1. 1
    11
      Marlin/src/gcode/bedlevel/G26.cpp

+ 1
- 11
Marlin/src/gcode/bedlevel/G26.cpp 查看文件

687
   set_bed_leveling_enabled(!parser.seen('D'));
687
   set_bed_leveling_enabled(!parser.seen('D'));
688
 
688
 
689
   if (current_position[Z_AXIS] < Z_CLEARANCE_BETWEEN_PROBES) {
689
   if (current_position[Z_AXIS] < Z_CLEARANCE_BETWEEN_PROBES) {
690
-//  SERIAL_PROTOCOLLNPGM("! move nozzle to Z_CLEARANCE_BETWEEN_PROBES height.");
691
-//  SERIAL_ECHOLNPAIR("  Z at:", current_position[Z_AXIS]);
692
     do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
690
     do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
693
     stepper.synchronize();
691
     stepper.synchronize();
694
     set_current_from_destination();
692
     set_current_from_destination();
695
-//  SERIAL_ECHOLNPAIR("  Z now at:", current_position[Z_AXIS]);
696
   }
693
   }
697
 
694
 
698
   if (turn_on_heaters() != G26_OK) goto LEAVE;
695
   if (turn_on_heaters() != G26_OK) goto LEAVE;
700
   current_position[E_AXIS] = 0.0;
697
   current_position[E_AXIS] = 0.0;
701
   sync_plan_position_e();
698
   sync_plan_position_e();
702
 
699
 
703
-  if (g26_prime_flag && prime_nozzle()) goto LEAVE;
700
+  if (g26_prime_flag && prime_nozzle() != G26_OK) goto LEAVE;
704
 
701
 
705
   /**
702
   /**
706
    *  Bed is preheated
703
    *  Bed is preheated
718
 
715
 
719
   // Move nozzle to the specified height for the first layer
716
   // Move nozzle to the specified height for the first layer
720
   set_destination_from_current();
717
   set_destination_from_current();
721
-//SERIAL_PROTOCOLLNPGM("! moving nozzle to 1st layer height.");
722
-//SERIAL_ECHOLNPAIR("  Z1 at:", current_position[Z_AXIS]);
723
-
724
   destination[Z_AXIS] = g26_layer_height;
718
   destination[Z_AXIS] = g26_layer_height;
725
   move_to(destination, 0.0);
719
   move_to(destination, 0.0);
726
-//stepper.synchronize();
727
-//set_destination_from_current();
728
-//SERIAL_ECHOLNPAIR("  Z2 at:", current_position[Z_AXIS]);
729
   move_to(destination, g26_ooze_amount);
720
   move_to(destination, g26_ooze_amount);
730
 
721
 
731
   #if ENABLED(ULTRA_LCD)
722
   #if ENABLED(ULTRA_LCD)
833
         MYSERIAL0.flush(); // G26 takes a long time to complete.   PronterFace can
824
         MYSERIAL0.flush(); // G26 takes a long time to complete.   PronterFace can
834
                            // over run the serial character buffer with M105's without
825
                            // over run the serial character buffer with M105's without
835
                            // this fix
826
                            // this fix
836
-
837
       }
827
       }
838
       if (look_for_lines_to_connect())
828
       if (look_for_lines_to_connect())
839
         goto LEAVE;
829
         goto LEAVE;

Loading…
取消
儲存