Fixed possible extruder move while it should be ignored

mandolincreek · Jan 12, 2018 · 4866d07 · 4866d07
1 parent e3ee115
commit 4866d07
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/ArduinoAVR/Repetier/Printer.cpp b/src/ArduinoAVR/Repetier/Printer.cpp
@@ -661,8 +661,11 @@ uint8_t Printer::moveToReal(float x, float y, float z, float e, float f, bool pa
 #if MIN_EXTRUDER_TEMP > 30
             && (Extruder::current->tempControl.currentTemperatureC > MIN_EXTRUDER_TEMP || Printer::isColdExtrusionAllowed() || Extruder::current->tempControl.sensorType == 0)
 #endif
-      )
+      ) {
         destinationSteps[E_AXIS] = e * axisStepsPerMM[E_AXIS];
+    } else {
+		destinationSteps[E_AXIS] = currentPositionSteps[E_AXIS];
+	}
     if(f != IGNORE_COORDINATE)
         feedrate = f;
 

diff --git a/src/ArduinoDUE/Repetier/Communication.cpp b/src/ArduinoDUE/Repetier/Communication.cpp
@@ -410,8 +410,8 @@ FSTRINGVALUE(Com::tEPRDistanceRetractHeating, "distance to retract when heating
 FSTRINGVALUE(Com::tEPRExtruderCoolerSpeed, "extruder cooler speed [0-255]")
 FSTRINGVALUE(Com::tEPRAdvanceK, "advance K [0=off]")
 FSTRINGVALUE(Com::tEPRAdvanceL, "advance L [0=off]")
-FSTRINGVALUE(Com::tEPRPreheatTemp, "Preheat temp. [�C]")
-FSTRINGVALUE(Com::tEPRPreheatBedTemp, "Bed Preheat temp. [�C]")
+FSTRINGVALUE(Com::tEPRPreheatTemp, "Preheat temp. [°C]")
+FSTRINGVALUE(Com::tEPRPreheatBedTemp, "Bed Preheat temp. [°C]")
 
 #endif
 #if SDSUPPORT

diff --git a/src/ArduinoDUE/Repetier/Printer.cpp b/src/ArduinoDUE/Repetier/Printer.cpp
@@ -661,8 +661,11 @@ uint8_t Printer::moveToReal(float x, float y, float z, float e, float f, bool pa
 #if MIN_EXTRUDER_TEMP > 30
             && (Extruder::current->tempControl.currentTemperatureC > MIN_EXTRUDER_TEMP || Printer::isColdExtrusionAllowed() || Extruder::current->tempControl.sensorType == 0)
 #endif
-      )
+      ) {
         destinationSteps[E_AXIS] = e * axisStepsPerMM[E_AXIS];
+    } else {
+		destinationSteps[E_AXIS] = currentPositionSteps[E_AXIS];
+	}
     if(f != IGNORE_COORDINATE)
         feedrate = f;