SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

some renaming for readability

Browse source
This commit is contained in:
Wurstnase 2015-03-13 07:31:27 +01:00
parent 0620267ebb
commit 2e7ba44633
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/scripts/g29_auto.py
View file

@ -38,11 +38,11 @@ lines_of_g1 = 0
gcode = [] gcode = []
def found_g1(line): def has_g1(line):
return line[:2].upper() == "G1" return line[:2].upper() == "G1"
def find(line, axis): def find_axis(line, axis):
found = False found = False
number = "" number = ""
for char in line: for char in line:
@ -66,8 +66,8 @@ def find(line, axis):
def set_mima(line): def set_mima(line):
global min_x, max_x, min_y, max_y, last_z global min_x, max_x, min_y, max_y, last_z
current_x = find(line, 'x') current_x = find_axis(line, 'x')
current_y = find(line, 'y') current_y = find_axis(line, 'y')
if current_x is not None: if current_x is not None:
min_x = min(current_x, min_x) min_x = min(current_x, min_x)
@ -81,7 +81,7 @@ def set_mima(line):
def find_z(gcode, start_at_line=0): def find_z(gcode, start_at_line=0):
for i in range(start_at_line, len(gcode)): for i in range(start_at_line, len(gcode)):
my_z = find(gcode[i], 'Z') my_z = find_axis(gcode[i], 'Z')
if my_z is not None: if my_z is not None:
return my_z, i return my_z, i
@ -122,13 +122,13 @@ def get_lines(gcode, minimum):
return z_at_line[i - 1], z_at_line[i] return z_at_line[i - 1], z_at_line[i]
with open(my_file, 'r') as file: with open(folder+my_file, 'r') as file:
lines = 0 lines = 0
for line in file: for line in file:
lines += 1 lines += 1
if lines > 1000: if lines > 1000:
break break
if found_g1(line): if has_g1(line):
gcode.append(line) gcode.append(line)
file.close() file.close()