Merge branch 'AxTheB-devel' into devel

2013-03-02 13:29:08 +01:00 · 2013-03-02 13:29:08 +01:00 · 63888f5e2e
parent e0b405054a d667a0ff56
commit 63888f5e2e
1 changed files with 5 additions and 2 deletions
--- a/octoprint/util/gcodeInterpreter.py
+++ b/octoprint/util/gcodeInterpreter.py
@ -159,8 +159,11 @@ class gcode(object):
 								moveType = 'extrude'
 							if e < 0:
 								moveType = 'retract'
-						totalExtrusion += e - currentE
-						currentE = e
+						if posAbsExtruder:
+							totalExtrusion += e - currentE
+							currentE = e
+						else:
+							totalExtrusion += e
 						if totalExtrusion > maxExtrusion:
 							maxExtrusion = totalExtrusion
 					if moveType == 'move' and oldPos.z != pos.z: