3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bed_mesh: Fix off-by-one error in faulty region error report 

Reported by @craiglink.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-08-17 12:04:58 -04:00
parent a90c8d7bc8
commit 1aa4becc60
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
klippy/extras/bed_mesh.py
View File

@ -443,14 +443,16 @@ class BedMeshCalibrate:
raise config.error( raise config.error(
"bed_mesh: Existing faulty_region_%d %s overlaps " "bed_mesh: Existing faulty_region_%d %s overlaps "
"added faulty_region_%d %s" "added faulty_region_%d %s"
% (j, repr([prev_c1, prev_c3]), i, repr([c1, c3]))) % (j+1, repr([prev_c1, prev_c3]),
i, repr([c1, c3])))
# Validate that no new corner is within an existing region # Validate that no new corner is within an existing region
for coord in [c1, c2, c3, c4]: for coord in [c1, c2, c3, c4]:
if within(coord, prev_c1, prev_c3): if within(coord, prev_c1, prev_c3):
raise config.error( raise config.error(
"bed_mesh: Added faulty_region_%d %s overlaps " "bed_mesh: Added faulty_region_%d %s overlaps "
"existing faulty_region_%d %s" "existing faulty_region_%d %s"
% (i, repr([c1, c3]), j, repr([prev_c1, prev_c3]))) % (i, repr([c1, c3]),
j+1, repr([prev_c1, prev_c3])))
self.faulty_regions.append((c1, c3)) self.faulty_regions.append((c1, c3))
self._verify_algorithm(config.error) self._verify_algorithm(config.error)
def _verify_algorithm(self, error): def _verify_algorithm(self, error):