- added in CNCJob preferences new preferences that allow compensation for the CNC bed skew/tilt (axes not being square one to another)

- all pre-processors are altered such they can adjust the gcode to use the compensation values set in Preferences -> CNC-Job section
This commit is contained in:
Marius Stanciu
2022-01-09 19:44:56 +02:00
committed by Marius
parent 9d9bfa8b03
commit e219562bbb
30 changed files with 474 additions and 45 deletions

View File

@@ -202,8 +202,20 @@ G0 Z{z_toolchange}
return 'G1 Z0' + " " + self.feedrate_code(p)
def position_code(self, p):
# formula for skewing on x for example is:
# x_fin = x_init + y_init/slope where slope = p._bed_limit_y / p._bed_skew_x (a.k.a tangent)
if p._bed_skew_x == 0:
x_pos = p.x + p._bed_offset_x
else:
x_pos = (p.x + p._bed_offset_x) + ((p.y / p._bed_limit_y) * p._bed_skew_x)
if p._bed_skew_y == 0:
y_pos = p.y + p._bed_offset_y
else:
y_pos = (p.y + p._bed_offset_y) + ((p.x / p._bed_limit_x) * p._bed_skew_y)
return ('X' + self.coordinate_format + ' Y' + self.coordinate_format) % \
(p.coords_decimals, p.x, p.coords_decimals, p.y)
(p.coords_decimals, x_pos, p.coords_decimals, y_pos)
def rapid_code(self, p):
return ('G0 ' + self.position_code(p)).format(**p) + " " + self.feedrate_rapid_code(p)