From 2e7ba44633372f726ef471bf4d1edc7debb2a36e Mon Sep 17 00:00:00 2001
From: Wurstnase <wurstnase.reprap@gmail.com>
Date: Fri, 13 Mar 2015 07:31:27 +0100
Subject: [PATCH] some renaming for readability
---
Marlin/scripts/g29_auto.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Marlin/scripts/g29_auto.py b/Marlin/scripts/g29_auto.py
index 95b3385ce5..b460e97a7a 100644
--- a/Marlin/scripts/g29_auto.py
+++ b/Marlin/scripts/g29_auto.py
@@ -38,11 +38,11 @@ lines_of_g1 = 0
gcode = []
-def found_g1(line):
+def has_g1(line):
return line[:2].upper() == "G1"
-def find(line, axis):
+def find_axis(line, axis):
found = False
number = ""
for char in line:
@@ -66,8 +66,8 @@ def find(line, axis):
def set_mima(line):
global min_x, max_x, min_y, max_y, last_z
- current_x = find(line, 'x')
- current_y = find(line, 'y')
+ current_x = find_axis(line, 'x')
+ current_y = find_axis(line, 'y')
if current_x is not None:
min_x = min(current_x, min_x)
@@ -81,7 +81,7 @@ def set_mima(line):
def find_z(gcode, start_at_line=0):
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:
return my_z, i
@@ -122,13 +122,13 @@ def get_lines(gcode, minimum):
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
for line in file:
lines += 1
if lines > 1000:
break
- if found_g1(line):
+ if has_g1(line):
gcode.append(line)
file.close()
--
GitLab