Erik van der Zalm 13 years ago
parent
commit
617968ab76
1 changed files with 10 additions and 4 deletions
  1. 10
    4
      Marlin/Marlin.pde

+ 10
- 4
Marlin/Marlin.pde View File

@@ -584,7 +584,7 @@ FORCE_INLINE void process_commands()
584 584
       }
585 585
 
586 586
       if(code_seen(axis_codes[Y_AXIS])) {
587
-       current_position[1]=code_value()+add_homeing[1];
587
+        current_position[1]=code_value()+add_homeing[1];
588 588
       }
589 589
 
590 590
       if(code_seen(axis_codes[Z_AXIS])) {
@@ -612,9 +612,11 @@ FORCE_INLINE void process_commands()
612 612
         if(code_seen(axis_codes[i])) { 
613 613
            current_position[i] = code_value()+add_homeing[i];  
614 614
            if(i == E_AXIS) {
615
+             current_position[i] = code_value();  
615 616
              plan_set_e_position(current_position[E_AXIS]);
616 617
            }
617 618
            else {
619
+             current_position[i] = code_value()+add_homeing[i];  
618 620
              plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
619 621
            }
620 622
         }
@@ -822,7 +824,7 @@ FORCE_INLINE void process_commands()
822 824
             SERIAL_PROTOCOLPGM("T:");
823 825
             SERIAL_PROTOCOL( degHotend(tmp_extruder) ); 
824 826
             SERIAL_PROTOCOLPGM(" E:");
825
-            SERIAL_PROTOCOLLN( (int)tmp_extruder ); 
827
+            SERIAL_PROTOCOL( (int)tmp_extruder ); 
826 828
             #ifdef TEMP_RESIDENCY_TIME
827 829
               SERIAL_PROTOCOLPGM(" W:");
828 830
               if(residencyStart > -1)
@@ -869,7 +871,7 @@ FORCE_INLINE void process_commands()
869 871
             SERIAL_PROTOCOLPGM("T:");
870 872
             SERIAL_PROTOCOL(tt);
871 873
             SERIAL_PROTOCOLPGM(" E:");
872
-            SERIAL_PROTOCOLLN( (int)active_extruder ); 
874
+            SERIAL_PROTOCOL( (int)active_extruder ); 
873 875
             SERIAL_PROTOCOLPGM(" B:");
874 876
             SERIAL_PROTOCOLLN(degBed()); 
875 877
             codenum = millis(); 
@@ -936,7 +938,11 @@ FORCE_INLINE void process_commands()
936 938
           if(code_seen('Y')) disable_y();
937 939
           if(code_seen('Z')) disable_z();
938 940
           #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
939
-            if(code_seen('E')) disable_e();
941
+            if(code_seen('E')) {
942
+              disable_e0();
943
+              disable_e1();
944
+              disable_e2();
945
+            }
940 946
           #endif 
941 947
           LCD_MESSAGEPGM("Partial Release");
942 948
         }

Loading…
Cancel
Save