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

Loading…
Cancel
Save