Commit 0e24f2b5 authored by Guillaume Seguin's avatar Guillaume Seguin

Remove min*/max* from GCodeAnalyzer

We also drop G162 (home to max endstops) support, but it sounds like
nobody ever heard about it and everyone is using *_HOME_DIR instead.
parent 12ea0d1f
...@@ -56,12 +56,6 @@ class GCodeAnalyzer(): ...@@ -56,12 +56,6 @@ class GCodeAnalyzer():
self.homeX = 0 self.homeX = 0
self.homeY = 0 self.homeY = 0
self.homeZ = 0 self.homeZ = 0
self.maxX = 150
self.maxY = 150
self.maxZ = 150
self.minX = 0
self.minY = 0
self.minZ = 0
self.hasHomeX = False self.hasHomeX = False
self.hasHomeY = False self.hasHomeY = False
self.hasHomeZ = False self.hasHomeZ = False
...@@ -114,17 +108,6 @@ class GCodeAnalyzer(): ...@@ -114,17 +108,6 @@ class GCodeAnalyzer():
# e is absolute. Is it changed? # e is absolute. Is it changed?
if self.e != self.eOffset + code_e: if self.e != self.eOffset + code_e:
self.e = self.eOffset + code_e self.e = self.eOffset + code_e
#limit checking
"""
if self.x < self.minX: self.x = self.minX
if self.y < self.minY: self.y = self.minY
if self.z < self.minZ: self.z = self.minZ
if self.x > self.maxX: self.x = self.maxX
if self.y > self.maxY: self.y = self.maxY
if self.z > self.maxZ: self.z = self.maxZ
"""
#Repetier has a bunch of limit-checking code here and time calculations: we are leaving them for now
elif code_g == 20: self.imperial = True elif code_g == 20: self.imperial = True
elif code_g == 21: self.imperial = False elif code_g == 21: self.imperial = False
elif code_g == 28 or code_g == 161: elif code_g == 28 or code_g == 161:
...@@ -153,28 +136,6 @@ class GCodeAnalyzer(): ...@@ -153,28 +136,6 @@ class GCodeAnalyzer():
if code_e is not None: if code_e is not None:
self.eOffset = 0 self.eOffset = 0
self.e = 0 self.e = 0
elif code_g == 162:
self.lastX = self.x
self.lastY = self.y
self.lastZ = self.z
self.lastE = self.e
code_x = gline.x
code_y = gline.y
code_z = gline.z
homeAll = False
if code_x is None and code_y is None and code_z is None: homeAll = True
if code_x is not None or homeAll:
self.hasHomeX = True
self.xOffset = 0
self.x = self.maxX
if code_y is not None or homeAll:
self.hasHomeY = True
self.yOffset = 0
self.y = self.maxY
if code_z is not None or homeAll:
self.hasHomeZ = True
self.zOffset = 0
self.z = self.maxZ
elif code_g == 90: self.relative = False elif code_g == 90: self.relative = False
elif code_g == 91: self.relative = True elif code_g == 91: self.relative = True
elif code_g == 92: elif code_g == 92:
......
...@@ -257,18 +257,6 @@ class PronterWindow(MainWindow, pronsole.pronsole): ...@@ -257,18 +257,6 @@ class PronterWindow(MainWindow, pronsole.pronsole):
self.display_graph = self.settings.tempgraph self.display_graph = self.settings.tempgraph
self.display_gauges = self.settings.tempgauges self.display_gauges = self.settings.tempgauges
#initialize the code analyzer with the correct sizes. There must be a more general way to do so
# minimum = offset
self.p.analyzer.minX = self.build_dimensions_list[3]
self.p.analyzer.minY = self.build_dimensions_list[4]
self.p.analyzer.minZ = self.build_dimensions_list[5]
#max = offset + bedsize
self.p.analyzer.maxX = self.build_dimensions_list[3] + self.build_dimensions_list[0]
self.p.analyzer.maxY = self.build_dimensions_list[4] + self.build_dimensions_list[1]
self.p.analyzer.maxZ = self.build_dimensions_list[5] + self.build_dimensions_list[2]
self.p.analyzer.homeX = self.build_dimensions_list[6] self.p.analyzer.homeX = self.build_dimensions_list[6]
self.p.analyzer.homeY = self.build_dimensions_list[7] self.p.analyzer.homeY = self.build_dimensions_list[7]
self.p.analyzer.homeZ = self.build_dimensions_list[8] self.p.analyzer.homeZ = self.build_dimensions_list[8]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment